Issue 189 - Implement API changes from #117, #153, #192 in libadblockplus

lib/init.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
  * 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/>.
  */
 
 let {Prefs} = require("prefs");
 let {FilterNotifier} = require("filterNotifier");
 
 let prefsInitDone = false;
 let filtersInitDone = false;
-let isFirstRun = false;
 
 function checkInitialized()
 {
   if (prefsInitDone && filtersInitDone)
   {
     checkInitialized = function() {};
-    _triggerEvent("init", isFirstRun);
+    _triggerEvent("init", require("filterStorage").FilterStorage.firstRun);

[Felix Dahlke, 2014/04/23 09:43:22]

Also required below, I'd vote for doing this once above.

[Wladimir Palant, 2014/04/23 10:40:36]

This isn't a real module loading mechanism here, modules load in a fixed order
as defined in the convert_js build step. We can move init.js below
filterStorage.js of course but that will mean that filterStorage.js initializes
before the code here has a chance to run. This will introduce a slight chance
for the "load" event to fire before we register the listener below. Nothing that
can't be fixed but before I open that can of worms I'll rather require() the
module twice.

[Felix Dahlke, 2014/04/24 11:11:41]

Well, that's a leaky abstraction if there ever was one. I agree that it
shouldn't be fixed as part of this review though. I've filed a issue for
discussing this: https://issues.adblockplus.org/ticket/378

   }
 }
 
 Prefs._initListener = function()
 {
   prefsInitDone = true;
   checkInitialized();
 };
 
 FilterNotifier.addListener(function(action)
 {
   if (action === "load")
   {
     let {FilterStorage} = require("filterStorage");
-    if (FilterStorage.subscriptions.length == 0)
+    if (FilterStorage.firstRun)
     {
       // No data, must be a new user or someone with corrupted data - initialize
       // with default settings
 
-      isFirstRun = true;
-
       let {Subscription, DownloadableSubscription} = require("subscriptionClasses");
       let {Synchronizer} = require("synchronizer");
       let {Prefs} = require("prefs");
       let {Utils} = require("utils");
 
       // Choose default subscription and add it
       let subscriptions = require("subscriptions.xml");
       let node = Utils.chooseFilterSubscription(subscriptions);
       if (node)
       {
         let subscription = Subscription.fromURL(node.url);
         FilterStorage.addSubscription(subscription);
         subscription.disabled = false;
         subscription.title = node.title;
         subscription.homepage = node.homepage;
         if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
           Synchronizer.execute(subscription);
       }
     }
 
     filtersInitDone = true;
     checkInitialized();
   }
 });