From bd84f307fd4cd4246a6f0fc21cad7e3da1cfa7dd Mon Sep 17 00:00:00 2001
From: Oliver Bristow <evilumbrella+github@gmail.com>
Date: Sun, 18 Oct 2026 15:57:28 +0100
Subject: [PATCH] Use unique temporary files for atomic saves

---
 jsonstore.py      | 30 +++++++++++++++------------
 test_jsonstore.py | 52 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 13 deletions(-)

diff --git a/jsonstore.py b/jsonstore.py
index a325a82..9ad16d3 100644
--- a/jsonstore.py
+++ b/jsonstore.py
@@ -5,10 +5,11 @@
 """
 from __future__ import absolute_import
 import json
-import os.path
+import os
 import sys
 from collections import OrderedDict
 from copy import deepcopy
+from tempfile import mkstemp
 
 __all__ = ["JsonStore"]
 
@@ -56,25 +57,28 @@ def _load(self):
         self.__dict__["_data"] = data
 
     def _save(self):
-        temp = self._path + "~"
-        with open(temp, "wb") as store:
-            output = json.dumps(self._data, indent=self._indent)
-            store.write(output.encode("utf-8"))
-        
-        if sys.version_info >= (3, 3):
+        output = json.dumps(self._data, indent=self._indent).encode("utf-8")
+        descriptor, temp = mkstemp(
+            prefix="." + os.path.basename(self._path) + ".",
+            suffix=".tmp",
+            dir=os.path.dirname(os.path.abspath(self._path)),
+        )
+        try:
+            with os.fdopen(descriptor, "wb") as store:
+                store.write(output)
             os.replace(temp, self._path)
-        elif os.name == "windows":
-            os.remove(self._path)
-            os.rename(temp, self._path)
-        else:
-            os.rename(temp, self._path)
+        finally:
+            try:
+                os.unlink(temp)
+            except FileNotFoundError:
+                pass
 
     def __init__(self, path, indent=2, auto_commit=True):
         self.__dict__.update(
             {
                 "_auto_commit": auto_commit,
                 "_data": None,
-                "_path": path,
+                "_path": os.fsdecode(path),
                 "_indent": indent,
                 "_states": [],
             }
diff --git a/test_jsonstore.py b/test_jsonstore.py
index 5ab7e6f..99c7d08 100644
--- a/test_jsonstore.py
+++ b/test_jsonstore.py
@@ -5,7 +5,9 @@
 import json
 import os
 import unittest
+from pathlib import Path
 from tempfile import TemporaryDirectory
+from unittest.mock import patch
 
 from jsonstore import JsonStore
 
@@ -310,6 +312,56 @@ def test_no_auto_commit(self):
         with open(store_file) as handle:
             self.assertEqual({}, json.load(handle))
 
+    def test_save_preserves_unrelated_backup(self):
+        backup = Path(self._store_file + "~")
+        backup.write_text("unrelated backup", encoding="utf-8")
+        self.store.value = 1
+        self.assertEqual(backup.read_text(encoding="utf-8"), "unrelated backup")
+        self.assertEqual(JsonStore(self._store_file).value, 1)
+
+    @unittest.skipIf(os.name == "nt", "Creating symlinks requires Windows privileges")
+    def test_save_does_not_follow_backup_symlink(self):
+        unrelated = Path(self._directory.name, "unrelated.txt")
+        unrelated.write_text("unrelated content", encoding="utf-8")
+        backup = Path(self._store_file + "~")
+        backup.symlink_to(unrelated)
+        self.store.value = 1
+        self.assertTrue(backup.is_symlink())
+        self.assertEqual(unrelated.read_text(encoding="utf-8"), "unrelated content")
+
+    def test_overlapping_saves_use_separate_temporary_files(self):
+        first = JsonStore(self._store_file, auto_commit=False)
+        second = JsonStore(self._store_file, auto_commit=False)
+        first.value = "first writer"
+        second.value = "second writer"
+        replace = os.replace
+        sources = []
+
+        def interleave(source, destination):
+            sources.append(source)
+            if len(sources) == 1:
+                second._save()
+                self.assertEqual(JsonStore(self._store_file).value, "second writer")
+            replace(source, destination)
+
+        with patch("jsonstore.os.replace", side_effect=interleave):
+            first._save()
+        self.assertEqual(len(set(sources)), 2)
+        self.assertEqual(JsonStore(self._store_file).value, "first writer")
+
+    def test_failed_replacement_removes_temporary_file(self):
+        before = set(os.listdir(self._directory.name))
+        with patch("jsonstore.os.replace", side_effect=OSError("replacement failed")):
+            with self.assertRaises(OSError):
+                self.store.value = 1
+        self.assertEqual(set(os.listdir(self._directory.name)), before)
+        self.assertNotIn("value", JsonStore(self._store_file))
+
+    def test_pathlike_store_can_be_saved(self):
+        store = JsonStore(Path(self._store_file))
+        store.value = 1
+        self.assertEqual(JsonStore(self._store_file).value, 1)
+
     def test_transaction_rollback(self):
         self.store.value = 1
         try: