Issue 2275 - Parse notification groups

sitescripts/notifications/parser.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 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
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 import codecs
 import os
 import re
 import subprocess
 import tarfile
-import time
 import traceback
 from StringIO import StringIO
 
 from sitescripts.utils import get_config
 
 def _parse_targetspec(value, name):
   target = {}
   for spec in value.split():
     known = False
     for parameter in ("extension", "application", "platform"):
@@ skipping 16 matching lines @@
 def _parse_notification(data, name):
   notification = {"id": name, "severity": "information", "message": {}, "title": {}}
   current = notification
 
   for line in data:
     if not re.search(r"\S", line):
       continue
 
     if re.search(r"^\[.*\]$", line):
       current = {"title": {}, "message": {}}
-      if not "variants" in notification:
-        notification["variants"] = []
-      notification["variants"].append(current)
+      notification.setdefault("variants", []).append(current)
       continue
 
     if line.find("=") < 0:
       raise Exception("Could not process line '%s' in file '%s'" % (line.strip(), name))
 
     key, value = map(unicode.strip, line.split("=", 1))
     is_variant = current != notification
 
     if key == "inactive" and not is_variant:
       current["inactive"] = True
     elif key == "severity":
       if value not in ("information", "critical"):
         raise Exception("Unknown severity value '%s' in file '%s'" % (value, name))
       current["severity"] = value
     elif key == "links":
       current["links"] = value.split()
     elif key.startswith("title."):
       locale = key[len("title."):]
       current["title"][locale] = value
     elif key.startswith("message."):
       locale = key[len("message."):]
       current["message"][locale] = value
     elif key == "target":
       target = _parse_targetspec(value, name)
       if "targets" in notification:
         current["targets"].append(target)
       else:
         current["targets"] = [target]
     elif key == "sample" and is_variant:
-      current["sample"] = value
+      current["sample"] = float(value)
     else:
       raise Exception("Unknown parameter '%s' in file '%s'" % (key, name))
 
-  for text_key in ["title", "message"]:

[Sebastian Noack, 2015/04/13 09:04:37]

Please use tuples for sequences that don't need to be mutable.

-    if "en-US" not in notification[text_key] and \
-       (not "variants" in notification or \

[Sebastian Noack, 2015/04/13 09:04:37]

Hint: Newlines don't need to be escaped within parenthesis.

-        not all("en-US" in variant[text_key]
-                for variant in notification["variants"])):
+  for text_key in ("title", "message"):
+    def has_default_locale(variant): return "en-US" in variant[text_key]
+    if (not has_default_locale(notification) and
+        not all(map(has_default_locale, notification.get("variants", [])))):
       raise Exception("No %s for en-US (default language) in file '%s'" %
                       (text_key, name))
   return notification
 
 def load_notifications():
   repo = get_config().get("notifications", "repository")
   subprocess.call(["hg", "-R", repo, "pull", "-q"])
   command = ["hg", "-R", repo, "archive", "-r", "default", "-t", "tar",
       "-p", ".", "-X", os.path.join(repo, ".hg_archival.txt"), "-"]
   data = subprocess.check_output(command)
 
-  result = {"version": time.strftime("%Y%m%d%H%M", time.gmtime()), "notifications": []}
+  notifications = []
   with tarfile.open(mode="r:", fileobj=StringIO(data)) as archive:
     for fileinfo in archive:
       name = fileinfo.name
       if name.startswith("./"):
         name = name[2:]
 
       if fileinfo.type == tarfile.REGTYPE:
         data = codecs.getreader("utf8")(archive.extractfile(fileinfo))
         try:
           notification = _parse_notification(data, name)
           if "inactive" in notification:
             continue
-          result["notifications"].append(notification)
+          notifications.append(notification)
         except:
           traceback.print_exc()
-  return result
+  return notifications