diff --git a/services/pypi/pypi-base.js b/services/pypi/pypi-base.js index c4c977c587..6f7ee0691a 100644 --- a/services/pypi/pypi-base.js +++ b/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*', } } diff --git a/services/pypi/pypi-downloads.service.js b/services/pypi/pypi-downloads.service.js index bf33bbec9b..0a054bab36 100644 --- a/services/pypi/pypi-downloads.service.js +++ b/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', } } diff --git a/services/steam/steam-workshop.service.js b/services/steam/steam-workshop.service.js index d8ae59ad84..e3430dd112 100644 --- a/services/steam/steam-workshop.service.js +++ b/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', } } diff --git a/services/swagger/swagger.service.js b/services/swagger/swagger.service.js index 010e48cec7..59c8fc6f62 100644 --- a/services/swagger/swagger.service.js +++ b/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*', } } diff --git a/services/time/time.service.js b/services/time/time.service.js index 76ef1e62d1..94bd4746dd 100644 --- a/services/time/time.service.js +++ b/services/time/time.service.js @@ -22,8 +22,7 @@ module.exports = class Time extends BaseService { static get url() { return { base: 'servertime', - format: '', - capture: [], + pattern: '', } } } diff --git a/services/uptimerobot/uptimerobot-ratio.service.js b/services/uptimerobot/uptimerobot-ratio.service.js index 2330108ffd..6fc6251f1f 100644 --- a/services/uptimerobot/uptimerobot-ratio.service.js +++ b/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', } } diff --git a/services/uptimerobot/uptimerobot-status.service.js b/services/uptimerobot/uptimerobot-status.service.js index 7a5f45f5e0..000c7ce7cd 100644 --- a/services/uptimerobot/uptimerobot-status.service.js +++ b/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', } } diff --git a/services/wordpress/wordpress-downloads.service.js b/services/wordpress/wordpress-downloads.service.js index d6cf650485..d8217d8a27 100644 --- a/services/wordpress/wordpress-downloads.service.js +++ b/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() { diff --git a/services/wordpress/wordpress-platform.service.js b/services/wordpress/wordpress-platform.service.js index 002a96fd28..72753cfe9e 100644 --- a/services/wordpress/wordpress-platform.service.js +++ b/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', } } diff --git a/services/wordpress/wordpress-rating.service.js b/services/wordpress/wordpress-rating.service.js index a831deb6a9..45944128e4 100644 --- a/services/wordpress/wordpress-rating.service.js +++ b/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', } } diff --git a/services/wordpress/wordpress-version.service.js b/services/wordpress/wordpress-version.service.js index 06195429e2..22c4f78734 100644 --- a/services/wordpress/wordpress-version.service.js +++ b/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', } }