Issue 3048 - Mark inactive notifications instead of removing them

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,
@@ skipping 100 matching lines @@
   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
-          current_time = datetime.datetime.now()
-          start = notification.pop("start", None)
-          if start is not None and current_time < start:
-            continue
-          end = notification.pop("end", None)
-          if end is not None and current_time > end:
-            continue
+          if not "inactive" in notification:
+            current_time = datetime.datetime.now()
+            start = notification.pop("start", None)
+            end = notification.pop("end", None)
+            if ((start is not None and current_time < start) or
+                (end is not None and current_time > end)):

[Sebastian Noack, 2015/09/10 13:29:20]

I think I found a way to simplify that logic:

  start = notification.pop("start", current_time)
  end = notification.pop("end", current_time)

  if not start <= current_time <= end:
    ..

[Felix Dahlke, 2015/09/11 07:04:43]

Indeed, that's much better - done.

+              notification["inactive"] = True
           notifications.append(notification)
         except:
           traceback.print_exc()
   return notifications