Issue 5554 - [webextensions] Adjust data to account for UI limitations

lib/firefoxDataCleanup.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
-let {Filter, ActiveFilter} = require("filterClasses");

[Sebastian Noack, 2017/08/24 10:19:44]

It seems we use const (instead let) for module imports everywhere else.

[Wladimir Palant, 2017/08/24 10:44:24]

Done.

-let {FilterNotifier} = require("filterNotifier");
-let {FilterStorage} = require("filterStorage");
-let {IO} = require("io");
-let {Prefs} = require("prefs");
-let {SpecialSubscription} = require("subscriptionClasses");
+const {Filter, ActiveFilter} = require("filterClasses");
+const {FilterNotifier} = require("filterNotifier");
+const {FilterStorage} = require("filterStorage");
+const {IO} = require("io");
+const {Prefs} = require("prefs");
+const {SpecialSubscription} = require("subscriptionClasses");
 
 Promise.all([FilterNotifier.once("load"), Prefs.untilLoaded]).then(() =>
 {
   if (Prefs.data_cleanup_done)
     return;
 
   if (FilterStorage.firstRun)
   {
     Prefs.data_cleanup_done = true;
     return;
@@ skipping 12 matching lines @@
       // Enable or replace disabled filters
       filter.disabled = false;
 
       for (let subscription of filter.subscriptions)
       {
         if (subscription instanceof SpecialSubscription)
         {
           while (true)
           {
             let position = subscription.filters.indexOf(filter);
             if (position < 0)

[Sebastian Noack, 2017/08/24 10:19:44]

You might want to use includes() instead of indexOf() < 0.

[Wladimir Palant, 2017/08/24 10:44:24]

No, we are using the position later on.

               break;
 
             let newFilter = Filter.fromText("! " + filter.text);
             FilterStorage.removeFilter(filter, subscription, position);
             FilterStorage.addFilter(newFilter, subscription, position);
           }
         }
       }
     }
 
     if (filter.hitCount || filter.lastHit)
       haveHitCounts.push(filter);
   }
 
   // Reset hit statistics on any filters having them
   FilterStorage.resetHitCounts(haveHitCounts);
 
   // Remove any existing automatic backups
   let backups = [];
   for (let i = 1; i < 100; i++)
     backups.push(`file:patterns-backup${i}.ini`);
   browser.storage.local.remove(backups).then(() =>
   {
     Prefs.data_cleanup_done = true;
   });
 });