Update store.py

Better merge/update of new application values
2025-10-31 06:37:41 +00:00 · 2025-07-14 22:36:31 +02:00 · 2025-07-14 18:36:42 +02:00
2 changed files with 5 additions and 8 deletions
--- a/changedetectionio/store.py
+++ b/changedetectionio/store.py
@@ -44,6 +44,8 @@ class ChangeDetectionStore:
    def __init__(self, datastore_path="/datastore", include_default_watches=True, version_tag="0.0.0"):
        # Should only be active for docker
        # logging.basicConfig(filename='/dev/stdout', level=logging.INFO)
+        from deepmerge import always_merger
+
        self.__data = App.model()
        self.datastore_path = datastore_path
        self.json_store_path = os.path.join(self.datastore_path, "url-watches.json")
@@ -75,14 +77,8 @@ class ChangeDetectionStore:
                    self.__data['app_guid'] = from_disk['app_guid']

                if 'settings' in from_disk:
-                    if 'headers' in from_disk['settings']:
-                        self.__data['settings']['headers'].update(from_disk['settings']['headers'])
-
-                    if 'requests' in from_disk['settings']:
-                        self.__data['settings']['requests'].update(from_disk['settings']['requests'])
-
-                    if 'application' in from_disk['settings']:
-                        self.__data['settings']['application'].update(from_disk['settings']['application'])
+                    # update the modal with whats on disk
+                    self.__data['settings'] = always_merger.merge(from_disk['settings'], self.__data['settings'])

                # Convert each existing watch back to the Watch.model object
                for uuid, watch in self.__data['watching'].items():
--- a/requirements.txt
+++ b/requirements.txt
@@ -78,6 +78,7 @@ jq~=1.3; python_version >= "3.8" and sys_platform == "linux"
 # playwright is installed at Dockerfile build time because it's not available on all platforms

 pyppeteer-ng==2.0.0rc10
+deepmerge

 pyppeteerstealth>=0.0.4
Author	SHA1	Message	Date
dgtlmoon	cae79a919c	Update store.py Some checks failed Publish Python 🐍distribution 📦 to PyPI and TestPyPI / Build distribution 📦 (push) Has been cancelled Details ChangeDetection.io App Test / lint-code (push) Has been cancelled Details Publish Python 🐍distribution 📦 to PyPI and TestPyPI / Test the built 📦 package works basically. (push) Has been cancelled Details Publish Python 🐍distribution 📦 to PyPI and TestPyPI / Publish Python 🐍 distribution 📦 to PyPI (push) Has been cancelled Details ChangeDetection.io App Test / test-application-3-10 (push) Has been cancelled Details ChangeDetection.io App Test / test-application-3-11 (push) Has been cancelled Details ChangeDetection.io App Test / test-application-3-12 (push) Has been cancelled Details ChangeDetection.io App Test / test-application-3-13 (push) Has been cancelled Details	2025-07-14 22:36:31 +02:00
dgtlmoon	288272a26c	Better merge/update of new application values	2025-07-14 18:36:42 +02:00