Issue 5757 - Update buildtools dependency, (re)move legacy extensions

sitescripts/stats/bin/logprocessor.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-present 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
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 20 matching lines @@
 import subprocess
 import sys
 import traceback
 import urllib
 import urlparse
 
 import sitescripts.stats.common as common
 from sitescripts.utils import get_config, setupStderr
 
 log_regexp = None
-gecko_apps = None
+KNOWN_APPS = {

[tlucas, 2017/11/02 10:03:29]

I am not sure whether we (still) need all of these. Please let me know!

[Vasily Kuznetsov, 2017/11/30 17:34:00]

I suppose they might be needed because of users with legacy versions. In any
case, if we remove them, it should be a separate ticket, and we should probably
also remove all the related code in the file.

[tlucas, 2017/11/30 18:15:26]

By removing the code, you also mean "in a separate issue" - am i right?

[Vasily Kuznetsov, 2017/11/30 19:10:08]

Yes.

+    '{55aba3ac-94d3-41a8-9e25-5c21fe874539}': 'adblockbrowser',
+    '{a79fe89b-6662-4ff4-8e88-09950ad4dfde}': 'conkeror',
+    'dlm@emusic.com': 'emusic',
+    '{a23983c0-fd0e-11dc-95ff-0800200c9a66}': 'fennec',
+    '{aa3c5121-dab2-40e2-81ca-7ea25febc110}': 'fennec2',
+    '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}': 'firefox',
+    '{aa5ca914-c309-495d-91cf-3141bbb04115}': 'midbrowser',
+    'prism@developer.mozilla.org': 'prism',
+    '{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}': 'seamonkey',
+    'songbird@songbirdnest.com': 'songbird',
+    '{3550f703-e582-4d05-9a08-453d09bdfdc6}': 'thunderbird',
+    'toolkit@mozilla.org': 'toolkit',
+}
 
 
 class StatsFile:
     def __init__(self, path):
         self._inner_file = None
         self._processes = []
 
         parseresult = urlparse.urlparse(path)
         if parseresult.scheme == 'ssh' and parseresult.username and parseresult.hostname and parseresult.path:
             command = [
@@ skipping 313 matching lines @@
         return file.split('/')[-2]
     else:
         return None
 
 
 def parse_gecko_query(query):
     params = urlparse.parse_qs(query)
 
     version = params.get('version', ['unknown'])[0]
 
-    global gecko_apps
-    if gecko_apps == None:
-        from buildtools.packagerGecko import KNOWN_APPS
-        gecko_apps = {v: k for k, v in KNOWN_APPS.iteritems()}
     appID = params.get('appID', ['unknown'])[0]
 
-    application = gecko_apps.get(appID, 'unknown')
+    application = KNOWN_APPS.get(appID, 'unknown')
     applicationVersion = params.get('appVersion', ['unknown'])[0]
 
     # Only leave the major and minor release number for application
     applicationVersion = re.sub(r'^(\d+\.\d+).*', r'\1', applicationVersion)
 
     return version, application, applicationVersion
 
 
 def parse_chrome_query(query):
     params = urlparse.parse_qs(query)
@@ skipping 202 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)