Issue 527 - Only process notification requests sent by our own extensions

sitescripts/stats/bin/logprocessor.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # 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,
@@ skipping 281 matching lines @@
       diff = info["time"] - last_update
       if diff.days >= 365:
         info["downloadInterval"] = "%i year(s)" % (diff.days / 365)
       elif diff.days >= 30:
         info["downloadInterval"] = "%i month(s)" % (diff.days / 30)
       elif diff.days >= 1:
         info["downloadInterval"] = "%i day(s)" % diff.days
       else:
         info["downloadInterval"] = "%i hour(s)" % (diff.seconds / 3600)
 
-      diffdays = (info["time"].date() - last_update.date()).days
-      if diffdays == 0:
-        info["previousDownload"] = "same day"
-      elif diffdays < 30:
-        info["previousDownload"] = "%i day(s)" % diffdays
-      elif diffdays < 365:
-        info["previousDownload"] = "%i month(s)" % (diffdays / 30)
+      if info["addonName"].startswith("adblockplus"):
+        diffdays = (info["time"].date() - last_update.date()).days
+        if diffdays == 0:
+          info["previousDownload"] = "same day"
+        elif diffdays < 30:
+          info["previousDownload"] = "%i day(s)" % diffdays
+        elif diffdays < 365:
+          info["previousDownload"] = "%i month(s)" % (diffdays / 30)
+        else:
+          info["previousDownload"] = "%i year(s)" % (diffdays / 365)
       else:
-        info["previousDownload"] = "%i year(s)" % (diffdays / 365)
+        info["previousDownload"] = "unknown"
 
       if last_update.year != info["time"].year or last_update.month != info["time"].month:
         info["firstInMonth"] = info["firstInDay"] = True
       elif last_update.day != info["time"].day:
         info["firstInDay"] = True
 
       if get_week(last_update) != get_week(info["time"]):
         info["firstInWeek"] = True
     except ValueError:
       info["downloadInterval"] = "unknown"
@@ skipping 97 matching lines @@
   else:
     ignored.add(info["file"])
     return None
 
   if "addonName" in info:
     info["fullAddon"] = "%s %s" % (info["addonName"], info["addonVersion"])
   if "application" in info:
     info["fullApplication"] = "%s %s" % (info["application"], info["applicationVersion"])
   if "platform" in info:
     info["fullPlatform"] = "%s %s" % (info["platform"], info["platformVersion"])
+

[Felix Dahlke, 2014/05/22 08:30:38]

Unrelated whitespace change?

[Sebastian Noack, 2014/05/22 08:40:39]

Done.

   return info
 
 def add_record(info, section, ignore_fields=()):
   section["hits"] = section.get("hits", 0) + 1
   section["bandwidth"] = section.get("bandwidth", 0) + info["size"]
 
   if len(ignore_fields) < 2:
     for field in map(lambda f: f["name"], common.fields):
       if field in ignore_fields or field not in info:
         continue
@@ skipping 104 matching lines @@
   parser.add_argument("mirror_name", nargs="?", help="Name of the mirror server that the file belongs to")
   parser.add_argument("server_type", nargs="?", help="Server type like download, update or subscription")
   parser.add_argument("log_file", nargs="?", help="Log file path, can be a local file path, http:// or ssh:// URL")
   args = parser.parse_args()
 
   if args.mirror_name and args.server_type and args.log_file:
     sources = [(args.mirror_name, args.server_type, args.log_file)]
   else:
     sources = get_stats_files()
   parse_sources(sources, args.factor, args.verbose)