PyHardLinkBackup 1.7.3__tar.gz → 1.8.0__tar.gz

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyHardLinkBackup
-Version: 1.7.3
+Version: 1.8.0
 Summary: HardLink/Deduplication Backups with Python
 Project-URL: Documentation, https://github.com/jedie/PyHardLinkBackup
 Project-URL: Source, https://github.com/jedie/PyHardLinkBackup
@@ -66,19 +66,23 @@ usage: phlb backup [-h] [BACKUP OPTIONS]
 
 Backup the source directory to the destination directory using hard links for deduplication.
 
-╭─ positional arguments ──────────────────────────────────────────────────────────────────────────────────────╮
-│ source       Source directory to back up. (required)                                                        │
-│ destination  Destination directory for the backup. (required)                                               │
-╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
-╭─ options ───────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ -h, --help   show this help message and exit                                                                │
-│ --excludes [STR [STR ...]]                                                                                  │
-│              List of directories to exclude from backup. (default: __pycache__ .cache .temp .tmp .tox .nox) │
-│ --verbosity {debug,info,warning,error}                                                                      │
-│              Log level for console logging. (default: warning)                                              │
-│ --log-file-level {debug,info,warning,error}                                                                 │
-│              Log level for the log file (default: info)                                                     │
-╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
+╭─ positional arguments ───────────────────────────────────────────────────────────────────────────────────────────────╮
+│ source             Source directory to back up. (required)                                                           │
+│ destination        Destination directory for the backup. (required)                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
+╭─ options ────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
+│ -h, --help         show this help message and exit                                                                   │
+│ --name {None}|STR  Optional name for the backup (used to create a subdirectory in the backup destination). If not    │
+│                    provided, the name of the source directory is used. (default: None)                               │
+│ --one-file-system, --no-one-file-system                                                                              │
+│                    Do not cross filesystem boundaries. (default: True)                                               │
+│ --excludes [STR [STR ...]]                                                                                           │
+│                    List of directories to exclude from backup. (default: __pycache__ .cache .temp .tmp .tox .nox)    │
+│ --verbosity {debug,info,warning,error}                                                                               │
+│                    Log level for console logging. (default: warning)                                                 │
+│ --log-file-level {debug,info,warning,error}                                                                          │
+│                    Log level for the log file (default: info)                                                        │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
 ```
 [comment]: <> (✂✂✂ auto generated backup help end ✂✂✂)
 
@@ -285,12 +289,20 @@ Overview of main changes:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v1.8.0](https://github.com/jedie/PyHardLinkBackup/compare/v1.7.3...v1.8.0)
+  * 2026-01-22 - Add optional "--name" to enforce a name for the backup sub directory
+  * 2026-01-22 - Do not cross filesystem boundaries as default
+  * 2026-01-22 - Display progress also for large unique file copy
+  * 2026-01-22 - Optimize progress bars for smaller screens
 * [v1.7.3](https://github.com/jedie/PyHardLinkBackup/compare/v1.7.2...v1.7.3)
   * 2026-01-21 - Handle directory symlinks correct
 * [v1.7.2](https://github.com/jedie/PyHardLinkBackup/compare/v1.7.1...v1.7.2)
   * 2026-01-21 - Display "Remaining time" to files and sizes, too.
 * [v1.7.1](https://github.com/jedie/PyHardLinkBackup/compare/v1.7.0...v1.7.1)
   * 2026-01-19 - Update requirements to fix problems under Windows
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v1.7.0](https://github.com/jedie/PyHardLinkBackup/compare/v1.6.0...v1.7.0)
   * 2026-01-19 - Speedup and enhance unittest
   * 2026-01-17 - Remove unfinished copied files on errors
@@ -300,9 +312,6 @@ Overview of main changes:
   * 2026-01-17 - simplify tests
   * 2026-01-17 - Warn if broken symlink found
   * 2026-01-17 - Update README
-
-<details><summary>Expand older history entries ...</summary>
-
 * [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

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/PyHardLinkBackup/__init__.py

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

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/PyHardLinkBackup/backup.py

@@ -16,11 +16,13 @@ from PyHardLinkBackup.utilities.file_size_database import FileSizeDatabase
 from PyHardLinkBackup.utilities.filesystem import (
     RemoveFileOnError,
     copy_and_hash,
+    copy_with_progress,
     hash_file,
     humanized_fs_scan,
     iter_scandir_files,
     read_and_hash_file,
     supports_hardlinks,
+    verbose_path_stat,
 )
 from PyHardLinkBackup.utilities.humanize import PrintTimingContextManager, human_filesize
 from PyHardLinkBackup.utilities.rich_utils import DisplayFileTreeProgress
@@ -148,7 +150,7 @@ def backup_one_file(
                     backup_result.hardlinked_size += size
                 else:
                     logger.info('Copy unique file: %s to %s', src_path, dst_path)
-                    shutil.copyfile(src_path, dst_path)
+                    copy_with_progress(src_path, dst_path, progress=progress, total_size=size)
                     hash_db[file_hash] = dst_path
                     backup_result.copied_files += 1
                     backup_result.copied_size += size
@@ -170,6 +172,8 @@ def backup_tree(
     *,
     src_root: Path,
     backup_root: Path,
+    backup_name: str | None,
+    one_file_system: bool,
     excludes: tuple[str, ...],
     log_manager: LoggingManager,
 ) -> BackupResult:
@@ -179,12 +183,17 @@ def backup_tree(
         print(f'Please check source directory: "{src_root}"\n')
         sys.exit(1)
 
+    src_stat = verbose_path_stat(src_root)
+    src_device_id = src_stat.st_dev
+
     backup_root = backup_root.resolve()
     if not backup_root.is_dir():
         print('Error: Backup directory does not exist!')
         print(f'Please create "{backup_root}" directory first and start again!\n')
         sys.exit(1)
 
+    verbose_path_stat(backup_root)
+
     if not os.access(backup_root, os.W_OK):
         print('Error: No write access to backup directory!')
         print(f'Please check permissions for backup directory: "{backup_root}"\n')
@@ -198,13 +207,20 @@ def backup_tree(
     # Step 1: Scan source directory:
     excludes: set = set(excludes)
     with PrintTimingContextManager('Filesystem scan completed in'):
-        src_file_count, src_total_size = humanized_fs_scan(src_root, excludes=excludes)
+        src_file_count, src_total_size = humanized_fs_scan(
+            path=src_root,
+            one_file_system=one_file_system,
+            src_device_id=src_device_id,
+            excludes=excludes,
+        )
 
     phlb_conf_dir = backup_root / '.phlb'
     phlb_conf_dir.mkdir(parents=False, exist_ok=True)
 
     timestamp = datetime.datetime.now().strftime('%Y-%m-%d-%H%M%S')
-    backup_main_dir = backup_root / src_root.name
+    if not backup_name:
+        backup_name = src_root.name
+    backup_main_dir = backup_root / backup_name
     backup_dir = backup_main_dir / timestamp
     backup_dir.mkdir(parents=True, exist_ok=False)
 
@@ -227,7 +243,12 @@ def backup_tree(
         backup_result = BackupResult(backup_dir=backup_dir, log_file=log_file)
 
         next_update = 0
-        for entry in iter_scandir_files(src_root, excludes=excludes):
+        for entry in iter_scandir_files(
+            path=src_root,
+            one_file_system=one_file_system,
+            src_device_id=src_device_id,
+            excludes=excludes,
+        ):
             try:
                 backup_one_file(
                     src_root=src_root,

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/PyHardLinkBackup/cli_app/phlb.py

@@ -17,7 +17,9 @@ from PyHardLinkBackup.logging_setup import (
 )
 from PyHardLinkBackup.utilities.tyro_cli_shared_args import (
     DEFAULT_EXCLUDE_DIRECTORIES,
+    TyroBackupNameArgType,
     TyroExcludeDirectoriesArgType,
+    TyroOneFileSystemArgType,
 )
 
 
@@ -41,6 +43,8 @@ def backup(
         ),
     ],
     /,
+    name: TyroBackupNameArgType = None,
+    one_file_system: TyroOneFileSystemArgType = True,
     excludes: TyroExcludeDirectoriesArgType = DEFAULT_EXCLUDE_DIRECTORIES,
     verbosity: TyroConsoleLogLevelArgType = DEFAULT_CONSOLE_LOG_LEVEL,
     log_file_level: TyroLogFileLevelArgType = DEFAULT_LOG_FILE_LEVEL,
@@ -55,6 +59,8 @@ def backup(
     backup_tree(
         src_root=src,
         backup_root=dst,
+        backup_name=name,
+        one_file_system=one_file_system,
         excludes=excludes,
         log_manager=log_manager,
     )
@@ -77,6 +83,7 @@ def compare(
         ),
     ],
     /,
+    one_file_system: TyroOneFileSystemArgType = True,
     excludes: TyroExcludeDirectoriesArgType = DEFAULT_EXCLUDE_DIRECTORIES,
     verbosity: TyroConsoleLogLevelArgType = DEFAULT_CONSOLE_LOG_LEVEL,
     log_file_level: TyroLogFileLevelArgType = DEFAULT_LOG_FILE_LEVEL,
@@ -91,6 +98,7 @@ def compare(
     compare_backup.compare_tree(
         src_root=src,
         backup_root=dst,
+        one_file_system=one_file_system,
         excludes=excludes,
         log_manager=log_manager,
     )

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/PyHardLinkBackup/compare_backup.py

@@ -15,6 +15,7 @@ from PyHardLinkBackup.utilities.filesystem import (
     hash_file,
     humanized_fs_scan,
     iter_scandir_files,
+    verbose_path_stat,
 )
 from PyHardLinkBackup.utilities.humanize import PrintTimingContextManager, human_filesize
 from PyHardLinkBackup.utilities.rich_utils import DisplayFileTreeProgress
@@ -149,6 +150,7 @@ def compare_tree(
     *,
     src_root: Path,
     backup_root: Path,
+    one_file_system: bool,
     excludes: tuple[str, ...],
     log_manager: LoggingManager,
 ) -> CompareResult:
@@ -181,9 +183,16 @@ def compare_tree(
     log_file = compare_main_dir / f'{now_timestamp}-compare.log'
     log_manager.start_file_logging(log_file)
 
+    src_device_id = verbose_path_stat(src_root).st_dev
+
     excludes: set = set(excludes)
     with PrintTimingContextManager('Filesystem scan completed in'):
-        src_file_count, src_total_size = humanized_fs_scan(src_root, excludes=excludes)
+        src_file_count, src_total_size = humanized_fs_scan(
+            path=src_root,
+            one_file_system=one_file_system,
+            src_device_id=src_device_id,
+            excludes=excludes,
+        )
 
     with DisplayFileTreeProgress(
         description=f'Compare {src_root}...',
@@ -197,7 +206,12 @@ def compare_tree(
         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):
+        for entry in iter_scandir_files(
+            path=src_root,
+            one_file_system=one_file_system,
+            src_device_id=src_device_id,
+            excludes=excludes,
+        ):
             try:
                 compare_one_file(
                     src_root=src_root,

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/PyHardLinkBackup/rebuild_databases.py

@@ -113,7 +113,12 @@ def rebuild(
     log_manager.start_file_logging(log_file=backup_root / f'{timestamp}-rebuild.log')
 
     with PrintTimingContextManager('Filesystem scan completed in'):
-        file_count, total_size = humanized_fs_scan(backup_root, excludes={'.phlb'})
+        file_count, total_size = humanized_fs_scan(
+            path=backup_root,
+            one_file_system=False,
+            src_device_id=None,
+            excludes={'.phlb'},
+        )
 
         # We should ignore all files in the root backup directory itself
         # e.g.: Our *-summary.txt and *.log files
@@ -134,7 +139,12 @@ def rebuild(
         rebuild_result = RebuildResult()
 
         next_update = 0
-        for entry in iter_scandir_files(backup_root, excludes={'.phlb'}):
+        for entry in iter_scandir_files(
+            path=backup_root,
+            one_file_system=False,
+            src_device_id=None,
+            excludes={'.phlb'},
+        ):
             try:
                 rebuild_one_file(
                     backup_root=backup_root,

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/PyHardLinkBackup/tests/test_backup.py

@@ -36,15 +36,14 @@ class SortedIterScandirFiles:
     This class wraps iter_scandir_files() and yields the entries sorted by name.
     """
 
-    def __init__(self, path: Path, excludes: set):
-        self.path = path
-        self.excludes = excludes
+    def __init__(self, **iter_scandir_files_kwargs):
+        self.iter_scandir_files_kwargs = iter_scandir_files_kwargs
 
     def __enter__(self):
         return self
 
     def __iter__(self) -> Iterable[os.DirEntry]:
-        scandir_iterator = iter_scandir_files(self.path, self.excludes)
+        scandir_iterator = iter_scandir_files(**self.iter_scandir_files_kwargs)
         yield from sorted(scandir_iterator, key=lambda e: e.name)
 
     def __exit__(self, exc_type, exc_val, exc_tb):
@@ -57,7 +56,12 @@ def set_file_times(path: Path, dt: datetime.datetime):
         dt = dt.astimezone(datetime.timezone.utc).replace(tzinfo=None)
     fixed_time = dt.timestamp()
     with NoLogs(logger_name=''):
-        for entry in iter_scandir_files(path, excludes=set()):
+        for entry in iter_scandir_files(
+            path=path,
+            one_file_system=False,
+            src_device_id=None,
+            excludes=set(),
+        ):
             try:
                 os.utime(entry.path, (fixed_time, fixed_time))
             except FileNotFoundError:
@@ -67,7 +71,12 @@ def set_file_times(path: Path, dt: datetime.datetime):
 
 def _fs_tree_overview(root: Path) -> str:
     lines = []
-    for entry in iter_scandir_files(root, excludes=set()):
+    for entry in iter_scandir_files(
+        path=root,
+        one_file_system=False,
+        src_device_id=None,
+        excludes=set(),
+    ):
         file_path = Path(entry.path)
         crc32 = '-'
         try:
@@ -143,6 +152,7 @@ class BackupTreeTestCase(
         self,
         *,
         time_to_freeze: str,
+        backup_name=None,
         log_file_level: LogLevelLiteral = DEFAULT_LOG_FILE_LEVEL,
     ):
         # FIXME: freezegun doesn't handle this, see: https://github.com/spulec/freezegun/issues/392
@@ -157,6 +167,8 @@ class BackupTreeTestCase(
             result = backup_tree(
                 src_root=self.src_root,
                 backup_root=self.backup_root,
+                backup_name=backup_name,
+                one_file_system=True,
                 excludes=('.cache',),
                 log_manager=LoggingManager(
                     console_level='info',
@@ -924,7 +936,6 @@ class BackupTreeTestCase(
             f' to {self.temp_path}/backups/source/2026-02-22-123456/large_fileB.txt',
             log_file_content,
         )
-
         with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
             assert_fs_tree_overview(
                 root=self.backup_root / 'source',
@@ -1111,3 +1122,46 @@ class BackupTreeTestCase(
             excpected_successful_file_count=1,
             excpected_error_count=0,
         )
+
+    def test_backup_name(self):
+        """DocWrite: README.md # PyHardLinkBackup - Backup Naming
+        The backup name is optional.
+        If not provided, the name of the source directory is used.
+        """
+        (self.src_root / 'file.txt').touch()
+
+        redirected_out, result = self.create_backup(time_to_freeze='2026-01-01T12:34:56Z', backup_name=None)
+        self.assertEqual(
+            str(result.backup_dir.relative_to(self.temp_path)),
+            'backups/source/2026-01-01-123456',
+        )
+
+        redirected_out, result = self.create_backup(time_to_freeze='2026-01-01T12:34:56Z', backup_name='My-Backup')
+        self.assertEqual(
+            str(result.backup_dir.relative_to(self.temp_path)),
+            'backups/My-Backup/2026-01-01-123456',
+        )
+        redirected_out, result = self.create_backup(time_to_freeze='2026-12-24T00:12:34Z', backup_name='My-Backup')
+        self.assertEqual(
+            str(result.backup_dir.relative_to(self.temp_path)),
+            'backups/My-Backup/2026-12-24-001234',
+        )
+        with self.assertLogs('PyHardLinkBackup', level=logging.DEBUG):
+            assert_fs_tree_overview(
+                root=self.backup_root,
+                expected_overview="""
+                    path                                     birthtime    type      nlink  size    CRC32
+                    My-Backup/2026-01-01-123456-backup.log   <mock>       file          1  <mock>  <mock>
+                    My-Backup/2026-01-01-123456-summary.txt  <mock>       file          1  <mock>  <mock>
+                    My-Backup/2026-01-01-123456/SHA256SUMS   <mock>       file          1  75      43d11c57
+                    My-Backup/2026-01-01-123456/file.txt     12:00:00     file          1  0       00000000
+                    My-Backup/2026-12-24-001234-backup.log   <mock>       file          1  <mock>  <mock>
+                    My-Backup/2026-12-24-001234-summary.txt  <mock>       file          1  <mock>  <mock>
+                    My-Backup/2026-12-24-001234/SHA256SUMS   <mock>       file          1  75      43d11c57
+                    My-Backup/2026-12-24-001234/file.txt     12:00:00     file          1  0       00000000
+                    source/2026-01-01-123456-backup.log      <mock>       file          1  <mock>  <mock>
+                    source/2026-01-01-123456-summary.txt     <mock>       file          1  <mock>  <mock>
+                    source/2026-01-01-123456/SHA256SUMS      <mock>       file          1  75      43d11c57
+                    source/2026-01-01-123456/file.txt        12:00:00     file          1  0       00000000
+                """,
+            )

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/PyHardLinkBackup/tests/test_compare_backup.py

@@ -39,6 +39,7 @@ def assert_compare_backup(
         result = compare_tree(
             src_root=src_root,
             backup_root=backup_root,
+            one_file_system=True,
             excludes=excludes,
             log_manager=LoggingManager(
                 console_level='info',
@@ -105,6 +106,7 @@ class CompareBackupTestCase(PyHardLinkBackupTestCaseMixin, TestCase):
             result = compare_tree(
                 src_root=self.src_root,
                 backup_root=self.backup_root,
+                one_file_system=True,
                 excludes=(),
                 log_manager=LoggingManager(
                     console_level='info',

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/PyHardLinkBackup/utilities/filesystem.py

@@ -23,6 +23,17 @@ logger = logging.getLogger(__name__)
 MIN_SIZE_FOR_PROGRESS_BAR = CHUNK_SIZE * 10
 
 
+def verbose_path_stat(path: Path) -> os.stat_result:
+    stat_result = path.stat()
+    stat_dict = {}
+    for key in dir(stat_result):
+        if key.startswith('st_'):
+            value = getattr(stat_result, key)
+            stat_dict[key] = value
+    logger.info('Stat for %s: %s', path, stat_dict)
+    return stat_result
+
+
 class RemoveFileOnError:
     def __init__(self, file_path: Path):
         self.file_path = file_path
@@ -32,7 +43,8 @@ class RemoveFileOnError:
 
     def __exit__(self, exc_type, exc_value, exc_traceback):
         if exc_type:
-            logger.info(f'Removing incomplete file {self.file_path} due to error: {exc_value}',
+            logger.info(
+                f'Removing incomplete file {self.file_path} due to error: {exc_value}',
                 exc_info=(exc_type, exc_value, exc_traceback),
             )
             self.file_path.unlink(missing_ok=True)
@@ -43,7 +55,7 @@ def hash_file(path: Path, progress: DisplayFileTreeProgress, total_size: int) ->
     logger.debug('Hash file %s using %s', path, HASH_ALGO)
     hasher = hashlib.new(HASH_ALGO)
     with LargeFileProgress(
-        f'Hashing large file: {path.name}',
+        description=f'Hashing large file: "[yellow]{path}[/yellow]"',
         parent_progress=progress,
         total_size=total_size,
     ) as progress_bar:
@@ -56,11 +68,27 @@ def hash_file(path: Path, progress: DisplayFileTreeProgress, total_size: int) ->
     return file_hash
 
 
+def copy_with_progress(src: Path, dst: Path, progress: DisplayFileTreeProgress, total_size: int) -> None:
+    logger.debug('Copy file %s to %s using %s', src, dst, HASH_ALGO)
+    with LargeFileProgress(
+        description=f'Copying large file: "[yellow]{src}[/yellow]"',
+        parent_progress=progress,
+        total_size=total_size,
+    ) as progress_bar:
+        with src.open('rb') as source_file, dst.open('wb') as dst_file:
+            while chunk := source_file.read(CHUNK_SIZE):
+                dst_file.write(chunk)
+                progress_bar.update(advance=len(chunk))
+
+    # Keep original file metadata (permission bits, last access time, last modification time, and flags)
+    shutil.copystat(src, dst)
+
+
 def copy_and_hash(src: Path, dst: Path, progress: DisplayFileTreeProgress, total_size: int) -> str:
     logger.debug('Copy and hash file %s to %s using %s', src, dst, HASH_ALGO)
     hasher = hashlib.new(HASH_ALGO)
     with LargeFileProgress(
-        f'Copying large file: {src.name}',
+        description=f'Copy and hash large file: "[yellow]{src}[/yellow]"',
         parent_progress=progress,
         total_size=total_size,
     ) as progress_bar:
@@ -87,7 +115,13 @@ def read_and_hash_file(path: Path) -> tuple[bytes, str]:
     return content, file_hash
 
 
-def iter_scandir_files(path: Path, excludes: set[str]) -> Iterable[os.DirEntry]:
+def iter_scandir_files(
+    *,
+    path: Path,
+    one_file_system: bool,
+    src_device_id,
+    excludes: set[str],
+) -> Iterable[os.DirEntry]:
     """
     Recursively yield all files+symlinks in the given directory.
     Note: Directory symlinks are treated as files (not recursed into).
@@ -101,13 +135,39 @@ def iter_scandir_files(path: Path, excludes: set[str]) -> Iterable[os.DirEntry]:
                 if entry.name in excludes:
                     logger.debug('Excluding directory %s', entry.path)
                     continue
-                yield from iter_scandir_files(Path(entry.path), excludes=excludes)
+
+                if one_file_system:
+                    try:
+                        entry_device_id = entry.stat(follow_symlinks=False).st_dev
+                    except OSError as err:
+                        # e.g.: broken symlink
+                        logger.debug('Skipping directory %s: %s', entry.path, err)
+                        continue
+                    if entry_device_id != src_device_id:
+                        logger.debug(
+                            'Skipping directory %s: different device ID %s (src device ID: %s)',
+                            entry.path,
+                            entry_device_id,
+                            src_device_id,
+                        )
+                        continue
+
+                yield from iter_scandir_files(
+                    path=Path(entry.path),
+                    one_file_system=one_file_system,
+                    src_device_id=src_device_id,
+                    excludes=excludes,
+                )
             else:
                 # It's a file or symlink or broken symlink
                 yield entry
 
 
-def humanized_fs_scan(path: Path, excludes: set[str]) -> tuple[int, int]:
+def humanized_fs_scan(
+    *,
+    path: Path,
+    **iter_scandir_files_kwargs,
+) -> tuple[int, int]:
     print(f'\nScanning filesystem at: {path}...')
 
     progress = Progress(
@@ -133,7 +193,7 @@ def humanized_fs_scan(path: Path, excludes: set[str]) -> tuple[int, int]:
     )
     next_update = 0
     with progress:
-        for entry in iter_scandir_files(path, excludes=excludes):
+        for entry in iter_scandir_files(path=path, **iter_scandir_files_kwargs):
             if not entry.is_file():
                 # Ignore e.g.: directory symlinks
                 continue

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/PyHardLinkBackup/utilities/rich_utils.py

@@ -31,18 +31,9 @@ class HumanFileSizeColumn(ProgressColumn):
             advance_size = task.completed
             remaining_size = task.remaining
             return (
-                Text('Achieved: ', style='white')
-                + Text(
-                    human_filesize(advance_size),
-                    style='progress.elapsed',
-                )
-                + Text(' Remaining: ', style='white')
-                + Text(
-                    human_filesize(remaining_size),
-                    style='progress.remaining',
-                )
+                f'[white][progress.elapsed]{human_filesize(advance_size)}[white]'
+                f' / [progress.remaining]{human_filesize(remaining_size)}'
             )
-
         else:
             try:
                 advance_size = task.fields[self.field_name]
@@ -76,20 +67,15 @@ class DisplayFileTreeProgress:
         self.file_size_progress_bar = Progress(TaskProgressColumn(**percent_kwargs), BarColumn(bar_width=None))
 
         self.overall_progress = Progress(
-            TextColumn('Elapsed:'),
             TimeElapsedColumn(),
-            TextColumn('Remaining:'),
+            '/',
             TimeRemainingColumn(),
         )
         self.file_count_progress = Progress(
-            TextColumn(
-                '[white]Achieved: [progress.elapsed]{task.completed}[white]'
-                ' Remaining: [progress.remaining]{task.remaining}'
-            ),
+            TextColumn('[white][progress.elapsed]{task.completed}[white] / [progress.remaining]{task.remaining}'),
             '|',
             TransferSpeedColumn2(unit='files'),
             '|',
-            TextColumn('Remaining:'),
             TimeRemainingColumn(),
         )
         self.file_size_progress = Progress(
@@ -97,7 +83,6 @@ class DisplayFileTreeProgress:
             '|',
             TransferSpeedColumn(),
             '|',
-            TextColumn('Remaining:'),
             TimeRemainingColumn(),
         )
 
@@ -110,9 +95,9 @@ class DisplayFileTreeProgress:
         self.file_size_progress_task_time = self.file_size_progress.add_task('', total=total_size)
 
         progress_table = Table(box=None, expand=True, padding=(0, 2), show_header=False)
-        progress_table.add_row('[b]Overall Progress', self.overall_progress_bar, self.overall_progress)
-        progress_table.add_row('Total files saved', self.file_count_progress_bar, self.file_count_progress)
-        progress_table.add_row('Total file size processed', self.file_size_progress_bar, self.file_size_progress)
+        progress_table.add_row('[b]Overall', self.overall_progress_bar, self.overall_progress)
+        progress_table.add_row('Files', self.file_count_progress_bar, self.file_count_progress)
+        progress_table.add_row('Size', self.file_size_progress_bar, self.file_size_progress)
 
         self.file_count_progress_task = self.file_count_progress.tasks[0]
         self.file_size_progress_task = self.file_size_progress.tasks[0]
@@ -121,7 +106,7 @@ class DisplayFileTreeProgress:
             Panel(
                 progress_table,
                 title=Text(description, style='progress.data.speed'),
-                border_style=Style(color='blue', bold=True),
+                border_style=Style(color='white', bold=True),
             ),
             auto_refresh=False,
         )
@@ -221,9 +206,7 @@ class LargeFileProgress:
                 '|',
                 TransferSpeedColumn(),
                 '|',
-                TextColumn('Elapsed:'),
                 TimeElapsedColumn(),
-                TextColumn('Remaining:'),
                 TimeRemainingColumn(),
             )
             self.progress.log(f'Large file processing start: {self.description}')

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/PyHardLinkBackup/utilities/tests/test_file_hash_database.py

@@ -28,7 +28,12 @@ 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())
+        for entry in iter_scandir_files(
+            path=hash_db.base_path,
+            one_file_system=False,
+            src_device_id=None,
+            excludes=set(),
+        )
     )
 
 
@@ -38,7 +43,12 @@ def get_hash_db_info(backup_root: Path) -> str:
 
     with NoLogs(logger_name='XY'):
         lines = []
-        for entry in iter_scandir_files(db_base_path, excludes=set()):
+        for entry in iter_scandir_files(
+            path=db_base_path,
+            one_file_system=False,
+            src_device_id=None,
+            excludes=set(),
+        ):
             hash_path = Path(entry.path)
             rel_path = hash_path.relative_to(db_base_path)
             rel_file_path = hash_path.read_text()

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/PyHardLinkBackup/utilities/tests/test_file_size_database.py

@@ -25,13 +25,26 @@ class TemporaryFileSizeDatabase(tempfile.TemporaryDirectory):
 def get_size_db_filenames(size_db: FileSizeDatabase) -> Iterable[str]:
     return sorted(
         str(Path(entry.path).relative_to(size_db.base_path))
-        for entry in iter_scandir_files(size_db.base_path, excludes=set())
+        for entry in iter_scandir_files(
+            path=size_db.base_path,
+            one_file_system=False,
+            src_device_id=None,
+            excludes=set(),
+        )
     )
 
 
 def get_sizes(size_db: FileSizeDatabase) -> Iterable[int]:
     with NoLogs('PyHardLinkBackup.utilities.filesystem'):
-        return sorted(int(entry.name) for entry in iter_scandir_files(size_db.base_path, excludes=set()))
+        return sorted(
+            int(entry.name)
+            for entry in iter_scandir_files(
+                path=size_db.base_path,
+                one_file_system=False,
+                src_device_id=None,
+                excludes=set(),
+            )
+        )
 
 
 class FileSizeDatabaseTestCase(BaseTestCase):

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/PyHardLinkBackup/utilities/tests/test_filesystem.py

@@ -86,7 +86,14 @@ class TestHashFile(BaseTestCase):
             broken_symlink_path.symlink_to(temp_path / 'not/existing/file.txt')
 
             with self.assertLogs(level='DEBUG') as logs:
-                files = list(iter_scandir_files(temp_path, excludes={'__pycache__'}))
+                files = list(
+                    iter_scandir_files(
+                        path=temp_path,
+                        one_file_system=False,
+                        src_device_id=None,
+                        excludes={'__pycache__'},
+                    )
+                )
 
         file_names = sorted([Path(f.path).relative_to(temp_path).as_posix() for f in files])
 
@@ -106,6 +113,38 @@ class TestHashFile(BaseTestCase):
         self.assertIn('Scanning directory ', logs)
         self.assertIn('Excluding directory ', logs)
 
+    def test_one_file_system(self):
+        def scan(temp_path, *, one_file_system, src_device_id):
+            with self.assertLogs(level='DEBUG') as logs:
+                files = list(
+                    iter_scandir_files(
+                        path=temp_path,
+                        one_file_system=one_file_system,
+                        src_device_id=src_device_id,
+                        excludes=set(),
+                    )
+                )
+            file_names = sorted([Path(f.path).relative_to(temp_path).as_posix() for f in files])
+            return file_names, '\n'.join(logs.output)
+
+        with TemporaryDirectoryPath() as temp_path:
+            (temp_path / 'file1.txt').touch()
+            subdir = temp_path / 'subdir'
+            subdir.mkdir()
+            (subdir / 'file2.txt').touch()
+
+            file_names, logs = scan(temp_path, one_file_system=False, src_device_id=None)
+            self.assertEqual(file_names, ['file1.txt', 'subdir/file2.txt'])
+            self.assertIn('Scanning directory ', logs)
+            self.assertNotIn('Skipping', logs)
+
+            file_names, logs = scan(temp_path, one_file_system=True, src_device_id='FooBar')
+            self.assertEqual(file_names, ['file1.txt'])
+            self.assertIn('Scanning directory ', logs)
+            self.assertIn('Skipping directory ', logs)
+            self.assertIn('different device ID', logs)
+            self.assertIn('(src device ID: FooBar)', logs)
+
     def test_supports_hardlinks(self):
         with TemporaryDirectoryPath() as temp_path:
             with self.assertLogs(level=logging.INFO) as logs:

pyhardlinkbackup-1.8.0/PyHardLinkBackup/utilities/tyro_cli_shared_args.py

@@ -0,0 +1,29 @@
+from typing import Annotated
+
+import tyro
+
+
+TyroExcludeDirectoriesArgType = Annotated[
+    tuple[str, ...],
+    tyro.conf.arg(
+        help='List of directories to exclude from backup.',
+    ),
+]
+DEFAULT_EXCLUDE_DIRECTORIES = ('__pycache__', '.cache', '.temp', '.tmp', '.tox', '.nox')
+
+TyroOneFileSystemArgType = Annotated[
+    bool,
+    tyro.conf.arg(
+        help='Do not cross filesystem boundaries.',
+    ),
+]
+
+TyroBackupNameArgType = Annotated[
+    str | None,
+    tyro.conf.arg(
+        help=(
+            'Optional name for the backup (used to create a subdirectory in the backup destination).'
+            ' If not provided, the name of the source directory is used.'
+        ),
+    ),
+]

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/README.md

@@ -51,19 +51,23 @@ usage: phlb backup [-h] [BACKUP OPTIONS]
 
 Backup the source directory to the destination directory using hard links for deduplication.
 
-╭─ positional arguments ──────────────────────────────────────────────────────────────────────────────────────╮
-│ source       Source directory to back up. (required)                                                        │
-│ destination  Destination directory for the backup. (required)                                               │
-╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
-╭─ options ───────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ -h, --help   show this help message and exit                                                                │
-│ --excludes [STR [STR ...]]                                                                                  │
-│              List of directories to exclude from backup. (default: __pycache__ .cache .temp .tmp .tox .nox) │
-│ --verbosity {debug,info,warning,error}                                                                      │
-│              Log level for console logging. (default: warning)                                              │
-│ --log-file-level {debug,info,warning,error}                                                                 │
-│              Log level for the log file (default: info)                                                     │
-╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
+╭─ positional arguments ───────────────────────────────────────────────────────────────────────────────────────────────╮
+│ source             Source directory to back up. (required)                                                           │
+│ destination        Destination directory for the backup. (required)                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
+╭─ options ────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
+│ -h, --help         show this help message and exit                                                                   │
+│ --name {None}|STR  Optional name for the backup (used to create a subdirectory in the backup destination). If not    │
+│                    provided, the name of the source directory is used. (default: None)                               │
+│ --one-file-system, --no-one-file-system                                                                              │
+│                    Do not cross filesystem boundaries. (default: True)                                               │
+│ --excludes [STR [STR ...]]                                                                                           │
+│                    List of directories to exclude from backup. (default: __pycache__ .cache .temp .tmp .tox .nox)    │
+│ --verbosity {debug,info,warning,error}                                                                               │
+│                    Log level for console logging. (default: warning)                                                 │
+│ --log-file-level {debug,info,warning,error}                                                                          │
+│                    Log level for the log file (default: info)                                                        │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
 ```
 [comment]: <> (✂✂✂ auto generated backup help end ✂✂✂)
 
@@ -270,12 +274,20 @@ Overview of main changes:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v1.8.0](https://github.com/jedie/PyHardLinkBackup/compare/v1.7.3...v1.8.0)
+  * 2026-01-22 - Add optional "--name" to enforce a name for the backup sub directory
+  * 2026-01-22 - Do not cross filesystem boundaries as default
+  * 2026-01-22 - Display progress also for large unique file copy
+  * 2026-01-22 - Optimize progress bars for smaller screens
 * [v1.7.3](https://github.com/jedie/PyHardLinkBackup/compare/v1.7.2...v1.7.3)
   * 2026-01-21 - Handle directory symlinks correct
 * [v1.7.2](https://github.com/jedie/PyHardLinkBackup/compare/v1.7.1...v1.7.2)
   * 2026-01-21 - Display "Remaining time" to files and sizes, too.
 * [v1.7.1](https://github.com/jedie/PyHardLinkBackup/compare/v1.7.0...v1.7.1)
   * 2026-01-19 - Update requirements to fix problems under Windows
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v1.7.0](https://github.com/jedie/PyHardLinkBackup/compare/v1.6.0...v1.7.0)
   * 2026-01-19 - Speedup and enhance unittest
   * 2026-01-17 - Remove unfinished copied files on errors
@@ -285,9 +297,6 @@ Overview of main changes:
   * 2026-01-17 - simplify tests
   * 2026-01-17 - Warn if broken symlink found
   * 2026-01-17 - Update README
-
-<details><summary>Expand older history entries ...</summary>
-
 * [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

{pyhardlinkbackup-1.7.3 → pyhardlinkbackup-1.8.0}/docs/README.md

@@ -2,6 +2,11 @@
 
 HardLink/Deduplication Backups with Python
 
+# PyHardLinkBackup - Backup Naming
+
+The backup name is optional.
+If not provided, the name of the source directory is used.
+
 # PyHardLinkBackup - Notes
 
 A log file is stored in the backup directory. e.g.:

pyhardlinkbackup-1.7.3/PyHardLinkBackup/utilities/tyro_cli_shared_args.py

@@ -1,12 +0,0 @@
-from typing import Annotated
-
-import tyro
-
-
-TyroExcludeDirectoriesArgType = Annotated[
-    tuple[str, ...],
-    tyro.conf.arg(
-        help='List of directories to exclude from backup.',
-    ),
-]
-DEFAULT_EXCLUDE_DIRECTORIES = ('__pycache__', '.cache', '.temp', '.tmp', '.tox', '.nox')