| Index: lib/synchronizer.js |
| =================================================================== |
| --- a/lib/synchronizer.js |
| +++ b/lib/synchronizer.js |
| @@ -18,23 +18,24 @@ |
| "use strict"; |
| /** |
| * @fileOverview Manages synchronization of filter subscriptions. |
| */ |
| const {Downloader, Downloadable, |
| MILLIS_IN_SECOND, MILLIS_IN_MINUTE, |
| - MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader"); |
| -const {Filter} = require("filterClasses"); |
| -const {FilterStorage} = require("filterStorage"); |
| -const {FilterNotifier} = require("filterNotifier"); |
| -const {Prefs} = require("prefs"); |
| -const {Subscription, DownloadableSubscription} = require("subscriptionClasses"); |
| -const {Utils} = require("utils"); |
| + MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("./downloader"); |
| +const {Filter} = require("./filterClasses"); |
| +const {FilterStorage} = require("./filterStorage"); |
| +const {FilterNotifier} = require("./filterNotifier"); |
| +const {Prefs} = require("abp-modules/prefs"); |
| +const {Subscription, |
| + DownloadableSubscription} = require("./subscriptionClasses"); |
| +const {Utils} = require("abp-modules/utils"); |
| const INITIAL_DELAY = 1 * MILLIS_IN_MINUTE; |
| const CHECK_INTERVAL = 1 * MILLIS_IN_HOUR; |
| const DEFAULT_EXPIRATION_INTERVAL = 5 * MILLIS_IN_DAY; |
| /** |
| * The object providing actual downloading functionality. |
| * @type {Downloader} |
| @@ -303,17 +304,17 @@ |
| if (redirectCallback && |
| subscription.errors >= Prefs.subscriptions_fallbackerrors && |
| /^https?:\/\//i.test(subscription.url)) |
| { |
| subscription.errors = 0; |
| let fallbackURL = Prefs.subscriptions_fallbackurl; |
| - const {addonVersion} = require("info"); |
| + const {addonVersion} = require("abp-modules/info"); |
| fallbackURL = fallbackURL.replace(/%VERSION%/g, |
| encodeURIComponent(addonVersion)); |
| fallbackURL = fallbackURL.replace(/%SUBSCRIPTION%/g, |
| encodeURIComponent(subscription.url)); |
| fallbackURL = fallbackURL.replace(/%URL%/g, |
| encodeURIComponent(downloadURL)); |
| fallbackURL = fallbackURL.replace(/%ERROR%/g, |
| encodeURIComponent(error)); |