issue #690 - don't consider special subscriptions when complaining about high subscription count

chrome/content/ui/sendReport.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 715 matching lines @@
       this.data.parentNode.removeChild(this.data);
   }
 };
 
 let subscriptionUpdateDataSource =
 {
   contentWnd: null,
   type: null,
   outdated: null,
   needUpdate: null,
+  
+  subscriptionFilter: function(s)
+  {
+    if (s instanceof DownloadableSubscription)
+      return subscriptionsDataSource.subscriptionFilter(s);
+    else
+      return false;
+  },
 
   collectData: function(wnd, windowURI, callback)
   {
     this.contentWnd = wnd;
     let now = Date.now() / MILLISECONDS_IN_SECOND;
     let outdatedThreshold = now - 14 * SECONDS_IN_DAY;
     let needUpdateThreshold = now - 1 * SECONDS_IN_HOUR;
 
     this.outdated = [];
     this.needUpdate = [];
 
-    let subscriptions = FilterStorage.subscriptions.filter(issuesDataSource.subscriptionFilter);
+    let subscriptions = FilterStorage.subscriptions.filter(this.subscriptionFilter);
     for (let i = 0; i < subscriptions.length; i++)
     {
       let lastSuccess = subscriptions[i].lastSuccess;
       if (lastSuccess < outdatedThreshold)
         this.outdated.push(subscriptions[i]);
       if (lastSuccess < needUpdateThreshold)
         this.needUpdate.push(subscriptions[i]);
     }
 
     callback();
@@ skipping 114 matching lines @@
 }
 
 let issuesDataSource =
 {
   contentWnd: null,
   isEnabled: Prefs.enabled,
   whitelistFilter: null,
   disabledFilters: [],
   disabledSubscriptions: [],
   ownFilters: [],
-  numGeneralSubscriptions: 0,

[Wladimir Palant, 2014/07/28 09:17:18]

I see no point renaming this property, your new name doesn't explain any more
than the old one did.

[saroyanm, 2014/07/28 09:49:20]

Done.

+  numSubscriptions: 0,
   numAppliedFilters: Infinity,
 
   subscriptionFilter: function(s)
   {
-    if (s instanceof DownloadableSubscription)
+    if (s instanceof DownloadableSubscription &&
+        s.url != Prefs.subscriptions_exceptionsurl &&
+        s.url != Prefs.subscriptions_antiadblockurl)
+    {
       return subscriptionsDataSource.subscriptionFilter(s);
+    }
     else
       return false;
   },
 
   collectData: function(wnd, windowURI, callback)
   {
     this.contentWnd = wnd;
     this.whitelistFilter = Policy.isWindowWhitelisted(wnd);
 
     if (!this.whitelistFilter && this.isEnabled)
@@ skipping 43 matching lines @@
 
           let filter = disabledMatcher.matchesAny(request.location, request.typeDescr, request.docDomain, request.thirdParty);
           if (filter && !(subscription.url in seenSubscriptions))
           {
             this.disabledSubscriptions.push(subscription);
             seenSubscriptions[subscription.text] = true;
             break;
           }
         }
       }
-      
-      for each (let {url} in FilterStorage.subscriptions.filter(this.subscriptionFilter))

[saroyanm, 2014/07/26 19:52:07]

Not sure if we need separate generalSubscriptionFilter, for not to iterate, but
I guess we can be okey with this solution.

[Wladimir Palant, 2014/07/28 09:17:18]

Please simply extend subscriptionFilter - this function is only used in
issuesDataSource and nowhere else. Note that it is already different from
subscriptionsDataSource.subscriptionFilter because the requirements are
different here.

[saroyanm, 2014/07/28 09:49:20]

Seams like the issuesDataSource.subscriptionFilter also used by
subscriptionUpdateDataSource, so I've created
subscriptionUpdateDataSource.subscriptionFilter, to also check whether all
subscripptions updated or not, including "Anti adblock notifications" and
"whitelist".

-        if (url != Prefs.subscriptions_exceptionsurl && url != Prefs.subscriptions_antiadblockurl)
-          this.numGeneralSubscriptions++;
-
+
+      this.numSubscriptions = FilterStorage.subscriptions.filter(this.subscriptionFilter).length;
       this.numAppliedFilters = 0;
       for each (let filter in filtersDataSource.origFilters)
       {
         if (filter instanceof WhitelistFilter)
           continue;
 
         this.numAppliedFilters++;
         if (filter.subscriptions.some(function(subscription) subscription instanceof SpecialSubscription))
           this.ownFilters.push(filter);
       }
     }
 
     callback();
   },
 
   updateIssues: function(type)
   {
     if (type == "other")
     {
       E("typeSelectorPage").next = "typeWarning";
       return;
     }
 
     E("issuesWhitelistBox").hidden = !this.whitelistFilter;
     E("issuesDisabledBox").hidden = this.isEnabled;
     E("issuesNoFiltersBox").hidden = (type != "false positive" || this.numAppliedFilters > 0);
-    E("issuesNoSubscriptionsBox").hidden = (type != "false negative" || this.numAppliedFilters > 0 || this.numGeneralSubscriptions > 0);
-    E("issuesSubscriptionCountBox").hidden = (this.numGeneralSubscriptions < 5);
+    E("issuesNoSubscriptionsBox").hidden = (type != "false negative" || this.numAppliedFilters > 0 || this.numSubscriptions > 0);
+    E("issuesSubscriptionCountBox").hidden = (this.numSubscriptions < 5);
 
     let ownFiltersBox = E("issuesOwnFilters");
     if (this.ownFilters.length && !ownFiltersBox.firstChild)
     {
       let template = E("issuesOwnFiltersTemplate");
       for each (let filter in this.ownFilters)
       {
         let element = template.cloneNode(true);
         element.removeAttribute("id");
         element.removeAttribute("hidden");
@@ skipping 570 matching lines @@
 
 function censorURL(url)
 {
   return url.replace(/([?;&\/#][^?;&\/#]+?=)[^?;&\/#]+/g, "$1*");
 }
 
 function encodeHTML(str)
 {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }