json-database 1.0.2a1__tar.gz → 1.0.3a1__tar.gz

{json_database-1.0.2a1 → json_database-1.0.3a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: json_database
-Version: 1.0.2a1
+Version: 1.0.3a1
 Summary: searchable json database with persistence
 Author-email: jarbasAI <jarbasai@mailfence.com>
 License: MIT

{json_database-1.0.2a1 → json_database-1.0.3a1}/json_database/__init__.py

@@ -93,15 +93,23 @@ class JsonStorage(dict):
         with self.lock:
             path = expanduser(path)
             if exists(path) and isfile(path):
-                self.clear()
+                # Parse into a scratch dict first. Only replace the current
+                # in-memory contents once parsing succeeds: a concurrent
+                # writer can leave the file transiently truncated/invalid
+                # (a "torn read"), and clearing self before the parse is
+                # known to succeed would permanently discard previously
+                # loaded settings for a purely transient error, with no
+                # way to recover them on a later, successful reload.
                 try:
                     config = load_commented_json(path)
-                    for key in config:
-                        self[key] = config[key]
-                    LOG.debug("Json {} loaded".format(path))
                 except Exception as e:
                     LOG.error("Error loading json '{}'".format(path))
                     LOG.error(repr(e))
+                    return
+                self.clear()
+                for key in config:
+                    self[key] = config[key]
+                LOG.debug("Json {} loaded".format(path))
             else:
                 LOG.debug("Json '{}' not defined, skipping".format(path))
 

{json_database-1.0.2a1 → json_database-1.0.3a1}/json_database/version.py

@@ -1,7 +1,7 @@
 # START_VERSION_BLOCK
 VERSION_MAJOR = 1
 VERSION_MINOR = 0
-VERSION_BUILD = 2
+VERSION_BUILD = 3
 VERSION_ALPHA = 1
 # END_VERSION_BLOCK
 

{json_database-1.0.2a1 → json_database-1.0.3a1}/json_database.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: json_database
-Version: 1.0.2a1
+Version: 1.0.3a1
 Summary: searchable json database with persistence
 Author-email: jarbasAI <jarbasai@mailfence.com>
 License: MIT

{json_database-1.0.2a1 → json_database-1.0.3a1}/test/test_storage.py

@@ -34,6 +34,27 @@ class TestJsonStorageErrorHandling:
         with pytest.raises(DatabaseNotCommitted):
             storage.reload()
 
+    def test_reload_survives_torn_write_then_recovers(self, tmp_path):
+        """A reload() hitting a transient torn/corrupted write (e.g. an
+        external editor caught mid-save) must not wipe out the last known
+        good settings, and a later valid write must be picked up normally.
+        """
+        db_file = tmp_path / "settings.json"
+        db_file.write_text(json.dumps({"volume": 5}))
+        storage = JsonStorage(str(db_file), disable_lock=True)
+        assert storage["volume"] == 5
+
+        # Simulate a torn read: file caught mid-write, content is invalid.
+        db_file.write_text('{"volume": 9, "unit"')
+        storage.reload()
+        # Previously loaded settings must survive a failed parse.
+        assert storage["volume"] == 5
+
+        # A later, valid write must be reflected normally.
+        db_file.write_text(json.dumps({"volume": 9}))
+        storage.reload()
+        assert storage["volume"] == 9
+
     def test_store_without_path(self, tmp_path):
         """Test store with no path set."""
         storage = JsonStorage("", disable_lock=True)