Seconds/minutes/hours/days between checks form field upgrade from 'minutes' only (#512)

changedetectionio/model/Watch.py

@@ -12,17 +12,16 @@ from changedetectionio.notification import (
 
 
 class model(dict):
-    def __init__(self, *arg, **kw):
-        self.update({
+    base_config = {
             'url': None,
             'tag': None,
             'last_checked': 0,
             'last_changed': 0,
             'paused': False,
             'last_viewed': 0,  # history key value of the last viewed via the [diff] link
-            'newest_history_key': "",
+            'newest_history_key': 0,
             'title': None,
-            'previous_md5': "",
+            'previous_md5': False,
             'uuid': str(uuid_builder.uuid4()),
             'headers': {},  # Extra headers to send
             'body': None,
@@ -42,21 +41,27 @@ class model(dict):
             # Re #110, so then if this is set to None, we know to use the default value instead
             # Requires setting to None on submit if it's the same as the default
             # Should be all None by default, so we use the system default in this case.
-            'minutes_between_check': None
-        })
+            'time_between_check': {'weeks': None, 'days': None, 'hours': None, 'minutes': None, 'seconds': None}
+        }
+
+    def __init__(self, *arg, **kw):
+        self.update(self.base_config)
         # goes at the end so we update the default object with the initialiser
         super(model, self).__init__(*arg, **kw)
 
 
     @property
     def has_empty_checktime(self):
-        if self.get('minutes_between_check', None):
-            return False
-        return True
+        # using all() + dictionary comprehension
+        # Check if all values are 0 in dictionary
+        res = all(x == None or x == False or x==0 for x in self.get('time_between_check', {}).values())
+        return res
 
-    @property
     def threshold_seconds(self):
-        sec = self.get('minutes_between_check', None)
-        if sec:
-            sec = sec * 60
-        return sec
+        seconds = 0
+        mtable = {'seconds': 1, 'minutes': 60, 'hours': 3600, 'days': 86400, 'weeks': 86400 * 7}
+        for m, n in mtable.items():
+            x = self.get('time_between_check', {}).get(m, None)
+            if x:
+                seconds += x * n
+        return seconds