| 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 FilterStorage class responsible for managing user's | 21  * @fileOverview FilterStorage class responsible for managing user's | 
| 22  *               subscriptions and filters. | 22  *               subscriptions and filters. | 
| 23  */ | 23  */ | 
| 24 | 24 | 
| 25 const {IO} = require("io"); | 25 import {IO} from "io"; | 
| 26 const {Prefs} = require("prefs"); | 26 import {Prefs} from "prefs"; | 
| 27 const {Filter, ActiveFilter} = require("./filterClasses"); | 27 import {Filter, ActiveFilter} from "./filterClasses"; | 
| 28 const {Subscription, SpecialSubscription, | 28 import {Subscription, SpecialSubscription, | 
| 29        ExternalSubscription} = require("./subscriptionClasses"); | 29         ExternalSubscription} from "./subscriptionClasses"; | 
| 30 const {FilterNotifier} = require("./filterNotifier"); | 30 import {FilterNotifier} from "./filterNotifier"; | 
| 31 | 31 | 
| 32 /** | 32 /** | 
| 33  * Version number of the filter storage file format. | 33  * Version number of the filter storage file format. | 
| 34  * @type {number} | 34  * @type {number} | 
| 35  */ | 35  */ | 
| 36 let formatVersion = 5; | 36 let formatVersion = 5; | 
| 37 | 37 | 
| 38 /** | 38 /** | 
| 39  * This class reads user's filters from disk, manages them in memory | 39  * This class reads user's filters from disk, manages them in memory | 
| 40  * and writes them back. | 40  * and writes them back. | 
| 41  * @class | 41  * @class | 
| 42  */ | 42  */ | 
| 43 let FilterStorage = exports.FilterStorage = | 43 export let FilterStorage = { | 
| 44 { |  | 
| 45   /** | 44   /** | 
| 46    * Will be set to true after the initial loadFromDisk() call completes. | 45    * Will be set to true after the initial loadFromDisk() call completes. | 
| 47    * @type {boolean} | 46    * @type {boolean} | 
| 48    */ | 47    */ | 
| 49   initialized: false, | 48   initialized: false, | 
| 50 | 49 | 
| 51   /** | 50   /** | 
| 52    * Version number of the patterns.ini format used. | 51    * Version number of the patterns.ini format used. | 
| 53    * @type {number} | 52    * @type {number} | 
| 54    */ | 53    */ | 
| (...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 773       else if (this.wantObj === false && val) | 772       else if (this.wantObj === false && val) | 
| 774         this.curObj.push(val.replace(/\\\[/g, "[")); | 773         this.curObj.push(val.replace(/\\\[/g, "[")); | 
| 775     } | 774     } | 
| 776     finally | 775     finally | 
| 777     { | 776     { | 
| 778       Filter.knownFilters = origKnownFilters; | 777       Filter.knownFilters = origKnownFilters; | 
| 779       Subscription.knownSubscriptions = origKnownSubscriptions; | 778       Subscription.knownSubscriptions = origKnownSubscriptions; | 
| 780     } | 779     } | 
| 781   } | 780   } | 
| 782 }; | 781 }; | 
| OLD | NEW | 
|---|