fix regression in per-list filter counts (reported by @mapx-)

gorhill · gorhill · commit 5c20182948c8 · 2017-12-29T13:31:37.000-05:00
diff --git a/src/js/html-filtering.js b/src/js/html-filtering.js
@@ -30,6 +30,8 @@
         filterDB = new &micro;b.staticExtFilteringEngine.HostnameBasedDB(),
         pselectors = new Map(),
         duplicates = new Set(),
+        acceptedCount = 0,
+        discardedCount = 0,
         docRegister, loggerRegister;
 
     var PSelectorHasTask = function(task) {
@@ -224,6 +226,8 @@
         filterDB.clear();
         pselectors.clear();
         duplicates.clear();
+        acceptedCount = 0;
+        discardedCount = 0;
     };
 
     api.freeze = function() {
@@ -260,8 +264,12 @@
         reader.select(1002);
 
         while ( reader.next() ) {
+            acceptedCount += 1;
             var fingerprint = reader.fingerprint();
-            if ( duplicates.has(fingerprint) ) { continue; }
+            if ( duplicates.has(fingerprint) ) {
+                discardedCount += 1;
+                continue;
+            }
             duplicates.add(fingerprint);
             var args = reader.args();
             filterDB.add(args[1], {
@@ -374,6 +382,19 @@
         }
     };
 
+    Object.defineProperties(api, {
+        acceptedCount: {
+            get: function() {
+                return acceptedCount;
+            }
+        },
+        discardedCount: {
+            get: function() {
+                return discardedCount;
+            }
+        }
+    });
+
     return api;
 })();
 
diff --git a/src/js/scriptlet-filtering.js b/src/js/scriptlet-filtering.js
@@ -29,6 +29,8 @@
     var &micro;b = &micro;Block,
         scriptletDB = new &micro;b.staticExtFilteringEngine.HostnameBasedDB(),
         duplicates = new Set(),
+        acceptedCount = 0,
+        discardedCount = 0,
         scriptletCache = new &micro;b.MRUCache(32),
         exceptionsRegister = new Set(),
         scriptletsRegister = new Map(),
@@ -103,6 +105,8 @@
     api.reset = function() {
         scriptletDB.clear();
         duplicates.clear();
+        acceptedCount = 0;
+        discardedCount = 0;
     };
 
     api.freeze = function() {
@@ -154,8 +158,12 @@
         reader.select(1001);
 
         while ( reader.next() ) {
+            acceptedCount += 1;
             var fingerprint = reader.fingerprint();
-            if ( duplicates.has(fingerprint) ) { continue; }
+            if ( duplicates.has(fingerprint) ) {
+                discardedCount += 1;
+                continue;
+            }
             duplicates.add(fingerprint);
             var args = reader.args();
             if ( args.length < 4 ) { continue; }
@@ -264,6 +272,19 @@
         scriptletDB = new &micro;b.staticExtFilteringEngine.HostnameBasedDB(selfie);
     };
 
+    Object.defineProperties(api, {
+        acceptedCount: {
+            get: function() {
+                return acceptedCount;
+            }
+        },
+        discardedCount: {
+            get: function() {
+                return discardedCount;
+            }
+        }
+    });
+
     return api;
 })();
 
diff --git a/src/js/static-ext-filtering.js b/src/js/static-ext-filtering.js
@@ -668,6 +668,23 @@
         };
     };
 
+    Object.defineProperties(api, {
+        acceptedCount: {
+            get: function() {
+                return &micro;b.cosmeticFilteringEngine.acceptedCount +
+                       &micro;b.scriptletFilteringEngine.acceptedCount +
+                       &micro;b.htmlFilteringEngine.acceptedCount;
+            }
+        },
+        discardedCount: {
+            get: function() {
+                return &micro;b.cosmeticFilteringEngine.discardedCount +
+                       &micro;b.scriptletFilteringEngine.discardedCount +
+                       &micro;b.htmlFilteringEngine.discardedCount;
+            }
+        }
+    });
+
     api.fromSelfie = function(selfie) {
         &micro;b.cosmeticFilteringEngine.fromSelfie(selfie.cosmetic);
         &micro;b.scriptletFilteringEngine.fromSelfie(selfie.scriptlets);
diff --git a/src/js/storage.js b/src/js/storage.js
@@ -562,14 +562,16 @@
 
     var applyCompiledFilters = function(assetKey, compiled) {
         var snfe = &micro;b.staticNetFilteringEngine,
-            cfe = &micro;b.cosmeticFilteringEngine,
-            acceptedCount = snfe.acceptedCount + cfe.acceptedCount,
-            discardedCount = snfe.discardedCount + cfe.discardedCount;
+            sxfe = &micro;b.staticExtFilteringEngine,
+            acceptedCount = snfe.acceptedCount + sxfe.acceptedCount,
+            discardedCount = snfe.discardedCount + sxfe.discardedCount;
         &micro;b.applyCompiledFilters(compiled, assetKey === &micro;b.userFiltersPath);
         if ( &micro;b.availableFilterLists.hasOwnProperty(assetKey) ) {
             var entry = &micro;b.availableFilterLists[assetKey];
-            entry.entryCount = snfe.acceptedCount + cfe.acceptedCount - acceptedCount;
-            entry.entryUsedCount = entry.entryCount - (snfe.discardedCount + cfe.discardedCount - discardedCount);
+            entry.entryCount = snfe.acceptedCount + sxfe.acceptedCount -
+                acceptedCount;
+            entry.entryUsedCount = entry.entryCount -
+                (snfe.discardedCount + sxfe.discardedCount - discardedCount);
         }
         loadedListKeys.push(assetKey);
     };

-Original file line number
+Diff line change
         };
     };
 +    Object.defineProperties(api, {
 +        acceptedCount: {
 +            get: function() {
 +                return µb.cosmeticFilteringEngine.acceptedCount +
 +                       µb.scriptletFilteringEngine.acceptedCount +
 +                       µb.htmlFilteringEngine.acceptedCount;
 +            }
 +        },
 +        discardedCount: {
 +            get: function() {
 +                return µb.cosmeticFilteringEngine.discardedCount +
 +                       µb.scriptletFilteringEngine.discardedCount +
 +                       µb.htmlFilteringEngine.discardedCount;
 +            }
 +        }
 +    });
++
     api.fromSelfie = function(selfie) {
         µb.cosmeticFilteringEngine.fromSelfie(selfie.cosmetic);
         µb.scriptletFilteringEngine.fromSelfie(selfie.scriptlets);