PyHardLinkBackup 1.0.1__tar.gz → 1.1.0__tar.gz

pyhardlinkbackup-1.0.1/README.md → pyhardlinkbackup-1.1.0/PKG-INFO

@@ -1,3 +1,18 @@
+Metadata-Version: 2.4
+Name: PyHardLinkBackup
+Version: 1.1.0
+Summary: HardLink/Deduplication Backups with Python
+Project-URL: Documentation, https://github.com/jedie/PyHardLinkBackup
+Project-URL: Source, https://github.com/jedie/PyHardLinkBackup
+Author-email: Jens Diemer <PyHardLinkBackup@jensdiemer.de>
+License: GPL-3.0-or-later
+Requires-Python: >=3.12
+Requires-Dist: bx-py-utils
+Requires-Dist: cli-base-utilities
+Requires-Dist: rich
+Requires-Dist: tyro
+Description-Content-Type: text/markdown
+
 # PyHardLinkBackup
 
 [![tests](https://github.com/jedie/PyHardLinkBackup/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/jedie/PyHardLinkBackup/actions/workflows/tests.yml)
@@ -185,10 +200,21 @@ usage: ./dev-cli.py [-h] {benchmark-hashes,coverage,install,lint,mypy,nox,pip-au
 
 v1 is a complete rewrite of PyHardLinkBackup.
 
+Overview of main changes:
+
+* Remove Django dependency:
+  * No SQlite database anymore -> Data for deduplication stored in filesystem only
+  * No Django Admin, because we have no database anymore ;)
+* Change hash algorithm from SHA512 to SHA256, because it's faster and still secure enough
+* Don't store `*.sha512` for every file anymore -> We store one `SHA256SUMS` file in every backup directory
+
 ## History
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v1.1.0](https://github.com/jedie/PyHardLinkBackup/compare/v1.0.1...v1.1.0)
+  * 2026-01-14 - Change backup timestamp directory to old schema: '%Y-%m-%d-%H%M%S'
+  * 2026-01-14 - Add "Overview of main changes" to README
 * [v1.0.1](https://github.com/jedie/PyHardLinkBackup/compare/v1.0.0...v1.0.1)
   * 2026-01-13 - Store SHA256SUMS files in backup directories
 * [v1.0.0](https://github.com/jedie/PyHardLinkBackup/compare/v0.13.0...v1.0.0)
@@ -219,6 +245,9 @@ v1 is a complete rewrite of PyHardLinkBackup.
   * 2020-03-17 - dynamic chunk size
   * 2020-03-17 - ignore *.sha512 by default
   * 2020-03-17 - Update boot_pyhardlinkbackup.sh
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.12.3](https://github.com/jedie/PyHardLinkBackup/compare/v0.12.2...v0.12.3)
   * 2020-03-17 - update README.rst
   * 2020-03-17 - don't publish if tests fail
@@ -228,9 +257,6 @@ v1 is a complete rewrite of PyHardLinkBackup.
   * 2020-03-16 - just warn if used directly (needfull for devlopment to call this directly ;)
   * 2020-03-16 - update requirements
   * 2020-03-16 - +pytest-randomly
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.12.2](https://github.com/jedie/PyHardLinkBackup/compare/v0.12.1...v0.12.2)
   * 2020-03-06 - repare v0.12.2 release
   * 2020-03-06 - enhance log file content

{pyhardlinkbackup-1.0.1 → pyhardlinkbackup-1.1.0}/PyHardLinkBackup/__init__.py

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

{pyhardlinkbackup-1.0.1 → pyhardlinkbackup-1.1.0}/PyHardLinkBackup/backup.py

@@ -75,7 +75,7 @@ def backup_tree(*, src_root: Path, backup_root: Path, excludes: set[str]) -> Bac
     phlb_conf_dir = backup_root / '.phlb'
     phlb_conf_dir.mkdir(parents=False, exist_ok=True)
 
-    backup_dir = backup_root / src_root.name / datetime.now().strftime('%Y%m%d_%H%M%S')
+    backup_dir = backup_root / src_root.name / datetime.now().strftime('%Y-%m-%d-%H%M%S')
     logger.info('Backup %s to %s', src_root, backup_dir)
     backup_dir.mkdir(parents=True, exist_ok=False)
 

{pyhardlinkbackup-1.0.1 → pyhardlinkbackup-1.1.0}/PyHardLinkBackup/tests/test_backup.py

@@ -6,13 +6,13 @@ import textwrap
 import zlib
 from collections.abc import Iterable
 from pathlib import Path
-from unittest import TestCase
 from unittest.mock import patch
 
 from bx_py_utils.path import assert_is_file
 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 freezegun import freeze_time
 from tabulate import tabulate
 
@@ -20,6 +20,7 @@ from PyHardLinkBackup.backup import BackupResult, backup_tree
 from PyHardLinkBackup.constants import CHUNK_SIZE
 from PyHardLinkBackup.utilities.file_size_database import FileSizeDatabase
 from PyHardLinkBackup.utilities.filesystem import iter_scandir_files
+from PyHardLinkBackup.utilities.tests.base_testcases import BaseTestCase
 from PyHardLinkBackup.utilities.tests.test_file_hash_database import assert_hash_db_info
 
 
@@ -49,8 +50,9 @@ def set_file_times(path: Path, dt: datetime.datetime):
     if dt.tzinfo is not None:
         dt = dt.astimezone(datetime.timezone.utc).replace(tzinfo=None)
     fixed_time = dt.timestamp()
-    for entry in iter_scandir_files(path, excludes=set()):
-        os.utime(entry.path, (fixed_time, fixed_time))
+    with NoLogs(logger_name=''):
+        for entry in iter_scandir_files(path, excludes=set()):
+            os.utime(entry.path, (fixed_time, fixed_time))
 
 
 def _fs_tree_overview(root: Path) -> str:
@@ -99,8 +101,7 @@ def _fs_tree_overview(root: Path) -> str:
 
 def assert_fs_tree_overview(root: Path, expected_overview: str):
     expected_overview = textwrap.dedent(expected_overview).strip()
-    with NoLogs(logger_name='PyHardLinkBackup'):
-        actual_overview = _fs_tree_overview(root)
+    actual_overview = _fs_tree_overview(root)
     assert_text_equal(
         actual_overview,
         expected_overview,
@@ -108,7 +109,7 @@ def assert_fs_tree_overview(root: Path, expected_overview: str):
     )
 
 
-class BackupTreeTestCase(TestCase):
+class BackupTreeTestCase(BaseTestCase):
     def test_happy_path(self):
         with tempfile.TemporaryDirectory() as temp_dir:
             temp_path = Path(temp_dir)
@@ -156,16 +157,19 @@ class BackupTreeTestCase(TestCase):
                 self.assertLogs(level=logging.INFO),
                 patch('PyHardLinkBackup.backup.iter_scandir_files', SortedIterScandirFiles),
                 freeze_time('2026-01-01T12:34:56Z', auto_tick_seconds=0),
+                RedirectOut() as redirected_out,
             ):
                 result = backup_tree(
                     src_root=src_root,
                     backup_root=backup_root,
                     excludes={'.cache'},
                 )
+            self.assertEqual(redirected_out.stderr, '')
+            self.assertIn('Backup complete', redirected_out.stdout)
             backup_dir = result.backup_dir
             self.assertEqual(
                 str(Path(backup_dir).relative_to(temp_path)),
-                'backup/source/20260101_123456',
+                'backup/source/2026-01-01-123456',
             )
             self.assertEqual(
                 result,
@@ -184,47 +188,50 @@ class BackupTreeTestCase(TestCase):
             )
 
             # The sources:
-            assert_fs_tree_overview(
-                root=src_root,
-                expected_overview="""
-                    path                 birthtime    type        nlink      size  CRC32
-                    .cache/tempfile.tmp  12:00:00     file            1        38  41d7a2c9
-                    file2.txt            12:00:00     hardlink        2        14  8a11514a
-                    hardlink2file1       12:00:00     hardlink        2        14  8a11514a
-                    large_file.bin       12:00:00     file            1  67108865  9671eaac
-                    min_sized_file1.bin  12:00:00     file            1      1000  f0d93de4
-                    min_sized_file2.bin  12:00:00     file            1      1000  f0d93de4
-                    subdir/file.txt      12:00:00     file            1        22  c0167e63
-                    symlink2file1        12:00:00     symlink         2        14  8a11514a
-                """,
-            )
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                assert_fs_tree_overview(
+                    root=src_root,
+                    expected_overview="""
+                        path                 birthtime    type        nlink      size  CRC32
+                        .cache/tempfile.tmp  12:00:00     file            1        38  41d7a2c9
+                        file2.txt            12:00:00     hardlink        2        14  8a11514a
+                        hardlink2file1       12:00:00     hardlink        2        14  8a11514a
+                        large_file.bin       12:00:00     file            1  67108865  9671eaac
+                        min_sized_file1.bin  12:00:00     file            1      1000  f0d93de4
+                        min_sized_file2.bin  12:00:00     file            1      1000  f0d93de4
+                        subdir/file.txt      12:00:00     file            1        22  c0167e63
+                        symlink2file1        12:00:00     symlink         2        14  8a11514a
+                    """,
+                )
             # The backup:
             # * /.cache/ -> excluded
             # * min_sized_file1.bin and min_sized_file2.bin -> hardlinked
-            assert_fs_tree_overview(
-                root=backup_dir,
-                expected_overview="""
-                    path                 birthtime    type        nlink      size  CRC32
-                    SHA256SUMS           -            file            1       410  45c07cf7
-                    file2.txt            12:00:00     file            1        14  8a11514a
-                    hardlink2file1       12:00:00     file            1        14  8a11514a
-                    large_file.bin       12:00:00     file            1  67108865  9671eaac
-                    min_sized_file1.bin  12:00:00     hardlink        2      1000  f0d93de4
-                    min_sized_file2.bin  12:00:00     hardlink        2      1000  f0d93de4
-                    subdir/SHA256SUMS    -            file            1        75  1af5ecc7
-                    subdir/file.txt      12:00:00     file            1        22  c0167e63
-                    symlink2file1        12:00:00     symlink         2        14  8a11514a
-                """,
-            )
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                assert_fs_tree_overview(
+                    root=backup_dir,
+                    expected_overview="""
+                        path                 birthtime    type        nlink      size  CRC32
+                        SHA256SUMS           -            file            1       410  45c07cf7
+                        file2.txt            12:00:00     file            1        14  8a11514a
+                        hardlink2file1       12:00:00     file            1        14  8a11514a
+                        large_file.bin       12:00:00     file            1  67108865  9671eaac
+                        min_sized_file1.bin  12:00:00     hardlink        2      1000  f0d93de4
+                        min_sized_file2.bin  12:00:00     hardlink        2      1000  f0d93de4
+                        subdir/SHA256SUMS    -            file            1        75  1af5ecc7
+                        subdir/file.txt      12:00:00     file            1        22  c0167e63
+                        symlink2file1        12:00:00     symlink         2        14  8a11514a
+                    """,
+                )
 
             # Let's check our FileHashDatabase:
-            assert_hash_db_info(
-                backup_root=backup_root,
-                expected="""
-                    bb/c4/bbc4de2ca238d1… -> source/20260101_123456/min_sized_file1.bin
-                    e6/37/e6374ac11d9049… -> source/20260101_123456/large_file.bin
-                """,
-            )
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                assert_hash_db_info(
+                    backup_root=backup_root,
+                    expected="""
+                        bb/c4/bbc4de2ca238d1… -> source/2026-01-01-123456/min_sized_file1.bin
+                        e6/37/e6374ac11d9049… -> source/2026-01-01-123456/large_file.bin
+                    """,
+                )
 
             #######################################################################################
             # Just backup again:
@@ -233,16 +240,19 @@ class BackupTreeTestCase(TestCase):
                 self.assertLogs(level=logging.INFO),
                 patch('PyHardLinkBackup.backup.iter_scandir_files', SortedIterScandirFiles),
                 freeze_time('2026-01-02T12:34:56Z', auto_tick_seconds=0),
+                RedirectOut() as redirected_out,
             ):
                 result = backup_tree(
                     src_root=src_root,
                     backup_root=backup_root,
                     excludes={'.cache'},
                 )
+            self.assertEqual(redirected_out.stderr, '')
+            self.assertIn('Backup complete', redirected_out.stdout)
             backup_dir = result.backup_dir
             self.assertEqual(
                 str(Path(backup_dir).relative_to(temp_path)),
-                'backup/source/20260102_123456',
+                'backup/source/2026-01-02-123456',
             )
             self.assertEqual(
                 result,
@@ -262,30 +272,32 @@ class BackupTreeTestCase(TestCase):
             # The second backup:
             # * /.cache/ -> excluded
             # * min_sized_file1.bin and min_sized_file2.bin -> hardlinked
-            assert_fs_tree_overview(
-                root=backup_dir,
-                expected_overview="""
-                    path                 birthtime    type        nlink      size  CRC32
-                    SHA256SUMS           -            file            1       410  45c07cf7
-                    file2.txt            12:00:00     file            1        14  8a11514a
-                    hardlink2file1       12:00:00     file            1        14  8a11514a
-                    large_file.bin       12:00:00     hardlink        2  67108865  9671eaac
-                    min_sized_file1.bin  12:00:00     hardlink        4      1000  f0d93de4
-                    min_sized_file2.bin  12:00:00     hardlink        4      1000  f0d93de4
-                    subdir/SHA256SUMS    -            file            1        75  1af5ecc7
-                    subdir/file.txt      12:00:00     file            1        22  c0167e63
-                    symlink2file1        12:00:00     symlink         2        14  8a11514a
-                """,
-            )
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                assert_fs_tree_overview(
+                    root=backup_dir,
+                    expected_overview="""
+                        path                 birthtime    type        nlink      size  CRC32
+                        SHA256SUMS           -            file            1       410  45c07cf7
+                        file2.txt            12:00:00     file            1        14  8a11514a
+                        hardlink2file1       12:00:00     file            1        14  8a11514a
+                        large_file.bin       12:00:00     hardlink        2  67108865  9671eaac
+                        min_sized_file1.bin  12:00:00     hardlink        4      1000  f0d93de4
+                        min_sized_file2.bin  12:00:00     hardlink        4      1000  f0d93de4
+                        subdir/SHA256SUMS    -            file            1        75  1af5ecc7
+                        subdir/file.txt      12:00:00     file            1        22  c0167e63
+                        symlink2file1        12:00:00     symlink         2        14  8a11514a
+                    """,
+                )
 
             # The FileHashDatabase remains the same:
-            assert_hash_db_info(
-                backup_root=backup_root,
-                expected="""
-                    bb/c4/bbc4de2ca238d1… -> source/20260101_123456/min_sized_file1.bin
-                    e6/37/e6374ac11d9049… -> source/20260101_123456/large_file.bin
-                """,
-            )
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                assert_hash_db_info(
+                    backup_root=backup_root,
+                    expected="""
+                        bb/c4/bbc4de2ca238d1… -> source/2026-01-01-123456/min_sized_file1.bin
+                        e6/37/e6374ac11d9049… -> source/2026-01-01-123456/large_file.bin
+                    """,
+                )
 
             #######################################################################################
             # Don't create broken hardlinks!
@@ -296,7 +308,7 @@ class BackupTreeTestCase(TestCase):
             """
 
             # Let's remove one of the files used for hardlinking from the first backup:
-            min_sized_file1_bak_path = backup_root / 'source/20260101_123456/min_sized_file1.bin'
+            min_sized_file1_bak_path = backup_root / 'source/2026-01-01-123456/min_sized_file1.bin'
             assert_is_file(min_sized_file1_bak_path)
             min_sized_file1_bak_path.unlink()
 
@@ -305,31 +317,35 @@ class BackupTreeTestCase(TestCase):
                 self.assertLogs(level=logging.INFO),
                 patch('PyHardLinkBackup.backup.iter_scandir_files', SortedIterScandirFiles),
                 freeze_time('2026-01-03T12:34:56Z', auto_tick_seconds=0),
+                RedirectOut() as redirected_out,
             ):
                 result = backup_tree(
                     src_root=src_root,
                     backup_root=backup_root,
                     excludes={'.cache'},
                 )
+            self.assertEqual(redirected_out.stderr, '')
+            self.assertIn('Backup complete', redirected_out.stdout)
             backup_dir = result.backup_dir
 
             # Note: min_sized_file1.bin and min_sized_file2.bin are hardlinked,
             # but not with the first backup anymore! So it's only nlink=2 now!
-            assert_fs_tree_overview(
-                root=backup_dir,
-                expected_overview="""
-                    path                 birthtime    type        nlink      size  CRC32
-                    SHA256SUMS           -            file            1       410  45c07cf7
-                    file2.txt            12:00:00     file            1        14  8a11514a
-                    hardlink2file1       12:00:00     file            1        14  8a11514a
-                    large_file.bin       12:00:00     hardlink        3  67108865  9671eaac
-                    min_sized_file1.bin  12:00:00     hardlink        2      1000  f0d93de4
-                    min_sized_file2.bin  12:00:00     hardlink        2      1000  f0d93de4
-                    subdir/SHA256SUMS    -            file            1        75  1af5ecc7
-                    subdir/file.txt      12:00:00     file            1        22  c0167e63
-                    symlink2file1        12:00:00     symlink         2        14  8a11514a
-                """,
-            )
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                assert_fs_tree_overview(
+                    root=backup_dir,
+                    expected_overview="""
+                        path                 birthtime    type        nlink      size  CRC32
+                        SHA256SUMS           -            file            1       410  45c07cf7
+                        file2.txt            12:00:00     file            1        14  8a11514a
+                        hardlink2file1       12:00:00     file            1        14  8a11514a
+                        large_file.bin       12:00:00     hardlink        3  67108865  9671eaac
+                        min_sized_file1.bin  12:00:00     hardlink        2      1000  f0d93de4
+                        min_sized_file2.bin  12:00:00     hardlink        2      1000  f0d93de4
+                        subdir/SHA256SUMS    -            file            1        75  1af5ecc7
+                        subdir/file.txt      12:00:00     file            1        22  c0167e63
+                        symlink2file1        12:00:00     symlink         2        14  8a11514a
+                    """,
+                )
 
             self.assertEqual(
                 result,
@@ -348,14 +364,15 @@ class BackupTreeTestCase(TestCase):
             )
 
             # Note: min_sized_file1.bin is now from the 2026-01-03 backup!
-            self.assertEqual(backup_dir.name, '20260103_123456')  # Latest backup dir name
-            assert_hash_db_info(
-                backup_root=backup_root,
-                expected="""
-                    bb/c4/bbc4de2ca238d1… -> source/20260103_123456/min_sized_file1.bin
-                    e6/37/e6374ac11d9049… -> source/20260101_123456/large_file.bin
-                """,
-            )
+            self.assertEqual(backup_dir.name, '2026-01-03-123456')  # Latest backup dir name
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                assert_hash_db_info(
+                    backup_root=backup_root,
+                    expected="""
+                        bb/c4/bbc4de2ca238d1… -> source/2026-01-03-123456/min_sized_file1.bin
+                        e6/37/e6374ac11d9049… -> source/2026-01-01-123456/large_file.bin
+                    """,
+                )
 
     def test_symlink(self):
         with tempfile.TemporaryDirectory() as temp_dir:
@@ -392,30 +409,37 @@ class BackupTreeTestCase(TestCase):
             #######################################################################################
             # Create first backup:
 
-            with self.assertLogs(level=logging.INFO), freeze_time('2026-01-01T12:34:56Z', auto_tick_seconds=0):
+            with (
+                self.assertLogs(level=logging.INFO),
+                freeze_time('2026-01-01T12:34:56Z', auto_tick_seconds=0),
+                RedirectOut() as redirected_out,
+            ):
                 result = backup_tree(src_root=src_root, backup_root=backup_root, excludes=set())
+            self.assertEqual(redirected_out.stderr, '')
+            self.assertIn('Backup complete', redirected_out.stdout)
             backup_dir1 = result.backup_dir
             self.assertEqual(
                 str(Path(backup_dir1).relative_to(temp_path)),
-                'bak/src/20260101_123456',
+                'bak/src/2026-01-01-123456',
             )
 
-            assert_fs_tree_overview(
-                root=temp_path,  # The complete overview os source + backup and outside file
-                expected_overview="""
-                    path                                     birthtime    type     nlink    size    CRC32
-                    bak/src/20260101_123456/SHA256SUMS       -            file     1        82      c03fd60e
-                    bak/src/20260101_123456/broken_symlink   -            symlink  -        -       -
-                    bak/src/20260101_123456/source_file.txt  12:00:00     file     1        31      9309a10c
-                    bak/src/20260101_123456/symlink2outside  12:00:00     symlink  1        36      24b5bf4c
-                    bak/src/20260101_123456/symlink2source   12:00:00     symlink  1        31      9309a10c
-                    outside_file.txt                         12:00:00     file     1        36      24b5bf4c
-                    src/broken_symlink                       -            symlink  -        -       -
-                    src/source_file.txt                      12:00:00     file     1        31      9309a10c
-                    src/symlink2outside                      12:00:00     symlink  1        36      24b5bf4c
-                    src/symlink2source                       12:00:00     symlink  1        31      9309a10c
-                """,
-            )
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                assert_fs_tree_overview(
+                    root=temp_path,  # The complete overview os source + backup and outside file
+                    expected_overview="""
+                        path                                       birthtime    type     nlink    size    CRC32
+                        bak/src/2026-01-01-123456/SHA256SUMS       -            file     1        82      c03fd60e
+                        bak/src/2026-01-01-123456/broken_symlink   -            symlink  -        -       -
+                        bak/src/2026-01-01-123456/source_file.txt  12:00:00     file     1        31      9309a10c
+                        bak/src/2026-01-01-123456/symlink2outside  12:00:00     symlink  1        36      24b5bf4c
+                        bak/src/2026-01-01-123456/symlink2source   12:00:00     symlink  1        31      9309a10c
+                        outside_file.txt                           12:00:00     file     1        36      24b5bf4c
+                        src/broken_symlink                         -            symlink  -        -       -
+                        src/source_file.txt                        12:00:00     file     1        31      9309a10c
+                        src/symlink2outside                        12:00:00     symlink  1        36      24b5bf4c
+                        src/symlink2source                         12:00:00     symlink  1        31      9309a10c
+                    """,
+                )
 
             self.assertEqual(
                 result,
@@ -448,4 +472,5 @@ class BackupTreeTestCase(TestCase):
 
             """DocWrite: README.md ## backup implementation - Symlinks
             Symlinks are not stored in our FileHashDatabase, because they are not considered for hardlinking."""
-            assert_hash_db_info(backup_root=backup_root, expected='')
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                assert_hash_db_info(backup_root=backup_root, expected='')

pyhardlinkbackup-1.1.0/PyHardLinkBackup/utilities/tests/base_testcases.py

@@ -0,0 +1,88 @@
+import contextlib
+import logging
+import unittest
+
+from bx_py_utils.test_utils.context_managers import MassContextManager
+
+
+class RaiseLogOutput(logging.Handler):
+    LOGGING_FORMAT = '%(levelname)s:%(name)s:%(message)s'
+
+    def __init__(self):
+        super().__init__()
+        self.setFormatter(logging.Formatter(self.LOGGING_FORMAT))
+
+    def emit(self, record):
+        raise AssertionError(
+            f'Uncaptured log message during the test:\n'
+            '------------------------------------------------------------------------------------\n'
+            f'{self.format(record)}\n'
+            '------------------------------------------------------------------------------------\n'
+            '(Hint: use self.assertLogs() context manager)'
+        )
+
+
+class LoggingMustBeCapturedTestCaseMixin:
+    def setUp(self):
+        super().setUp()
+        self.logger = logging.getLogger()
+
+        self.old_handlers = self.logger.handlers[:]
+        self.old_level = self.logger.level
+        self.old_propagate = self.logger.propagate
+
+        self._log_buffer_handler = RaiseLogOutput()
+        self.logger.addHandler(self._log_buffer_handler)
+        self.logger.setLevel(logging.DEBUG)
+        self.logger.propagate = False
+
+    def tearDown(self):
+        self.logger.handlers = self.old_handlers
+        self.logger.propagate = self.old_propagate
+        self.logger.setLevel(self.old_level)
+        super().tearDown()
+
+
+class RaiseOutput(MassContextManager):
+    def __init__(self, test_case: unittest.TestCase):
+        self.test_case = test_case
+        self.mocks = (
+            contextlib.redirect_stdout(self),
+            contextlib.redirect_stderr(self),
+        )
+
+    def write(self, txt):
+        self.test_case.fail(
+            f'Output was written during the test:\n'
+            '------------------------------------------------------------------------------------\n'
+            f'{txt!r}\n'
+            '------------------------------------------------------------------------------------\n'
+            f'(Hint: use RedirectOut context manager)'
+        )
+
+    def flush(self):
+        pass
+
+    def getvalue(self):
+        return ''
+
+
+class OutputMustCapturedTestCaseMixin:
+    def setUp(self):
+        super().setUp()
+        self._cm = RaiseOutput(self)
+        self._cm_result = self._cm.__enter__()
+
+    def tearDown(self):
+        self._cm.__exit__(None, None, None)
+        super().tearDown()
+
+
+class BaseTestCase(
+    OutputMustCapturedTestCaseMixin,
+    LoggingMustBeCapturedTestCaseMixin,
+    unittest.TestCase,
+):
+    """
+    A base TestCase that ensures that all logging and output is captured during tests.
+    """

{pyhardlinkbackup-1.0.1 → pyhardlinkbackup-1.1.0}/PyHardLinkBackup/utilities/tests/test_file_hash_database.py

@@ -2,7 +2,6 @@ import logging
 import tempfile
 import textwrap
 from pathlib import Path
-from unittest import TestCase
 
 from bx_py_utils.path import assert_is_dir
 from bx_py_utils.test_utils.assertion import assert_text_equal
@@ -10,6 +9,7 @@ from bx_py_utils.test_utils.log_utils import NoLogs
 
 from PyHardLinkBackup.utilities.file_hash_database import FileHashDatabase, HashAlreadyExistsError
 from PyHardLinkBackup.utilities.filesystem import iter_scandir_files
+from PyHardLinkBackup.utilities.tests.base_testcases import BaseTestCase
 
 
 class TemporaryFileHashDatabase(tempfile.TemporaryDirectory):
@@ -25,6 +25,7 @@ class TemporaryFileHashDatabase(tempfile.TemporaryDirectory):
 
 
 def get_hash_db_filenames(hash_db: FileHashDatabase) -> list[str]:
+    # with NoLogs('PyHardLinkBackup.utilities.filesystem'):
     return sorted(
         str(Path(entry.path).relative_to(hash_db.base_path))
         for entry in iter_scandir_files(hash_db.base_path, excludes=set())
@@ -35,19 +36,19 @@ def get_hash_db_info(backup_root: Path) -> str:
     db_base_path = backup_root / '.phlb' / 'hash-lookup'
     assert_is_dir(db_base_path)
 
-    lines = []
-    for entry in iter_scandir_files(db_base_path, excludes=set()):
-        hash_path = Path(entry.path)
-        rel_path = hash_path.relative_to(db_base_path)
-        rel_file_path = hash_path.read_text()
-        lines.append(f'{str(rel_path)[:20]}… -> {rel_file_path}')
+    with NoLogs(logger_name='XY'):
+        lines = []
+        for entry in iter_scandir_files(db_base_path, excludes=set()):
+            hash_path = Path(entry.path)
+            rel_path = hash_path.relative_to(db_base_path)
+            rel_file_path = hash_path.read_text()
+            lines.append(f'{str(rel_path)[:20]}… -> {rel_file_path}')
     return '\n'.join(sorted(lines))
 
 
 def assert_hash_db_info(backup_root: Path, expected: str):
     expected = textwrap.dedent(expected).strip()
-    with NoLogs(logger_name='PyHardLinkBackup'):
-        actual = get_hash_db_info(backup_root)
+    actual = get_hash_db_info(backup_root)
     assert_text_equal(
         actual,
         expected,
@@ -55,7 +56,7 @@ def assert_hash_db_info(backup_root: Path, expected: str):
     )
 
 
-class FileHashDatabaseTestCase(TestCase):
+class FileHashDatabaseTestCase(BaseTestCase):
     def test_happy_path(self):
         with TemporaryFileHashDatabase() as hash_db:
             self.assertIsInstance(hash_db, FileHashDatabase)
@@ -73,10 +74,11 @@ class FileHashDatabaseTestCase(TestCase):
             self.assertIs(hash_db.get('12345678abcdef'), None)
             hash_db['12345678abcdef'] = file_a_path
             self.assertEqual(hash_db.get('12345678abcdef'), file_a_path)
-            self.assertEqual(
-                get_hash_db_filenames(hash_db),
-                ['12/34/12345678abcdef'],
-            )
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                self.assertEqual(
+                    get_hash_db_filenames(hash_db),
+                    ['12/34/12345678abcdef'],
+                )
 
             ########################################################################################
             # Another instance using the same directory:
@@ -94,21 +96,23 @@ class FileHashDatabaseTestCase(TestCase):
 
             another_hash_db['12abcd345678abcdef'] = file_b_path
             self.assertEqual(another_hash_db.get('12abcd345678abcdef'), file_b_path)
-            self.assertEqual(
-                get_hash_db_filenames(another_hash_db),
-                [
-                    '12/34/12345678abcdef',
-                    '12/ab/12abcd345678abcdef',
-                ],
-            )
-
-            assert_hash_db_info(
-                backup_root=hash_db.backup_root,
-                expected="""
-                    12/34/12345678abcdef… -> rel/path/to/file-A
-                    12/ab/12abcd345678ab… -> rel/path/to/file-B
-                """,
-            )
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                self.assertEqual(
+                    get_hash_db_filenames(another_hash_db),
+                    [
+                        '12/34/12345678abcdef',
+                        '12/ab/12abcd345678abcdef',
+                    ],
+                )
+
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                assert_hash_db_info(
+                    backup_root=hash_db.backup_root,
+                    expected="""
+                        12/34/12345678abcdef… -> rel/path/to/file-A
+                        12/ab/12abcd345678ab… -> rel/path/to/file-B
+                    """,
+                )
 
             ########################################################################################
             # Deny "overwrite" of existing hash:
@@ -128,9 +132,10 @@ class FileHashDatabaseTestCase(TestCase):
             with self.assertLogs(level=logging.WARNING) as logs:
                 self.assertIs(hash_db.get('12345678abcdef'), None)
             self.assertIn('Hash database entry found, but file does not exist', ''.join(logs.output))
-            assert_hash_db_info(
-                backup_root=hash_db.backup_root,
-                expected="""
-                    12/ab/12abcd345678ab… -> rel/path/to/file-B
-                """,
-            )
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                assert_hash_db_info(
+                    backup_root=hash_db.backup_root,
+                    expected="""
+                        12/ab/12abcd345678ab… -> rel/path/to/file-B
+                    """,
+                )

{pyhardlinkbackup-1.0.1 → pyhardlinkbackup-1.1.0}/PyHardLinkBackup/utilities/tests/test_file_size_database.py

@@ -1,10 +1,13 @@
+import logging
 import tempfile
 from collections.abc import Iterable
 from pathlib import Path
-from unittest import TestCase
+
+from bx_py_utils.test_utils.log_utils import NoLogs
 
 from PyHardLinkBackup.utilities.file_size_database import FileSizeDatabase
 from PyHardLinkBackup.utilities.filesystem import iter_scandir_files
+from PyHardLinkBackup.utilities.tests.base_testcases import BaseTestCase
 
 
 class TemporaryFileSizeDatabase(tempfile.TemporaryDirectory):
@@ -27,10 +30,11 @@ def get_size_db_filenames(size_db: FileSizeDatabase) -> Iterable[str]:
 
 
 def get_sizes(size_db: FileSizeDatabase) -> Iterable[int]:
-    return sorted(int(entry.name) for entry in iter_scandir_files(size_db.base_path, excludes=set()))
+    with NoLogs('PyHardLinkBackup.utilities.filesystem'):
+        return sorted(int(entry.name) for entry in iter_scandir_files(size_db.base_path, excludes=set()))
 
 
-class FileSizeDatabaseTestCase(TestCase):
+class FileSizeDatabaseTestCase(BaseTestCase):
     def test_happy_path(self):
         with TemporaryFileSizeDatabase() as size_db:
             self.assertIsInstance(size_db, FileSizeDatabase)
@@ -52,27 +56,29 @@ class FileSizeDatabaseTestCase(TestCase):
             self.assertIn(1234, size_db)
             self.assertIn(567890, size_db)
 
-            self.assertEqual(get_sizes(size_db), [1234, 567890])
-            self.assertEqual(
-                get_size_db_filenames(size_db),
-                [
-                    '12/34/1234',
-                    '56/78/567890',
-                ],
-            )
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                self.assertEqual(get_sizes(size_db), [1234, 567890])
+                self.assertEqual(
+                    get_size_db_filenames(size_db),
+                    [
+                        '12/34/1234',
+                        '56/78/567890',
+                    ],
+                )
 
             ########################################################################################
             # Another instance using the same directory:
 
             another_size_db = FileSizeDatabase(phlb_conf_dir=size_db.base_path.parent)
-            self.assertEqual(get_sizes(another_size_db), [1234, 567890])
-            self.assertEqual(
-                get_size_db_filenames(another_size_db),
-                [
-                    '12/34/1234',
-                    '56/78/567890',
-                ],
-            )
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                self.assertEqual(get_sizes(another_size_db), [1234, 567890])
+                self.assertEqual(
+                    get_size_db_filenames(another_size_db),
+                    [
+                        '12/34/1234',
+                        '56/78/567890',
+                    ],
+                )
 
             ########################################################################################
             # "Share" directories:
@@ -107,25 +113,26 @@ class FileSizeDatabaseTestCase(TestCase):
             ########################################################################################
             # Check final state:
 
-            self.assertEqual(
-                get_size_db_filenames(size_db),
-                [
-                    '12/34/1234',
-                    '12/34/123400001111',
-                    '12/34/123400002222',
-                    '12/88/128800003333',
-                    '12/99/129900004444',
-                    '56/78/567890',
-                ],
-            )
-            self.assertEqual(
-                get_sizes(size_db),
-                [
-                    1234,
-                    567890,
-                    123400001111,
-                    123400002222,
-                    128800003333,
-                    129900004444,
-                ],
-            )
+            with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+                self.assertEqual(
+                    get_size_db_filenames(size_db),
+                    [
+                        '12/34/1234',
+                        '12/34/123400001111',
+                        '12/34/123400002222',
+                        '12/88/128800003333',
+                        '12/99/129900004444',
+                        '56/78/567890',
+                    ],
+                )
+                self.assertEqual(
+                    get_sizes(size_db),
+                    [
+                        1234,
+                        567890,
+                        123400001111,
+                        123400002222,
+                        128800003333,
+                        129900004444,
+                    ],
+                )

{pyhardlinkbackup-1.0.1 → pyhardlinkbackup-1.1.0}/PyHardLinkBackup/utilities/tests/test_filesystem.py

@@ -1,14 +1,14 @@
 import hashlib
 import os
 import tempfile
-import unittest
 from pathlib import Path
 
 from PyHardLinkBackup.constants import HASH_ALGO
 from PyHardLinkBackup.utilities.filesystem import copy_and_hash, hash_file, iter_scandir_files, read_and_hash_file
+from PyHardLinkBackup.utilities.tests.base_testcases import BaseTestCase
 
 
-class TestHashFile(unittest.TestCase):
+class TestHashFile(BaseTestCase):
     def test_hash_file(self):
         self.assertEqual(
             hashlib.new(HASH_ALGO, b'test content').hexdigest(),

pyhardlinkbackup-1.0.1/PKG-INFO → pyhardlinkbackup-1.1.0/README.md

@@ -1,18 +1,3 @@
-Metadata-Version: 2.4
-Name: PyHardLinkBackup
-Version: 1.0.1
-Summary: HardLink/Deduplication Backups with Python
-Project-URL: Documentation, https://github.com/jedie/PyHardLinkBackup
-Project-URL: Source, https://github.com/jedie/PyHardLinkBackup
-Author-email: Jens Diemer <PyHardLinkBackup@jensdiemer.de>
-License: GPL-3.0-or-later
-Requires-Python: >=3.12
-Requires-Dist: bx-py-utils
-Requires-Dist: cli-base-utilities
-Requires-Dist: rich
-Requires-Dist: tyro
-Description-Content-Type: text/markdown
-
 # PyHardLinkBackup
 
 [![tests](https://github.com/jedie/PyHardLinkBackup/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/jedie/PyHardLinkBackup/actions/workflows/tests.yml)
@@ -200,10 +185,21 @@ usage: ./dev-cli.py [-h] {benchmark-hashes,coverage,install,lint,mypy,nox,pip-au
 
 v1 is a complete rewrite of PyHardLinkBackup.
 
+Overview of main changes:
+
+* Remove Django dependency:
+  * No SQlite database anymore -> Data for deduplication stored in filesystem only
+  * No Django Admin, because we have no database anymore ;)
+* Change hash algorithm from SHA512 to SHA256, because it's faster and still secure enough
+* Don't store `*.sha512` for every file anymore -> We store one `SHA256SUMS` file in every backup directory
+
 ## History
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v1.1.0](https://github.com/jedie/PyHardLinkBackup/compare/v1.0.1...v1.1.0)
+  * 2026-01-14 - Change backup timestamp directory to old schema: '%Y-%m-%d-%H%M%S'
+  * 2026-01-14 - Add "Overview of main changes" to README
 * [v1.0.1](https://github.com/jedie/PyHardLinkBackup/compare/v1.0.0...v1.0.1)
   * 2026-01-13 - Store SHA256SUMS files in backup directories
 * [v1.0.0](https://github.com/jedie/PyHardLinkBackup/compare/v0.13.0...v1.0.0)
@@ -234,6 +230,9 @@ v1 is a complete rewrite of PyHardLinkBackup.
   * 2020-03-17 - dynamic chunk size
   * 2020-03-17 - ignore *.sha512 by default
   * 2020-03-17 - Update boot_pyhardlinkbackup.sh
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.12.3](https://github.com/jedie/PyHardLinkBackup/compare/v0.12.2...v0.12.3)
   * 2020-03-17 - update README.rst
   * 2020-03-17 - don't publish if tests fail
@@ -243,9 +242,6 @@ v1 is a complete rewrite of PyHardLinkBackup.
   * 2020-03-16 - just warn if used directly (needfull for devlopment to call this directly ;)
   * 2020-03-16 - update requirements
   * 2020-03-16 - +pytest-randomly
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.12.2](https://github.com/jedie/PyHardLinkBackup/compare/v0.12.1...v0.12.2)
   * 2020-03-06 - repare v0.12.2 release
   * 2020-03-06 - enhance log file content