Issue 2375 - Implement "Blocking lists" section in new options page

background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * Copyright (C) 2006-2016 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.
  *
@@ skipping 15 matching lines @@
           data[parts[0]] = decodeURIComponent(parts[1]);
       }
     }
   }
 
   var params = {
     blockedURLs: "",
     seenDataCorruption: false,
     filterlistsReinitialized: false,
     addSubscription: false,
-    filterError: false
+    filterError: false,
+    downloadStatus: "synchronize_ok"
   };
   updateFromURL(params);
 
   var modules = {};
   global.require = function(module)
   {
     return modules[module];
   };
 
   modules.utils = {
@@ skipping 14 matching lines @@
       "subscriptions_exceptionsurl": "https://easylist-downloads.adblockplus.org/exceptionrules.txt"
     }
   };
 
   modules.subscriptionClasses = {
     Subscription: function(url)
     {
       this.url = url;
       this.title = "Subscription " + url;
       this.disabled = false;
-      this.lastDownload = 1234;
-      this.downloadStatus = "synchronize_ok";
+      this._lastDownload = 1234;
+      this.homepage = "https://easylist.adblockplus.org/";
+      this.downloadStatus = params.downloadStatus;
     },
 
     SpecialSubscription: function(url)
     {
       this.url = url;
       this.disabled = false;
       this.filters = knownFilters.slice();
     }
   };
   modules.subscriptionClasses.Subscription.fromURL = function(url)
   {
     if (url in knownSubscriptions)
       return knownSubscriptions[url];
 
     if (/^https?:\/\//.test(url))
       return new modules.subscriptionClasses.Subscription(url);
     else
       return new modules.subscriptionClasses.SpecialSubscription(url);
   };
   modules.subscriptionClasses.DownloadableSubscription = modules.subscriptionClasses.Subscription;
+
+  modules.subscriptionClasses.Subscription.prototype =
+  {
+    get lastDownload()
+    {
+      return this._lastDownload;
+    },
+    set lastDownload(value)
+    {
+      this._lastDownload = value;
+      modules.filterNotifier.FilterNotifier.triggerListeners("subscription.lastDownload", this);
+    }
+  };
 
   modules.filterStorage = {
     FilterStorage: {
       get subscriptions()
       {
         var subscriptions = [];
         for (var url in modules.filterStorage.FilterStorage.knownSubscriptions)
           subscriptions.push(modules.filterStorage.FilterStorage.knownSubscriptions[url]);
         return subscriptions;
       },
@@ skipping 76 matching lines @@
         filters: text.split("\n")
           .filter(function(filter) {return !!filter;})
           .map(modules.filterClasses.Filter.fromText),
         errors: []
       };
     }
   };
 
   modules.synchronizer = {
     Synchronizer: {
+      downloading: false,

[Thomas Greiner, 2016/02/04 20:23:46]

Detail: Since this is a "private" property I'd suggest renaming it to
"_downloading".

       execute: function(subscription, manual) 
       {
-        subscription.lastDownload = Date.now() / 1000;
-        modules.filterNotifier.FilterNotifier.triggerListeners("subscription.updated", subscription);

[Thomas Greiner, 2016/01/19 11:27:26]

Since you added error messages as part of this review, what about adding the
ability to simulate those in the test environment?

[saroyanm, 2016/01/22 09:55:03]

Done.

+        subscription.lastDownload = 0;
+        modules.synchronizer.Synchronizer.downloading = true;
+        setTimeout(function()
+        {
+          modules.synchronizer.Synchronizer.downloading = false;
+          subscription.lastDownload = Date.now() / 1000;
+        }, 500);
+      },
+      isExecuting: function(url)
+      {
+        return modules.synchronizer.Synchronizer.downloading;
       }
     }
   };
 
   modules.matcher = {
     defaultMatcher: {
       matchesAny: function(url, requestType, docDomain, thirdParty)
       {
         var blocked = params.blockedURLs.split(",");
         if (blocked.indexOf(url) >= 0)
@@ skipping 81 matching lines @@
 
   var subscriptions = [
     "https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt",
     "https://easylist-downloads.adblockplus.org/exceptionrules.txt",
     "https://easylist-downloads.adblockplus.org/fanboy-social.txt",
     "~user~786254"
   ];
   var knownSubscriptions = Object.create(null);
   for (var subscriptionUrl of subscriptions)
     knownSubscriptions[subscriptionUrl] = modules.subscriptionClasses.Subscription.fromURL(subscriptionUrl);
+

[Thomas Greiner, 2016/02/04 20:23:45]

Detail: This empty line has been added without touching any other part of the
code in this area so better revert it.

   var customSubscription = knownSubscriptions["~user~786254"];
 
   global.seenDataCorruption = params.seenDataCorruption;
   global.filterlistsReinitialized = params.filterlistsReinitialized;
 
   if (params.addSubscription)
   {
     // We don't know how long it will take for the page to fully load
     // so we'll post the message after one second
     setTimeout(function()
     {
       window.postMessage({
         type: "message",
         payload: {
           title: "Custom subscription",
           url: "http://example.com/custom.txt",
           type: "add-subscription"
         }
       }, "*");
     }, 1000);
   }
 })(this);