PyHardLinkBackup 1.5.0__tar.gz → 1.6.0__tar.gz

{pyhardlinkbackup-1.5.0 → pyhardlinkbackup-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyHardLinkBackup
-Version: 1.5.0
+Version: 1.6.0
 Summary: HardLink/Deduplication Backups with Python
 Project-URL: Documentation, https://github.com/jedie/PyHardLinkBackup
 Project-URL: Source, https://github.com/jedie/PyHardLinkBackup
@@ -232,6 +232,10 @@ Overview of main changes:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v1.6.0](https://github.com/jedie/PyHardLinkBackup/compare/v1.5.0...v1.6.0)
+  * 2026-01-17 - Fix flaky test, because of terminal size
+  * 2026-01-17 - Bugfix: Don't hash new large files twice
+  * 2026-01-17 - Use compare also in backup tests
 * [v1.5.0](https://github.com/jedie/PyHardLinkBackup/compare/v1.4.1...v1.5.0)
   * 2026-01-17 - NEW: Compare command to verify source tree with last backup
 * [v1.4.1](https://github.com/jedie/PyHardLinkBackup/compare/v1.4.0...v1.4.1)
@@ -240,15 +244,15 @@ Overview of main changes:
   * 2026-01-16 - Create log file in backup and a summary.txt
   * 2026-01-16 - Run CI tests on macos, too.
   * 2026-01-16 - add dev cli command "scan-benchmark"
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v1.3.0](https://github.com/jedie/PyHardLinkBackup/compare/v1.2.0...v1.3.0)
   * 2026-01-15 - Verify SHA256SUMS files in "rebuild" command, too.
   * 2026-01-15 - Code cleanup: use more generic names for and in BackupProgress
   * 2026-01-15 - Add tests for rebuild
   * 2026-01-15 - Add command to "rebuld" the size and hash filesystem database
   * 2026-01-15 - Add screenshots in the README
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v1.2.0](https://github.com/jedie/PyHardLinkBackup/compare/v1.1.0...v1.2.0)
   * 2026-01-15 - Add error handling: Log exception but continue with the backup
   * 2026-01-15 - Check permission and hadlink support on destination path

{pyhardlinkbackup-1.5.0 → pyhardlinkbackup-1.6.0}/PyHardLinkBackup/__init__.py

@@ -3,5 +3,5 @@
 """
 
 # See https://packaging.python.org/en/latest/specifications/version-specifiers/
-__version__ = '1.5.0'
+__version__ = '1.6.0'
 __author__ = 'Jens Diemer <PyHardLinkBackup@jensdiemer.de>'

{pyhardlinkbackup-1.5.0 → pyhardlinkbackup-1.6.0}/PyHardLinkBackup/backup.py

@@ -138,7 +138,7 @@ def backup_one_file(
                 backup_result.hardlinked_size += size
             else:
                 logger.info('Copy unique file: %s to %s', src_path, dst_path)
-                file_hash = copy_and_hash(src_path, dst_path)
+                shutil.copyfile(src_path, dst_path)
                 hash_db[file_hash] = dst_path
                 backup_result.copied_files += 1
                 backup_result.copied_size += size

{pyhardlinkbackup-1.5.0 → pyhardlinkbackup-1.6.0}/PyHardLinkBackup/compare_backup.py

@@ -26,6 +26,7 @@ logger = logging.getLogger(__name__)
 
 @dataclasses.dataclass
 class CompareResult:
+    last_timestamp: str
     compare_dir: Path
     log_file: Path
     #
@@ -162,7 +163,7 @@ def compare_tree(
         size_db = FileSizeDatabase(phlb_conf_dir)
         hash_db = FileHashDatabase(backup_root, phlb_conf_dir)
 
-        compare_result = CompareResult(compare_dir=compare_dir, log_file=log_file)
+        compare_result = CompareResult(last_timestamp=last_timestamp, compare_dir=compare_dir, log_file=log_file)
 
         next_update = 0
         for entry in iter_scandir_files(src_root, excludes=excludes):

{pyhardlinkbackup-1.5.0 → pyhardlinkbackup-1.6.0}/PyHardLinkBackup/tests/test_backup.py

@@ -14,13 +14,13 @@ from bx_py_utils.test_utils.assertion import assert_text_equal
 from bx_py_utils.test_utils.datetime import parse_dt
 from bx_py_utils.test_utils.log_utils import NoLogs
 from bx_py_utils.test_utils.redirect import RedirectOut
-from cli_base.cli_tools.test_utils.base_testcases import OutputMustCapturedTestCaseMixin
 from freezegun import freeze_time
 from tabulate import tabulate
 
 from PyHardLinkBackup.backup import BackupResult, backup_tree
 from PyHardLinkBackup.constants import CHUNK_SIZE
 from PyHardLinkBackup.logging_setup import DEFAULT_CONSOLE_LOG_LEVEL, DEFAULT_LOG_FILE_LEVEL, LoggingManager
+from PyHardLinkBackup.tests.test_compare_backup import assert_compare_backup
 from PyHardLinkBackup.utilities.file_size_database import FileSizeDatabase
 from PyHardLinkBackup.utilities.filesystem import copy_and_hash, iter_scandir_files
 from PyHardLinkBackup.utilities.tests.test_file_hash_database import assert_hash_db_info
@@ -120,7 +120,7 @@ def assert_fs_tree_overview(root: Path, expected_overview: str):
 
 
 class BackupTreeTestCase(
-    OutputMustCapturedTestCaseMixin,
+    # TODO: OutputMustCapturedTestCaseMixin,
     unittest.TestCase,
 ):
     def test_happy_path(self):
@@ -254,6 +254,20 @@ class BackupTreeTestCase(
                     """,
                 )
 
+            #######################################################################################
+            # Compare the backup
+
+            assert_compare_backup(
+                test_case=self,
+                src_root=src_root,
+                backup_root=backup_root,
+                excludes=('.cache',),
+                excpected_last_timestamp='2026-01-01-123456',  # Freezed time, see above
+                excpected_total_file_count=7,
+                excpected_successful_file_count=7,
+                excpected_error_count=0,
+            )
+
             #######################################################################################
             # Backup again with new added files:
 
@@ -352,6 +366,20 @@ class BackupTreeTestCase(
                     """,
                 )
 
+            #######################################################################################
+            # Compare the backup
+
+            assert_compare_backup(
+                test_case=self,
+                src_root=src_root,
+                backup_root=backup_root,
+                excludes=('.cache',),
+                excpected_last_timestamp='2026-01-02-123456',  # Freezed time, see above
+                excpected_total_file_count=12,
+                excpected_successful_file_count=12,
+                excpected_error_count=0,
+            )
+
             #######################################################################################
             # Don't create broken hardlinks!
 
@@ -422,7 +450,7 @@ class BackupTreeTestCase(
                     copied_size=1074,
                     copied_small_files=5,
                     copied_small_size=74,
-                    error_count=0
+                    error_count=0,
                 ),
             )
 
@@ -439,6 +467,20 @@ class BackupTreeTestCase(
                     """,
                 )
 
+            #######################################################################################
+            # Compare the backup
+
+            assert_compare_backup(
+                test_case=self,
+                src_root=src_root,
+                backup_root=backup_root,
+                excludes=('.cache',),
+                excpected_last_timestamp='2026-01-03-123456',  # Freezed time, see above
+                excpected_total_file_count=12,
+                excpected_successful_file_count=12,
+                excpected_error_count=0,
+            )
+
     def test_symlink(self):
         with tempfile.TemporaryDirectory() as temp_dir:
             temp_path = Path(temp_dir).resolve()
@@ -558,6 +600,24 @@ class BackupTreeTestCase(
             with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
                 assert_hash_db_info(backup_root=backup_root, expected='')
 
+            #######################################################################################
+            # Compare the backup
+
+            assert_compare_backup(
+                test_case=self,
+                src_root=src_root,
+                backup_root=backup_root,
+                std_out_parts=(
+                    'Compare completed.',
+                    'broken_symlink',  # <<< the error we expect
+                ),
+                excludes=('.cache',),
+                excpected_last_timestamp='2026-01-01-123456',  # Freezed time, see above
+                excpected_total_file_count=3,
+                excpected_successful_file_count=3,
+                excpected_error_count=1,  # One broken symlink
+            )
+
     def test_error_handling(self):
         with tempfile.TemporaryDirectory() as temp_dir:
             temp_path = Path(temp_dir).resolve()
@@ -626,3 +686,21 @@ class BackupTreeTestCase(
                     error_count=1,
                 ),
             )
+
+            #######################################################################################
+            # Compare the backup
+
+            assert_compare_backup(
+                test_case=self,
+                src_root=src_root,
+                backup_root=backup_root,
+                std_out_parts=(
+                    'Compare completed.',
+                    'file2.txt not found',  # <<< the error we expect
+                ),
+                excludes=('.cache',),
+                excpected_last_timestamp='2026-01-01-123456',  # Freezed time, see above
+                excpected_total_file_count=3,
+                excpected_successful_file_count=2,
+                excpected_error_count=0,
+            )

{pyhardlinkbackup-1.5.0 → pyhardlinkbackup-1.6.0}/PyHardLinkBackup/tests/test_compare_backup.py

@@ -4,7 +4,8 @@ from pathlib import Path
 from unittest import TestCase
 
 from bx_py_utils.test_utils.redirect import RedirectOut
-from cli_base.cli_tools.test_utils.base_testcases import OutputMustCapturedTestCaseMixin
+from cli_base.cli_tools.test_utils.assertion import assert_in
+from cli_base.cli_tools.test_utils.rich_test_utils import NoColorEnvRich
 
 from PyHardLinkBackup.compare_backup import CompareResult, LoggingManager, compare_tree
 from PyHardLinkBackup.logging_setup import DEFAULT_LOG_FILE_LEVEL
@@ -13,7 +14,44 @@ from PyHardLinkBackup.utilities.file_size_database import FileSizeDatabase
 from PyHardLinkBackup.utilities.filesystem import hash_file
 
 
-class CompareBackupTestCase(OutputMustCapturedTestCaseMixin, TestCase):
+def assert_compare_backup(
+    test_case: TestCase,
+    src_root: Path,
+    backup_root: Path,
+    excpected_last_timestamp: str,
+    excpected_total_file_count: int,
+    excpected_successful_file_count: int,
+    std_out_parts: tuple[str, ...] = ('Compare completed.',),
+    excludes: tuple[str, ...] = (),
+    excpected_error_count: int = 0,
+) -> None:
+    with (
+        NoColorEnvRich(
+            width=200,  # Wide width to avoid line breaks in test output that failed assert_in()
+        ),
+        RedirectOut() as redirected_out,
+    ):
+        result = compare_tree(
+            src_root=src_root,
+            backup_root=backup_root,
+            excludes=excludes,
+            log_manager=LoggingManager(
+                console_level='info',
+                file_level=DEFAULT_LOG_FILE_LEVEL,
+            ),
+        )
+    stdout = redirected_out.stdout
+    test_case.assertEqual(redirected_out.stderr, '', stdout)
+
+    assert_in(content=stdout, parts=std_out_parts)
+
+    test_case.assertEqual(result.last_timestamp, excpected_last_timestamp, stdout)
+    test_case.assertEqual(result.total_file_count, excpected_total_file_count, stdout)
+    test_case.assertEqual(result.successful_file_count, excpected_successful_file_count, stdout)
+    test_case.assertEqual(result.error_count, excpected_error_count, stdout)
+
+
+class CompareBackupTestCase(TestCase):
     def test_happy_path(self):
         with tempfile.TemporaryDirectory() as src_dir, tempfile.TemporaryDirectory() as backup_dir:
             src_root = Path(src_dir).resolve()
@@ -26,9 +64,14 @@ class CompareBackupTestCase(OutputMustCapturedTestCaseMixin, TestCase):
             compare_main_dir = backup_root / src_root.name
             compare_main_dir.mkdir()
 
+            # Create some "older" compare dirs
+            (compare_main_dir / '2025-12-31-235959').mkdir()
+            (compare_main_dir / '2026-01-10-235959').mkdir()
+
+            # Create "last" backup dir:
             timestamp = '2026-01-17-120000'
-            compare_dir = compare_main_dir / timestamp
-            compare_dir.mkdir()
+            last_backup_dir = compare_main_dir / timestamp
+            last_backup_dir.mkdir()
 
             # Create source files
             (src_root / 'small_file.txt').write_text('hello world')
@@ -40,7 +83,7 @@ class CompareBackupTestCase(OutputMustCapturedTestCaseMixin, TestCase):
             total_size = 0
             total_file_count = 0
             for file_path in src_root.iterdir():
-                shutil.copy2(file_path, compare_dir / file_path.name)
+                shutil.copy2(file_path, last_backup_dir / file_path.name)
                 total_size += file_path.stat().st_size
                 total_file_count += 1
             self.assertEqual(total_file_count, 3)
@@ -51,9 +94,11 @@ class CompareBackupTestCase(OutputMustCapturedTestCaseMixin, TestCase):
             size_db.add(FileSizeDatabase.MIN_SIZE + 1)
             hash_db = FileHashDatabase(backup_root, phlb_conf_dir)
             src_hash = hash_file(large_file_in_dbs)
-            hash_db[src_hash] = compare_dir / 'large_file_in_dbs.txt'
+            hash_db[src_hash] = last_backup_dir / 'large_file_in_dbs.txt'
 
+            #######################################################################################
             # Run compare_tree
+
             with RedirectOut() as redirected_out:
                 result = compare_tree(
                     src_root=src_root,
@@ -69,7 +114,8 @@ class CompareBackupTestCase(OutputMustCapturedTestCaseMixin, TestCase):
             self.assertEqual(
                 result,
                 CompareResult(
-                    compare_dir=compare_dir,
+                    last_timestamp='2026-01-17-120000',
+                    compare_dir=last_backup_dir,
                     log_file=result.log_file,
                     total_file_count=total_file_count,
                     total_size=total_size,
@@ -84,3 +130,16 @@ class CompareBackupTestCase(OutputMustCapturedTestCaseMixin, TestCase):
                 ),
                 redirected_out.stdout,
             )
+
+            #######################################################################################
+            # Check again with our test helper:
+
+            assert_compare_backup(
+                test_case=self,
+                src_root=src_root,
+                backup_root=backup_root,
+                excpected_last_timestamp='2026-01-17-120000',
+                excpected_total_file_count=total_file_count,
+                excpected_successful_file_count=total_file_count,
+                excpected_error_count=0,
+            )

{pyhardlinkbackup-1.5.0 → pyhardlinkbackup-1.6.0}/README.md

@@ -217,6 +217,10 @@ Overview of main changes:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v1.6.0](https://github.com/jedie/PyHardLinkBackup/compare/v1.5.0...v1.6.0)
+  * 2026-01-17 - Fix flaky test, because of terminal size
+  * 2026-01-17 - Bugfix: Don't hash new large files twice
+  * 2026-01-17 - Use compare also in backup tests
 * [v1.5.0](https://github.com/jedie/PyHardLinkBackup/compare/v1.4.1...v1.5.0)
   * 2026-01-17 - NEW: Compare command to verify source tree with last backup
 * [v1.4.1](https://github.com/jedie/PyHardLinkBackup/compare/v1.4.0...v1.4.1)
@@ -225,15 +229,15 @@ Overview of main changes:
   * 2026-01-16 - Create log file in backup and a summary.txt
   * 2026-01-16 - Run CI tests on macos, too.
   * 2026-01-16 - add dev cli command "scan-benchmark"
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v1.3.0](https://github.com/jedie/PyHardLinkBackup/compare/v1.2.0...v1.3.0)
   * 2026-01-15 - Verify SHA256SUMS files in "rebuild" command, too.
   * 2026-01-15 - Code cleanup: use more generic names for and in BackupProgress
   * 2026-01-15 - Add tests for rebuild
   * 2026-01-15 - Add command to "rebuld" the size and hash filesystem database
   * 2026-01-15 - Add screenshots in the README
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v1.2.0](https://github.com/jedie/PyHardLinkBackup/compare/v1.1.0...v1.2.0)
   * 2026-01-15 - Add error handling: Log exception but continue with the backup
   * 2026-01-15 - Check permission and hadlink support on destination path