Stats processing: Add previousDownload field in addition to downloadInterval

sitescripts/stats/bin/logprocessor.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2013 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 197 matching lines @@
   last_version = params.get("lastVersion", ["unknown"])[0]
   if info["file"] == "notification.json" and last_version == "0" and (
       (info["addonName"] == "adblockplus" and info["addonVersion"] == "2.3.1") or
       (info["addonName"] in ("adblockpluschrome", "adblockplusopera") and info["addonVersion"] == "1.5.2")
     ):
     # Broken notification version number in these releases, treat like unknown
     last_version = "unknown"
 
   if last_version == "unknown":
     info["downloadInterval"] = "unknown"
+    info["previousDownload"] = "unknown"
   elif last_version == "0":
     info["downloadInterval"] = "unknown"
+    info["previousDownload"] = "unknown"
     info["firstDownload"] = True
   else:
     try:
       last_update = parse_lastversion(last_version)
       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)
+      else:
+        info["previousDownload"] = "%i year(s)" % (diffdays / 365)
+
       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"
+      info["previousDownload"] = "unknown"
       pass
 
 def parse_addon_name(file):
   if "/" in file:
     return file.split("/")[-2]
   else:
     return None
 
 def parse_gecko_query(query):
   params = urlparse.parse_qs(query)
@@ skipping 139 matching lines @@
 if __name__ == "__main__":
   setupStderr()
 
   verbose = (len(sys.argv) >= 2 and sys.argv[1] == "verbose")
   geo = pygeoip.GeoIP(get_config().get("stats", "geoip_db"), pygeoip.MEMORY_CACHE)
   geov6 = pygeoip.GeoIP(get_config().get("stats", "geoipv6_db"), pygeoip.MEMORY_CACHE)
   result = parse_stdin(geo, geov6, verbose)
 
   with codecs.open(get_config().get("stats", "tempFile"), "wb", encoding="utf-8") as file:
     json.dump(result, file, indent=2, sort_keys=True)