Issue 3862 - Make filterListener use the new FilterNotifier API

lib/filterListener.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * 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.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * @fileOverview Component synchronizing filter storage with Matcher instances and ElemHide.
  */
 
+"use strict";
+
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 let {FilterStorage} = require("filterStorage");
 let {FilterNotifier} = require("filterNotifier");
 let {ElemHide} = require("elemHide");
 let {CSSRules} = require("cssRules");
 let {defaultMatcher} = require("matcher");
 let {ActiveFilter, RegExpFilter, ElemHideBase, CSSPropertyFilter} =
     require("filterClasses");
@@ skipping 68 matching lines @@
     }
   },
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIObserver])
 };
 
 /**
  * Initializes filter listener on startup, registers the necessary hooks.
  */
 function init()
 {
-  FilterNotifier.addListener(function(action, item, newValue, oldValue)
-  {
-    let match = /^(\w+)\.(.*)/.exec(action);
-    if (match && match[1] == "filter")
-      onFilterChange(match[2], item, newValue, oldValue);
-    else if (match && match[1] == "subscription")
-      onSubscriptionChange(match[2], item, newValue, oldValue);
-    else
-      onGenericChange(action, item);
-  });
+  FilterNotifier.on("filter.hitCount", onFilterHitCount);
+  FilterNotifier.on("filter.lastHit", onFilterLastHit);
+  FilterNotifier.on("filter.added", onFilterAdded);
+  FilterNotifier.on("filter.removed", onFilterRemoved);
+  FilterNotifier.on("filter.disabled", onFilterDisabled);
+
+  FilterNotifier.on("subscription.added", onSubscriptionAdded);
+  FilterNotifier.on("subscription.removed", onSubscriptionRemoved);
+  FilterNotifier.on("subscription.disabled", onSubscriptionDisabled);
+  FilterNotifier.on("subscription.updated", onSubscriptionUpdated);
+
+  FilterNotifier.on("load", onLoad);
+  FilterNotifier.on("save", onSave);
+
 
   if ("nsIStyleSheetService" in Ci)
     ElemHide.init();
   else
     flushElemHide = function() {};    // No global stylesheet in Chrome & Co.
   FilterStorage.loadFromDisk();
 
   Services.obs.addObserver(HistoryPurgeObserver, "browser:purge-session-history", true);
   onShutdown.add(function()
   {
@@ skipping 63 matching lines @@
     defaultMatcher.remove(filter);
   else if (filter instanceof ElemHideBase)
   {
     if (filter instanceof CSSPropertyFilter)
       CSSRules.remove(filter);
     else
       ElemHide.remove(filter);
   }
 }
 
-/**
- * Subscription change listener
- */
-function onSubscriptionChange(action, subscription, newValue, oldValue)
+function onSubscriptionAdded(subscription)
 {
   FilterListener.setDirty(1);
 
-  if (action != "added" && action != "removed" && action != "disabled" && action != "updated")
-    return;
+  if (subscription.url in FilterStorage.knownSubscriptions && !subscription.disabled)

[kzar, 2016/03/23 16:02:32]

Nit: Mind wrapping this long line?

[Wladimir Palant, 2016/03/23 16:12:39]

`subscription.url in FilterStorage.knownSubscriptions` check can be removed,
this notification means that the subscription has been added.

[Sebastian Noack, 2016/03/23 17:56:09]

Done.

+  {
+    subscription.filters.forEach(addFilter);
+    flushElemHide();
+  }
+}
 
-  if (action != "removed" && !(subscription.url in FilterStorage.knownSubscriptions))
+function onSubscriptionRemoved(subscription)
+{
+  FilterListener.setDirty(1);
+
+  if (!subscription.disabled)
   {
-    // Ignore updates for subscriptions not in the list
-    return;
+    subscription.filters.forEach(removeFilter);
+    flushElemHide();
   }
+}
 
-  if ((action == "added" || action == "removed" || action == "updated") && subscription.disabled)
+function onSubscriptionDisabled(subscription, newValue)
+{
+  FilterListener.setDirty(1);
+
+  if (subscription.url in FilterStorage.knownSubscriptions)
   {
-    // Ignore adding/removing/updating of disabled subscriptions
-    return;
+    if (newValue == false)
+      subscription.filters.forEach(addFilter);
+    else
+      subscription.filters.forEach(removeFilter);
+    flushElemHide();
   }
+}
 
-  if (action == "added" || action == "removed" || action == "disabled")
-  {
-    let method = (action == "added" || (action == "disabled" && newValue == false) ? addFilter : removeFilter);
-    if (subscription.filters)
-      subscription.filters.forEach(method);
-  }
-  else if (action == "updated")
+function onSubscriptionUpdated(subscription)
+{
+  FilterListener.setDirty(1);
+

[kzar, 2016/03/23 16:02:32]

Nit: ... and this one.

[Sebastian Noack, 2016/03/23 17:56:09]

Done.

+  if (subscription.url in FilterStorage.knownSubscriptions && !subscription.disabled)
   {
     subscription.oldFilters.forEach(removeFilter);
     subscription.filters.forEach(addFilter);
+    flushElemHide();
   }
-
-  flushElemHide();
 }
 
-/**
- * Filter change listener
- */
-function onFilterChange(action, filter, newValue, oldValue)
+function onFilterHitCount(filter, newValue)
 {
-  if (action == "hitCount" && newValue == 0)
+  if (newValue == 0)
+    FilterListener.setDirty(0);
+  else
+    FilterListener.setDirty(0.002);
+}
+
+function onFilterLastHit()
+{
+  FilterListener.setDirty(0.002);
+}
+
+function onFilterAdded(filter)
+{
+  FilterListener.setDirty(1);
+
+  if (!filter.disabled)
   {
-    // Filter hits are being reset, make sure these changes are saved.
-    FilterListener.setDirty(0);
+    addFilter(filter);
+    flushElemHide();
   }
-  else if (action == "hitCount" || action == "lastHit")
-    FilterListener.setDirty(0.002);
-  else
-    FilterListener.setDirty(1);
+}
 
-  if (action != "added" && action != "removed" && action != "disabled")
-    return;
+function onFilterRemoved(filter)
+{
+  FilterListener.setDirty(1);
 
-  if ((action == "added" || action == "removed") && filter.disabled)
+  if (!filter.disabled)
   {
-    // Ignore adding/removing of disabled filters
-    return;
+    removeFilter(filter);
+    flushElemHide();
   }
+}
 
-  if (action == "added" || (action == "disabled" && newValue == false))
+function onFilterDisabled(filter, newValue)
+{
+  FilterListener.setDirty(1);
+
+  if (newValue == false)
     addFilter(filter);
   else
     removeFilter(filter);
   flushElemHide();
 }
 
-/**
- * Generic notification listener
- */
-function onGenericChange(action)
+function onLoad()
 {
-  if (action == "load")
-  {
-    isDirty = 0;
+  isDirty = 0;
 
-    defaultMatcher.clear();
-    ElemHide.clear();
-    CSSRules.clear();
-    for (let subscription of FilterStorage.subscriptions)
-      if (!subscription.disabled)
-        subscription.filters.forEach(addFilter);
-    flushElemHide();
-  }
-  else if (action == "save")
-    isDirty = 0;
+  defaultMatcher.clear();
+  ElemHide.clear();
+  CSSRules.clear();
+  for (let subscription of FilterStorage.subscriptions)
+    if (!subscription.disabled)
+      subscription.filters.forEach(addFilter);
+  flushElemHide();
 }
+
+function onSave()
+{
+  isDirty = 0;
+}