Issue 394 - hit statistics tool data collection (core)

lib/filterStorage.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
@@ skipping 11 matching lines @@
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 let {IO} = require("io");
 let {Prefs} = require("prefs");
 let {Filter, ActiveFilter} = require("filterClasses");
 let {Subscription, SpecialSubscription, ExternalSubscription} = require("subscriptionClasses");
 let {FilterNotifier} = require("filterNotifier");
 let {Utils} = require("utils");
-let {FilterHits} = require("filterHits");

[Wladimir Palant, 2016/02/29 14:40:30]

Same here, you cannot expect this module to be present.

[saroyanm, 2016/03/18 18:24:47]

Done.

+let FilterHits = null;
+try
+{
+  ({FilterHits} = require("filterHits"));
+}
+catch (e) {}
 
 /**
  * Version number of the filter storage file format.
  * @type Integer
  */
 let formatVersion = 4;
 
 /**
  * This class reads user's filters from disk, manages them in memory and writes them back.
  * @class
@@ skipping 276 matching lines @@
     subscription.filters.splice(oldPosition, 1);
     subscription.filters.splice(newPosition, 0, filter);
     FilterNotifier.triggerListeners("filter.moved", filter, subscription, oldPosition, newPosition);
   },
 
   /**
    * Increases the hit count for a filter by one
    * @param {Filter} filter
    * @param {String} hostname of top window where the match originated in
    */
-  increaseHitCount: function(filter, hostname)
+  increaseHitCount: function(filter, hostname, thirdParty)
   {
     if (!Prefs.savestats || !(filter instanceof ActiveFilter))
       return;
 
     filter.hitCount++;
     filter.lastHit = Date.now();
-    if (Prefs.sendstats)

[saroyanm, 2016/02/19 18:31:35]

Hmm, I think it's make sense to check if the module exists, or move filter hit
statistics to the core as well ? 

[Wladimir Palant, 2016/02/29 14:40:31]

Currently that module has too much Firefox-specific stuff in it to be moved into
core.

-      FilterHits.increaseFilterHits(filter, hostname);
+    if (Prefs.sendstats && FilterHits)
+      FilterHits.increaseFilterHits(filter, hostname, thirdParty);
   },
 
   /**
    * Resets hit count for some filters
    * @param {Filter[]} filters  filters to be reset, if null all filters will be reset
    */
   resetHitCounts: function(filters)
   {
     if (!filters)
     {
@@ skipping 447 matching lines @@
       Subscription.knownSubscriptions = origKnownSubscriptions;
     }
 
     // Allow events to be processed every now and then.
     // Note: IO.readFromFile() will deal with the potential reentrance here.
     this.linesProcessed++;
     if (this.linesProcessed % 1000 == 0)
       Utils.yield();
   }
 };