Issue 5458, 5457 - Refactor _parse_targetspec, add support for locales and blockTotal

sitescripts/notifications/parser.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
 # 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 datetime
 import os
 import re
 import subprocess
 import tarfile
 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'):
-            if spec.startswith(parameter + '='):
-                target[parameter] = spec[len(parameter + '='):]
-                known = True
-            elif spec.startswith(parameter + 'Version>='):
-                target[parameter + 'MinVersion'] = spec[len(parameter + 'Version>='):]
-                known = True
-            elif spec.startswith(parameter + 'Version<='):
-                target[parameter + 'MaxVersion'] = spec[len(parameter + 'Version<='):]
-                known = True
-            elif spec.startswith(parameter + 'Version='):
-                target[parameter + 'MinVersion'] = target[parameter + 'MaxVersion'] = spec[len(parameter + 'Version='):]
-                known = True
-        if not known:
-            raise Exception("Unknown target specifier '%s' in file '%s'" % (spec, name))
+
+    items = [
+        (r'^(extension|application|platform)(=)(.+)$', {
+            '=': (lambda k, v: {k: v}),
+        }),
+        (r'^(extension|application|platform)Version(=|\>=|\<=)(.+)$', {
+            '>=': (lambda k, v: {k + 'MinVersion': v}),
+            '<=': (lambda k, v: {k + 'MaxVersion': v}),
+            '=': (lambda k, v: {k + 'MinVersion': v, k + 'MaxVersion': v}),
+        }),
+        (r'^(blockedTotal)(=|\>=|\<=)(\d+)$', {
+            '>=': (lambda k, v: {k + 'Min': int(v)}),
+            '<=': (lambda k, v: {k + 'Max': int(v)}),
+            '=': (lambda k, v: {k + 'Min': int(v), k + 'Max': int(v)}),
+        }),
+        (r'^(locales)(=)([\w\-,]+)$', {
+            '=': (lambda k, v: {k: v.split(',')}),
+        }),
+    ]
+
+    try:
+        for spec in value.split():
+            for regx, ops in items:
+                m = re.search(regx, spec)
+                if m:
+                    key, op, value = m.groups()
+                    target.update(ops[op](key, value))
+                    break
+            else:
+                raise ValueError
+    except (KeyError, ValueError):
+        raise Exception(
+            "Unknown target specifier '{}' in file '{}'".format(spec, name))
+
     return target
 
 
 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
@@ skipping 74 matching lines @@
                     if not 'inactive' in notification:
                         current_time = datetime.datetime.now()
                         start = notification.pop('start', current_time)
                         end = notification.pop('end', current_time)
                         if not start <= current_time <= end:
                             notification['inactive'] = True
                     notifications.append(notification)
                 except:
                     traceback.print_exc()
     return notifications