Issue 3780 - wait for the loading of filters and only afterwards start to fetch pages

lib/crawler.js

 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
 /**
  * @module crawler
  */
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/Promise.jsm");
 
 function abprequire(module)
 {
   let result = {};
   result.wrappedJSObject = result;
   Services.obs.notifyObservers(result, "adblockplus-require", module);
   return result.exports;
 }
 
 let {RequestNotifier} = abprequire("requestNotifier");
-
 let {FilterNotifier} = abprequire("filterNotifier");
 let {FilterStorage} = abprequire("filterStorage");
 
 /**
  * Creates a pool of tabs and allocates them to tasks on request.
  *
  * @param {tabbrowser} browser
  *    The tabbed browser where tabs should be created
  * @param {int} maxtabs
  *    The maximum number of tabs to be allocated
@@ skipping 170 matching lines @@
  *    Maximum number of tabs to be opened
  * @param {String} targetURL
  *    URL that should receive the results
  * @param {Function} onDone
  *    The callback which is called after finishing of crawling of all URLs.
  */
 function run(window, urls, timeout, maxtabs, targetURL, onDone)
 {
   new Promise((resolve, reject) =>
   {
-    if (FilterStorage.subscriptions.length > 0 && !FilterStorage._loading)
+    if (FilterStorage.subscriptions.length > 0)
     {
       resolve();
       return;
     }
-    FilterNotifier.addListener((action, item, newValue, oldValue) =>
+    let onFiltersLoaded = (action, item, newValue, oldValue) =>
     {
       if (action == "load")
       {
+        FilterNotifier.removeListener(onFiltersLoaded);
         resolve();
       }
-    });
-  }).then(() => crawl_urls(window, urls, timeout, maxtabs, targetURL, onDone)).catch(reportException);
+    };
+    FilterNotifier.addListener(onFiltersLoaded);
+  }).then(() => crawl_urls(window, urls, timeout, maxtabs, targetURL, onDone))
+  .catch(reportException);
 }
 exports.run = run;
 
 /**
  * Spawns a {Task} task to crawl each url from `urls` argument and calls
  * `onDone` when all tasks are finished.
  * @param {Window} window
  *   The browser window we're operating in
  * @param {String[]} urls
  *   URLs to be crawled
@@ skipping 116 matching lines @@
 
 function reportException(e)
 {
   let stack = "";
   if (e && typeof e == "object" && "stack" in e)
     stack = e.stack + "\n";
 
   Cu.reportError(e);
   dump(e + "\n" + stack + "\n");
 }