From 197a3e6366d9fcbb9a3e7c6441671523f9689cbb Mon Sep 17 00:00:00 2001
From: dgtlmoon <dgtlmoon@gmail.com>
Date: Thu, 27 Oct 2022 11:21:55 +0200
Subject: [PATCH] cleanup of backup creation

---
 changedetectionio/__init__.py  |  16 ++++++----------
 changedetectionio/download.zip | Bin 0 -> 2083 bytes
 2 files changed, 6 insertions(+), 10 deletions(-)
 create mode 100644 changedetectionio/download.zip

diff --git a/changedetectionio/__init__.py b/changedetectionio/__init__.py
index 3b32ed2d3..383c5bf78 100644
--- a/changedetectionio/__init__.py
+++ b/changedetectionio/__init__.py
@@ -987,9 +987,6 @@ def changedetection_app(config=None, datastore_o=None):
 
         # create a ZipFile object
         backupname = "changedetection-backup-{}.zip".format(int(time.time()))
-
-        # We only care about UUIDS from the current index file
-        uuids = list(datastore.data['watching'].keys())
         backup_filepath = os.path.join(datastore_o.datastore_path, backupname)
 
         with zipfile.ZipFile(backup_filepath, "w",
@@ -1005,13 +1002,12 @@ def changedetection_app(config=None, datastore_o=None):
             # Add the flask app secret
             zipObj.write(os.path.join(datastore_o.datastore_path, "secret.txt"), arcname="secret.txt")
 
-            # Add any data in the watch datadir
-            # Use the full path to access the file, but make the file 'relative' in the Zip.
-            for txt_file_path in Path(datastore_o.datastore_path).rglob('*-*-*-*'):
-                parent_p = txt_file_path.parent
-                if parent_p.name in uuids:
-                    zipObj.write(txt_file_path,
-                                 arcname=os.path.join(txt_file_path.parts[-2], txt_file_path.parts[-1]),
+            # Add any data in the watch data directory.
+            for uuid, w in datastore.data['watching'].items():
+                for f in Path(w.watch_data_dir).glob('*'):
+                    zipObj.write(f,
+                                 # Use the full path to access the file, but make the file 'relative' in the Zip.
+                                 arcname=os.path.join(f.parts[-2], f.parts[-1]),
                                  compress_type=zipfile.ZIP_DEFLATED,
                                  compresslevel=8)
 
diff --git a/changedetectionio/download.zip b/changedetectionio/download.zip
new file mode 100644
index 0000000000000000000000000000000000000000..b4658ada34a5d6b6c022ae832c7ba91ec5aaf905
GIT binary patch
literal 2083
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
G%mV<OKO@Kh

literal 0
HcmV?d00001