Issue 417 - Reinitializing removed filter lists (Core/Firefox)

lib/filterStorage.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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
@@ skipping 341 matching lines @@
       filter.hitCount = 0;
       filter.lastHit = 0;
     }
   },
 
   _loading: false,
 
   /**
    * Loads all subscriptions from the disk
    * @param {nsIFile} [sourceFile] File to read from
+   * @param {Function} [errorCallback] Function to be executed in case of an error
    */
-  loadFromDisk: function(sourceFile)
+  loadFromDisk: function(sourceFile, errorCallback)
   {
     if (this._loading)
       return;
 
     TimeLine.enter("Entered FilterStorage.loadFromDisk()");
     this._loading = true;
 
     let readFile = function(sourceFile, backupIndex)
     {
       TimeLine.enter("FilterStorage.loadFromDisk() -> readFile()");
@@ skipping 20 matching lines @@
             let [, part1, part2] = /^(.*)(\.\w+)$/.exec(sourceFile.leafName) || [null, sourceFile.leafName, ""];
 
             sourceFile = sourceFile.clone();
             sourceFile.leafName = part1 + "-backup" + (++backupIndex) + part2;
 
             IO.statFile(sourceFile, function(e, statData)
             {
               if (!e && statData.exists)
                 readFile(sourceFile, backupIndex);
               else
-                doneReading(parser);
+              {
+                // The file is empty and loading the backup failed
+                if (typeof errorCallback == "function")
+                  errorCallback();
+                else
+                  doneReading(parser);
+              }

[Wladimir Palant, 2014/05/26 15:08:46]

This callback is unnecessary and actually harmful since the "load" notification
isn't being triggered meaning that some initialization code will never run. Any
code can listen to the "load" notification and see for itself whether the data
loaded is empty.

[Thomas Greiner, 2014/05/26 17:45:38]

Done.

             });
             TimeLine.leave("FilterStorage.loadFromDisk() read callback done");
             return;
           }
         }
         doneReading(parser);
       }.bind(this), "FilterStorageRead");
 
       TimeLine.leave("FilterStorage.loadFromDisk() <- readFile()", "FilterStorageRead");
     }.bind(this);
@@ skipping 470 matching lines @@
       Subscription.knownSubscriptions = origKnownSubscriptions;
     }
 
     // Allow events to be processed every now and then.
     // Note: IO.readFromFile() will deal with the potential reentrance here.
     this.linesProcessed++;
     if (this.linesProcessed % 1000 == 0)
       Utils.yield();
   }
 };