Convert a bunch of URL formats to patterns (#2293)

Follow-on to #2279

services/pypi/pypi-base.js

@@ -30,8 +30,7 @@ module.exports = class PypiBase extends BaseJsonService {
   static buildUrl(base) {
     return {
       base,
-      format: '(.*)',
-      capture: ['egg'],
+      pattern: ':egg*',
     }
   }
 

services/pypi/pypi-downloads.service.js

@@ -67,8 +67,7 @@ module.exports = class PypiDownloads extends BaseJsonService {
   static get url() {
     return {
       base: 'pypi',
-      format: '(dd|dw|dm)/(.+)',
-      capture: ['period', 'pkg'],
+      pattern: ':period(dd|dw|dm)/:pkg',
     }
   }
 

services/steam/steam-workshop.service.js

@@ -171,8 +171,7 @@ class SteamCollectionSize extends BaseSteamAPI {
   static get url() {
     return {
       base: 'steam/collection-files',
-      format: '(.+)',
-      capture: ['collectionId'],
+      pattern: ':collectionId',
     }
   }
 
@@ -254,8 +253,7 @@ class SteamFileSize extends SteamFileService {
   static get url() {
     return {
       base: 'steam/size',
-      format: '(.+)',
-      capture: ['fileId'],
+      pattern: ':fileId',
     }
   }
 
@@ -290,8 +288,7 @@ class SteamFileReleaseDate extends SteamFileService {
   static get url() {
     return {
       base: 'steam/release-date',
-      format: '(.+)',
-      capture: ['fileId'],
+      pattern: ':fileId',
     }
   }
 
@@ -331,8 +328,7 @@ class SteamFileSubscriptions extends SteamFileService {
   static get url() {
     return {
       base: 'steam/subscriptions',
-      format: '(.+)',
-      capture: ['fileId'],
+      pattern: ':fileId',
     }
   }
 
@@ -370,8 +366,7 @@ class SteamFileFavorites extends SteamFileService {
   static get url() {
     return {
       base: 'steam/favorites',
-      format: '(.+)',
-      capture: ['fileId'],
+      pattern: ':fileId',
     }
   }
 
@@ -411,8 +406,7 @@ class SteamFileDownloads extends SteamFileService {
   static get url() {
     return {
       base: 'steam/downloads',
-      format: '(.+)',
-      capture: ['fileId'],
+      pattern: ':fileId',
     }
   }
 
@@ -446,8 +440,7 @@ class SteamFileViews extends SteamFileService {
   static get url() {
     return {
       base: 'steam/views',
-      format: '(.+)',
-      capture: ['fileId'],
+      pattern: ':fileId',
     }
   }
 

services/swagger/swagger.service.js

@@ -22,8 +22,7 @@ module.exports = class SwaggerValidatorService extends BaseJsonService {
   static get url() {
     return {
       base: 'swagger/valid/2.0',
-      format: '(http(?:s)?)/(.+)',
-      capture: ['scheme', 'url'],
+      pattern: ':scheme(http|https)?/:url*',
     }
   }
 

services/time/time.service.js

@@ -22,8 +22,7 @@ module.exports = class Time extends BaseService {
   static get url() {
     return {
       base: 'servertime',
-      format: '',
-      capture: [],
+      pattern: '',
     }
   }
 }

services/uptimerobot/uptimerobot-ratio.service.js

@@ -15,8 +15,7 @@ module.exports = class UptimeRobotRatio extends UptimeRobotBase {
   static get url() {
     return {
       base: 'uptimerobot/ratio',
-      format: '(?:([\\d+])/)?(.*)',
-      capture: ['numberOfDays', 'monitorApiKey'],
+      pattern: ':numberOfDays(\\d+)?/:monitorApiKey',
     }
   }
 

services/uptimerobot/uptimerobot-status.service.js

@@ -12,8 +12,7 @@ module.exports = class UptimeRobotStatus extends UptimeRobotBase {
   static get url() {
     return {
       base: 'uptimerobot/status',
-      format: '(.*)',
-      capture: ['monitorApiKey'],
+      pattern: ':monitorApiKey',
     }
   }
 

services/wordpress/wordpress-downloads.service.js

@@ -44,8 +44,7 @@ function DownloadsForExtensionType(extensionType) {
     static get url() {
       return {
         base: `wordpress/${extensionType}/dt`,
-        format: '(.+)',
-        capture: ['slug'],
+        pattern: ':slug',
       }
     }
     static get extensionType() {

services/wordpress/wordpress-platform.service.js

@@ -47,8 +47,7 @@ class WordpressPluginRequiresVersion extends BaseWordpressPlatform {
   static get url() {
     return {
       base: `wordpress/plugin/wp-version`,
-      format: '(.+)',
-      capture: ['slug'],
+      pattern: ':slug',
     }
   }
 

services/wordpress/wordpress-rating.service.js

@@ -41,8 +41,7 @@ function RatingForExtensionType(extensionType) {
     static get url() {
       return {
         base: `wordpress/${extensionType}/rating`,
-        format: '(.+)',
-        capture: ['slug'],
+        pattern: ':slug',
       }
     }
 

services/wordpress/wordpress-version.service.js

@@ -39,8 +39,7 @@ function VersionForExtensionType(extensionType) {
     static get url() {
       return {
         base: `wordpress/${extensionType}/v`,
-        format: '(.+)',
-        capture: ['slug'],
+        pattern: ':slug',
       }
     }