| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-present eyeo GmbH | 3 * Copyright (C) 2006-present eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 "use strict"; | 18 "use strict"; |
| 19 | 19 |
| 20 /** | 20 /** |
| 21 * @fileOverview Manages synchronization of filter subscriptions. | 21 * @fileOverview Manages synchronization of filter subscriptions. |
| 22 */ | 22 */ |
| 23 | 23 |
| 24 const {Downloader, Downloadable, | 24 const {Downloader, Downloadable, |
| 25 MILLIS_IN_SECOND, MILLIS_IN_MINUTE, | 25 MILLIS_IN_SECOND, MILLIS_IN_MINUTE, |
| 26 MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader"); | 26 MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("./downloader"); |
| 27 const {Filter} = require("filterClasses"); | 27 const {Filter} = require("./filterClasses"); |
| 28 const {FilterStorage} = require("filterStorage"); | 28 const {FilterStorage} = require("./filterStorage"); |
| 29 const {FilterNotifier} = require("filterNotifier"); | 29 const {FilterNotifier} = require("./filterNotifier"); |
| 30 const {Prefs} = require("prefs"); | 30 const {Prefs} = require("prefs"); |
|
kzar
2017/10/18 15:12:08
You missed this one.
hub
2017/10/18 17:57:45
out of tree module.
| |
| 31 const {Subscription, DownloadableSubscription} = require("subscriptionClasses"); | 31 const {Subscription, |
| 32 DownloadableSubscription} = require("./subscriptionClasses"); | |
| 32 const {Utils} = require("utils"); | 33 const {Utils} = require("utils"); |
| 33 | 34 |
| 34 const INITIAL_DELAY = 1 * MILLIS_IN_MINUTE; | 35 const INITIAL_DELAY = 1 * MILLIS_IN_MINUTE; |
| 35 const CHECK_INTERVAL = 1 * MILLIS_IN_HOUR; | 36 const CHECK_INTERVAL = 1 * MILLIS_IN_HOUR; |
| 36 const DEFAULT_EXPIRATION_INTERVAL = 5 * MILLIS_IN_DAY; | 37 const DEFAULT_EXPIRATION_INTERVAL = 5 * MILLIS_IN_DAY; |
| 37 | 38 |
| 38 /** | 39 /** |
| 39 * The object providing actual downloading functionality. | 40 * The object providing actual downloading functionality. |
| 40 * @type {Downloader} | 41 * @type {Downloader} |
| 41 */ | 42 */ |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 301 { | 302 { |
| 302 subscription.errors++; | 303 subscription.errors++; |
| 303 | 304 |
| 304 if (redirectCallback && | 305 if (redirectCallback && |
| 305 subscription.errors >= Prefs.subscriptions_fallbackerrors && | 306 subscription.errors >= Prefs.subscriptions_fallbackerrors && |
| 306 /^https?:\/\//i.test(subscription.url)) | 307 /^https?:\/\//i.test(subscription.url)) |
| 307 { | 308 { |
| 308 subscription.errors = 0; | 309 subscription.errors = 0; |
| 309 | 310 |
| 310 let fallbackURL = Prefs.subscriptions_fallbackurl; | 311 let fallbackURL = Prefs.subscriptions_fallbackurl; |
| 311 const {addonVersion} = require("info"); | 312 const {addonVersion} = require("info"); |
|
kzar
2017/10/18 15:12:08
You missed this one.
hub
2017/10/18 17:57:45
out of tree module
| |
| 312 fallbackURL = fallbackURL.replace(/%VERSION%/g, | 313 fallbackURL = fallbackURL.replace(/%VERSION%/g, |
| 313 encodeURIComponent(addonVersion)); | 314 encodeURIComponent(addonVersion)); |
| 314 fallbackURL = fallbackURL.replace(/%SUBSCRIPTION%/g, | 315 fallbackURL = fallbackURL.replace(/%SUBSCRIPTION%/g, |
| 315 encodeURIComponent(subscription.url)); | 316 encodeURIComponent(subscription.url)); |
| 316 fallbackURL = fallbackURL.replace(/%URL%/g, | 317 fallbackURL = fallbackURL.replace(/%URL%/g, |
| 317 encodeURIComponent(downloadURL)); | 318 encodeURIComponent(downloadURL)); |
| 318 fallbackURL = fallbackURL.replace(/%ERROR%/g, | 319 fallbackURL = fallbackURL.replace(/%ERROR%/g, |
| 319 encodeURIComponent(error)); | 320 encodeURIComponent(error)); |
| 320 fallbackURL = fallbackURL.replace(/%CHANNELSTATUS%/g, | 321 fallbackURL = fallbackURL.replace(/%CHANNELSTATUS%/g, |
| 321 encodeURIComponent(channelStatus)); | 322 encodeURIComponent(channelStatus)); |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 349 subscription.filters.map(f => f.text).join("\n"); | 350 subscription.filters.map(f => f.text).join("\n"); |
| 350 redirectCallback("data:text/plain," + encodeURIComponent(data)); | 351 redirectCallback("data:text/plain," + encodeURIComponent(data)); |
| 351 } | 352 } |
| 352 }, false); | 353 }, false); |
| 353 request.send(null); | 354 request.send(null); |
| 354 } | 355 } |
| 355 } | 356 } |
| 356 } | 357 } |
| 357 }; | 358 }; |
| 358 Synchronizer.init(); | 359 Synchronizer.init(); |
| OLD | NEW |