FileBackup 0.4.2__tar.gz → 0.4.3__tar.gz

{filebackup-0.4.2 → filebackup-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FileBackup
-Version: 0.4.2
+Version: 0.4.3
 Summary: Tool for creating and restoring file system backups.
 Project-URL: Homepage, https://github.com/davidbrownell/FileBackup
 Project-URL: Documentation, https://github.com/davidbrownell/FileBackup

{filebackup-0.4.2 → filebackup-0.4.3}/src/FileBackup/Offsite.py

@@ -864,9 +864,9 @@ def Restore(
                                         directory_working_dir
                                     )
 
-                                    dest_filename.parent.mkdir(parents=True, exist_ok=True)
-
-                                    os.symlink(fullpath, dest_filename)
+                                    if not dest_filename.is_file():
+                                        dest_filename.parent.mkdir(parents=True, exist_ok=True)
+                                        os.symlink(fullpath, dest_filename)
 
                             # Read the instructions
                             with (directory_working_dir / INDEX_FILENAME).open() as f:

{filebackup-0.4.2 → filebackup-0.4.3}/src/FileBackup/__init__.py

@@ -9,4 +9,4 @@
 # Note that this value will be overwritten by calls to `python ../../Build.py update_version` based
 # on changes observed in the git repository. The default value below will be used until the value
 # here is explicitly updated by the Continuous Integration system as part of a commit.
-__version__ = "0.4.2"
+__version__ = "0.4.3"

{filebackup-0.4.2 → filebackup-0.4.3}/tests/Offsite_UnitTest.py

@@ -1111,6 +1111,49 @@ class TestRestore(object):
                 sep=os.path.sep,
             )
 
+    # ----------------------------------------------------------------------
+    @pytest.mark.parametrize("is_local_filesystem", [True, False])
+    @pytest.mark.parametrize("encryption_password", [None, str(uuid.uuid4())])
+    @pytest.mark.parametrize("compress", [False, True])
+    def test_RestoreMultipleBackupsSameFile(
+        self, _working_dir, tmp_path_factory, compress, encryption_password, is_local_filesystem
+    ):
+        with _YieldInitializedBackupHelper(
+            tmp_path_factory, _working_dir, compress, encryption_password
+        ) as backup_helper:
+            restore_helper = _RestoreHelper.Create(
+                _working_dir,
+                tmp_path_factory,
+                encryption_password,
+                is_local_filesystem,
+                backup_helper.backup_name,
+                backup_helper.output_dir,
+            )
+
+            # Read the contents of a file. We will remove this file, create a backup, and then
+            # restore the same file.
+            file_under_test = _working_dir / "one" / "A"
+            assert file_under_test.is_file(), file_under_test
+
+            file_under_test_contents = file_under_test.read_text(encoding="utf-8")
+
+            backup_file_under_test = restore_helper.backup_dir / "one" / "A"
+
+            # Remove the file
+            file_under_test.unlink()
+
+            backup_helper.ExecuteBackup(_working_dir, compress, encryption_password)
+
+            # Write the file
+            file_under_test.write_text(file_under_test_contents, encoding="utf-8")
+
+            backup_helper.ExecuteBackup(_working_dir, compress, encryption_password)
+
+            # Restore the backup
+            restore_helper.ExecuteRestore(10)
+
+            assert Path(restore_helper.output_dir / "one" / "A").is_file()
+
 
 # ----------------------------------------------------------------------
 class TestRestoreErrors:
@@ -1487,7 +1530,7 @@ class _RestoreHelper(object):
 
         output = cast(str, next(dm_and_content))
 
-        assert dm.result == expected_result
+        assert dm.result == expected_result, output
 
         if expected_num_files is not None:
             TestHelpers.CompareFileSystemSourceAndDestination(