Misc improvements

changedetectionio/__init__.py

@@ -467,8 +467,8 @@ def changedetection_app(config=None, datastore_o=None):
         except KeyError:
             flash('Watch not found', 'error')
         else:
-            flash("Cleared snapshot history for watch {}".format(uuid))
-        #@todo gives 'Not enough saved change detection snapshots to produce a report.' after scrub.. interesting
+            flash("Scrubbed watch {}".format(uuid))
+
         return redirect(url_for('index'))
 
     @app.route("/scrub", methods=['GET', 'POST'])

changedetectionio/store.py

@@ -254,12 +254,23 @@ class ChangeDetectionStore:
     def scrub_watch(self, uuid):
         import pathlib
 
-        self.__data['watching'][uuid].update({'history': {}, 'last_checked': 0, 'last_changed': 0, 'previous_md5': False})
-        self.needs_write_urgent = True
+        self.__data['watching'][uuid].update(
+            {'last_checked': 0,
+             'last_changed': 0,
+             'last_viewed': 0,
+             'previous_md5': False,
+             'last_notification_error': False,
+             'last_error': False})
 
-        for item in pathlib.Path(self.datastore_path).rglob(uuid+"/*.txt"):
+        # JSON Data, Screenshots, Textfiles (history index and snapshots), HTML in the future etc
+        for item in pathlib.Path(os.path.join(self.datastore_path, uuid)).rglob("*.*"):
             unlink(item)
 
+        # Force the attr to recalculate
+        bump = self.__data['watching'][uuid].history
+
+        self.needs_write_urgent = True
+
     def add_watch(self, url, tag="", extras=None, write_to_disk_now=True):
 
         if extras is None: