dar-backup 0.6.18__tar.gz → 0.6.19__tar.gz

{dar_backup-0.6.18 → dar_backup-0.6.19}/.gitignore

@@ -16,4 +16,4 @@ v2/dist
 v2/build
 v2/.coverage
 v2/dar-backup.tar
-
+v2/coverage.xml

{dar_backup-0.6.18/src/dar_backup → dar_backup-0.6.19}/Changelog.md

@@ -1,6 +1,21 @@
 <!-- markdownlint-disable MD024 -->
 # dar-backup Changelog
 
+## v2-beta-0.6.19 - 2025-04-21
+
+Github link: [v2-beta-0.6.19](https://github.com/per2jensen/dar-backup/tree/v2-beta-0.6.19/v2)
+
+### Added
+
+- removed a BackupError in the verify() to reduce noise in logs and let the rest of "compares" run.
+- Added bash and zsh auto completion for a nicer CLI experience.
+  
+  -- See [README for details](https://github.com/per2jensen/dar-backup?tab=readme-ov-file#shell-autocompletion)  
+
+- Improvement to command_runner.run(), more robust decoding
+
+- Manager --add-specific-archive now gives a prompt with a warning if user attempts to add a catalog that breaks chronology. The user is allowed to go forward and ignore the warning or can choose to abort. The program times out after a little while and discards the operation.
+
 ## v2-beta-0.6.18 - 2025-04-05
 
 Github link: [v2-beta-0.6.18](https://github.com/per2jensen/dar-backup/tree/v2-beta-0.6.18/v2)

{dar_backup-0.6.18 → dar_backup-0.6.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dar-backup
-Version: 0.6.18
+Version: 0.6.19
 Summary: A script to do full, differential and incremental backups using dar.     Some files are restored from the backups during verification, after which par2 redundancy files are created.     The script also has a cleanup feature to remove old backups and par2 files.
 Project-URL: GPG Public Key, https://keys.openpgp.org/search?q=dar-backup@pm.me
 Project-URL: Homepage, https://github.com/per2jensen/dar-backup/tree/main/v2
@@ -689,6 +689,7 @@ Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Topic :: System :: Archiving :: Backup
 Requires-Python: >=3.9
+Requires-Dist: argcomplete>=3.6.2
 Requires-Dist: inputimeout>=1.0.4
 Requires-Dist: rich>=13.0.0
 Description-Content-Type: text/markdown
@@ -697,12 +698,18 @@ Description-Content-Type: text/markdown
 # Full, differential or incremental backups using 'dar'
 
 [![codecov](https://codecov.io/gh/per2jensen/dar-backup/branch/main/graph/badge.svg)](https://codecov.io/gh/per2jensen/dar-backup)
+[![PyPI monthly downloads](https://img.shields.io/pypi/dm/dar-backup)](https://pypi.org/project/dar-backup/)
+[![Total Downloads](https://img.shields.io/badge/dynamic/json?color=blue&label=Total%20Downloads&query=total&url=https%3A%2F%2Fraw.githubusercontent.com%2Fper2jensen%2Fdar-backup%2Fmain%2Fdownloads.json)](https://pypi.org/project/dar-backup/)
 
 The wonderful 'dar' [Disk Archiver](https://github.com/Edrusb/DAR) is used for
 the heavy lifting, together with the par2 suite in these scripts.
 
 This is the `Python` based **version 2** of `dar-backup`.
 
+## TL;DR
+
+`dar-backup` is a Python-powered CLI for creating and validating full, differential, and incremental backups using dar and par2. Designed for long-term restore integrity, even on user-space filesystems like FUSE.
+
 ## Table of Contents
 
 - [Full, differential or incremental backups using 'dar'](#full-differential-or-incremental-backups-using-dar)
@@ -728,6 +735,7 @@ This is the `Python` based **version 2** of `dar-backup`.
   - [Generate systemd files](#generate-systemd-files)
   - [Service: dar-back --incremental-backup](#service-dar-backup---incremental-backup)
   - [Timer: dar-back --incremental-backup](#timer-dar-backup---incremental-backup)
+  - [Systemd timer note](#systemd-timer-note)
 - [List contents of an archive](#list-contents-of-an-archive)
 - [dar file selection examples](#dar-file-selection-examples)
   - [Select a directory](#select-a-directory)
@@ -753,7 +761,9 @@ This is the `Python` based **version 2** of `dar-backup`.
   - [Skipping cache directories](#skipping-cache-directories)
   - [Progress bar + current directory](#progress-bar-and-current-directory)
 - [Todo](#todo)
+- [Known Limitations / Edge Cases](#known-limitations--edge-cases)
 - [Reference](#reference)
+  - [CLI Tools Overview](#cli-tools-overview)
   - [Test coverage report](#test-coverage)
   - [dar-backup](#dar-backup-options)
   - [manager](#manager-options)
@@ -1346,6 +1356,10 @@ Persistent=true
 WantedBy=timers.target
 ````
 
+## systemd timer note
+
+📅 OnCalendar syntax is flexible — you can tweak backup schedules easily. Run systemd-analyze calendar to preview timers.
+
 ## list contents of an archive
 
 ```` bash
@@ -1636,8 +1650,27 @@ The indicators are not shown if dar-backup is run from systemd or if it is used
 - Look into a way to move the .par2 files away from the `dar` slices, to maximize chance of good redundancy.
 - Add option to dar-backup to use the `dar` option `--fsa-scope none`
 
+## Known Limitations / Edge Cases
+
+Does not currently encrypt data (by design — relies on encrypted storage)
+
+One backup definition per file
+
+.par2 files created for each slice (may be moved in future)
+
 ## Reference
 
+### CLI Tools Overview
+
+| Command               | Description                               |
+|-----------------------|-------------------------------------------|
+| `dar-backup`          | Perform full, differential, or incremental backups with verification and restore testing |
+| `manager`             | Maintain and query catalog databases for archives |
+| `cleanup`             | Remove outdated DIFF/INCR archives (and optionally FULLs) |
+| `clean-log`           | Clean up excessive log output from dar command logs |
+| `installer`           | Set up required directories and default config files |
+| `dar-backup-systemd`  | Generate (and optionally install) systemd timers and services for automated backups |
+
 ### test coverage
 
 Running
@@ -1646,23 +1679,26 @@ Running
 pytest --cov=dar_backup tests/
 ````
 
-results for version 0.6.17 in this report:
+results for a dev version 0.6.19 in this report:
 
 ```` code
 ---------- coverage: platform linux, python 3.12.3-final-0 -----------
-Name                                                              Stmts   Miss  Cover
--------------------------------------------------------------------------------------
-venv/lib/python3.12/site-packages/dar_backup/__about__.py             1      0   100%
-venv/lib/python3.12/site-packages/dar_backup/__init__.py              0      0   100%
-venv/lib/python3.12/site-packages/dar_backup/clean_log.py            68     14    79%
-venv/lib/python3.12/site-packages/dar_backup/cleanup.py             196     53    73%
-venv/lib/python3.12/site-packages/dar_backup/config_settings.py      66      8    88%
-venv/lib/python3.12/site-packages/dar_backup/dar_backup.py          464     99    79%
-venv/lib/python3.12/site-packages/dar_backup/installer.py            46     46     0%
-venv/lib/python3.12/site-packages/dar_backup/manager.py             316     72    77%
-venv/lib/python3.12/site-packages/dar_backup/util.py                162     34    79%
--------------------------------------------------------------------------------------
-TOTAL                                                              1319    326    75%
+Name                                   Stmts   Miss  Cover
+----------------------------------------------------------
+src/dar_backup/__about__.py                1      0   100%
+src/dar_backup/__init__.py                 0      0   100%
+src/dar_backup/clean_log.py               68     13    81%
+src/dar_backup/cleanup.py                193     17    91%
+src/dar_backup/command_runner.py          73      1    99%
+src/dar_backup/config_settings.py         66      8    88%
+src/dar_backup/dar_backup.py             535     56    90%
+src/dar_backup/dar_backup_systemd.py      56      7    88%
+src/dar_backup/installer.py               59      6    90%
+src/dar_backup/manager.py                351     56    84%
+src/dar_backup/rich_progress.py           70      7    90%
+src/dar_backup/util.py                   130     15    88%
+----------------------------------------------------------
+TOTAL                                   1602    186    88%
 ````
 
 ### dar-backup options

{dar_backup-0.6.18 → dar_backup-0.6.19}/README.md

@@ -2,12 +2,18 @@
 # Full, differential or incremental backups using 'dar'
 
 [![codecov](https://codecov.io/gh/per2jensen/dar-backup/branch/main/graph/badge.svg)](https://codecov.io/gh/per2jensen/dar-backup)
+[![PyPI monthly downloads](https://img.shields.io/pypi/dm/dar-backup)](https://pypi.org/project/dar-backup/)
+[![Total Downloads](https://img.shields.io/badge/dynamic/json?color=blue&label=Total%20Downloads&query=total&url=https%3A%2F%2Fraw.githubusercontent.com%2Fper2jensen%2Fdar-backup%2Fmain%2Fdownloads.json)](https://pypi.org/project/dar-backup/)
 
 The wonderful 'dar' [Disk Archiver](https://github.com/Edrusb/DAR) is used for
 the heavy lifting, together with the par2 suite in these scripts.
 
 This is the `Python` based **version 2** of `dar-backup`.
 
+## TL;DR
+
+`dar-backup` is a Python-powered CLI for creating and validating full, differential, and incremental backups using dar and par2. Designed for long-term restore integrity, even on user-space filesystems like FUSE.
+
 ## Table of Contents
 
 - [Full, differential or incremental backups using 'dar'](#full-differential-or-incremental-backups-using-dar)
@@ -33,6 +39,7 @@ This is the `Python` based **version 2** of `dar-backup`.
   - [Generate systemd files](#generate-systemd-files)
   - [Service: dar-back --incremental-backup](#service-dar-backup---incremental-backup)
   - [Timer: dar-back --incremental-backup](#timer-dar-backup---incremental-backup)
+  - [Systemd timer note](#systemd-timer-note)
 - [List contents of an archive](#list-contents-of-an-archive)
 - [dar file selection examples](#dar-file-selection-examples)
   - [Select a directory](#select-a-directory)
@@ -58,7 +65,9 @@ This is the `Python` based **version 2** of `dar-backup`.
   - [Skipping cache directories](#skipping-cache-directories)
   - [Progress bar + current directory](#progress-bar-and-current-directory)
 - [Todo](#todo)
+- [Known Limitations / Edge Cases](#known-limitations--edge-cases)
 - [Reference](#reference)
+  - [CLI Tools Overview](#cli-tools-overview)
   - [Test coverage report](#test-coverage)
   - [dar-backup](#dar-backup-options)
   - [manager](#manager-options)
@@ -651,6 +660,10 @@ Persistent=true
 WantedBy=timers.target
 ````
 
+## systemd timer note
+
+📅 OnCalendar syntax is flexible — you can tweak backup schedules easily. Run systemd-analyze calendar to preview timers.
+
 ## list contents of an archive
 
 ```` bash
@@ -941,8 +954,27 @@ The indicators are not shown if dar-backup is run from systemd or if it is used
 - Look into a way to move the .par2 files away from the `dar` slices, to maximize chance of good redundancy.
 - Add option to dar-backup to use the `dar` option `--fsa-scope none`
 
+## Known Limitations / Edge Cases
+
+Does not currently encrypt data (by design — relies on encrypted storage)
+
+One backup definition per file
+
+.par2 files created for each slice (may be moved in future)
+
 ## Reference
 
+### CLI Tools Overview
+
+| Command               | Description                               |
+|-----------------------|-------------------------------------------|
+| `dar-backup`          | Perform full, differential, or incremental backups with verification and restore testing |
+| `manager`             | Maintain and query catalog databases for archives |
+| `cleanup`             | Remove outdated DIFF/INCR archives (and optionally FULLs) |
+| `clean-log`           | Clean up excessive log output from dar command logs |
+| `installer`           | Set up required directories and default config files |
+| `dar-backup-systemd`  | Generate (and optionally install) systemd timers and services for automated backups |
+
 ### test coverage
 
 Running
@@ -951,23 +983,26 @@ Running
 pytest --cov=dar_backup tests/
 ````
 
-results for version 0.6.17 in this report:
+results for a dev version 0.6.19 in this report:
 
 ```` code
 ---------- coverage: platform linux, python 3.12.3-final-0 -----------
-Name                                                              Stmts   Miss  Cover
--------------------------------------------------------------------------------------
-venv/lib/python3.12/site-packages/dar_backup/__about__.py             1      0   100%
-venv/lib/python3.12/site-packages/dar_backup/__init__.py              0      0   100%
-venv/lib/python3.12/site-packages/dar_backup/clean_log.py            68     14    79%
-venv/lib/python3.12/site-packages/dar_backup/cleanup.py             196     53    73%
-venv/lib/python3.12/site-packages/dar_backup/config_settings.py      66      8    88%
-venv/lib/python3.12/site-packages/dar_backup/dar_backup.py          464     99    79%
-venv/lib/python3.12/site-packages/dar_backup/installer.py            46     46     0%
-venv/lib/python3.12/site-packages/dar_backup/manager.py             316     72    77%
-venv/lib/python3.12/site-packages/dar_backup/util.py                162     34    79%
--------------------------------------------------------------------------------------
-TOTAL                                                              1319    326    75%
+Name                                   Stmts   Miss  Cover
+----------------------------------------------------------
+src/dar_backup/__about__.py                1      0   100%
+src/dar_backup/__init__.py                 0      0   100%
+src/dar_backup/clean_log.py               68     13    81%
+src/dar_backup/cleanup.py                193     17    91%
+src/dar_backup/command_runner.py          73      1    99%
+src/dar_backup/config_settings.py         66      8    88%
+src/dar_backup/dar_backup.py             535     56    90%
+src/dar_backup/dar_backup_systemd.py      56      7    88%
+src/dar_backup/installer.py               59      6    90%
+src/dar_backup/manager.py                351     56    84%
+src/dar_backup/rich_progress.py           70      7    90%
+src/dar_backup/util.py                   130     15    88%
+----------------------------------------------------------
+TOTAL                                   1602    186    88%
 ````
 
 ### dar-backup options

{dar_backup-0.6.18 → dar_backup-0.6.19}/doc/dev.md

@@ -6,7 +6,7 @@
 cd <path/to/dar-backup/v2>
 python3 -m venv venv
 . venv/bin/activate
-pip install inputimeout build hatch hatchling pytest pytest-cov twine wheel psutil
+pip install inputimeout build hatch hatchling pytest pytest-cov twine wheel psutil pytest-timeout argcomplete
 ````
 
 ## Activate the venv
@@ -32,19 +32,19 @@ A pytest.ini is located in the v2 directory, so that pytest writes out captures
 That is useful when working with a single test and is the default
 
 ```` bash
-pytest -c pytest-minimal.ini tests/test_verbose.py::test_verbose_error_reporting
+PYTHONPATH=src  pytest -c pytest-minimal.ini tests/test_verbose.py::test_verbose_error_reporting
 ````
 
 Use  to get the minimal info on successful test cases
 
 ```` bash
-pytest -c pytest-minimal.ini
+PYTHONPATH=src pytest -c pytest-minimal.ini
 ````
 
 or for specific file with test cases
 
 ```` bash
-pytest -c pytest-minimal.ini tests/test_verbose.py
+PYTHONPATH=src pytest -c pytest-minimal.ini tests/test_verbose.py
 ````
 
 ## Upload to PyPI

{dar_backup-0.6.18 → dar_backup-0.6.19}/pyproject.toml

@@ -77,6 +77,7 @@ classifiers = [
 dependencies = [
     "inputimeout>=1.0.4",
     "rich>=13.0.0",
+    "argcomplete>=3.6.2"
     # other dependencies
 ]
 

{dar_backup-0.6.18 → dar_backup-0.6.19/src/dar_backup}/Changelog.md

@@ -1,6 +1,21 @@
 <!-- markdownlint-disable MD024 -->
 # dar-backup Changelog
 
+## v2-beta-0.6.19 - 2025-04-21
+
+Github link: [v2-beta-0.6.19](https://github.com/per2jensen/dar-backup/tree/v2-beta-0.6.19/v2)
+
+### Added
+
+- removed a BackupError in the verify() to reduce noise in logs and let the rest of "compares" run.
+- Added bash and zsh auto completion for a nicer CLI experience.
+  
+  -- See [README for details](https://github.com/per2jensen/dar-backup?tab=readme-ov-file#shell-autocompletion)  
+
+- Improvement to command_runner.run(), more robust decoding
+
+- Manager --add-specific-archive now gives a prompt with a warning if user attempts to add a catalog that breaks chronology. The user is allowed to go forward and ignore the warning or can choose to abort. The program times out after a little while and discards the operation.
+
 ## v2-beta-0.6.18 - 2025-04-05
 
 Github link: [v2-beta-0.6.18](https://github.com/per2jensen/dar-backup/tree/v2-beta-0.6.18/v2)

{dar_backup-0.6.18 → dar_backup-0.6.19}/src/dar_backup/README.md

@@ -2,12 +2,18 @@
 # Full, differential or incremental backups using 'dar'
 
 [![codecov](https://codecov.io/gh/per2jensen/dar-backup/branch/main/graph/badge.svg)](https://codecov.io/gh/per2jensen/dar-backup)
+[![PyPI monthly downloads](https://img.shields.io/pypi/dm/dar-backup)](https://pypi.org/project/dar-backup/)
+[![Total Downloads](https://img.shields.io/badge/dynamic/json?color=blue&label=Total%20Downloads&query=total&url=https%3A%2F%2Fraw.githubusercontent.com%2Fper2jensen%2Fdar-backup%2Fmain%2Fdownloads.json)](https://pypi.org/project/dar-backup/)
 
 The wonderful 'dar' [Disk Archiver](https://github.com/Edrusb/DAR) is used for
 the heavy lifting, together with the par2 suite in these scripts.
 
 This is the `Python` based **version 2** of `dar-backup`.
 
+## TL;DR
+
+`dar-backup` is a Python-powered CLI for creating and validating full, differential, and incremental backups using dar and par2. Designed for long-term restore integrity, even on user-space filesystems like FUSE.
+
 ## Table of Contents
 
 - [Full, differential or incremental backups using 'dar'](#full-differential-or-incremental-backups-using-dar)
@@ -33,6 +39,7 @@ This is the `Python` based **version 2** of `dar-backup`.
   - [Generate systemd files](#generate-systemd-files)
   - [Service: dar-back --incremental-backup](#service-dar-backup---incremental-backup)
   - [Timer: dar-back --incremental-backup](#timer-dar-backup---incremental-backup)
+  - [Systemd timer note](#systemd-timer-note)
 - [List contents of an archive](#list-contents-of-an-archive)
 - [dar file selection examples](#dar-file-selection-examples)
   - [Select a directory](#select-a-directory)
@@ -58,7 +65,9 @@ This is the `Python` based **version 2** of `dar-backup`.
   - [Skipping cache directories](#skipping-cache-directories)
   - [Progress bar + current directory](#progress-bar-and-current-directory)
 - [Todo](#todo)
+- [Known Limitations / Edge Cases](#known-limitations--edge-cases)
 - [Reference](#reference)
+  - [CLI Tools Overview](#cli-tools-overview)
   - [Test coverage report](#test-coverage)
   - [dar-backup](#dar-backup-options)
   - [manager](#manager-options)
@@ -651,6 +660,10 @@ Persistent=true
 WantedBy=timers.target
 ````
 
+## systemd timer note
+
+📅 OnCalendar syntax is flexible — you can tweak backup schedules easily. Run systemd-analyze calendar to preview timers.
+
 ## list contents of an archive
 
 ```` bash
@@ -941,8 +954,27 @@ The indicators are not shown if dar-backup is run from systemd or if it is used
 - Look into a way to move the .par2 files away from the `dar` slices, to maximize chance of good redundancy.
 - Add option to dar-backup to use the `dar` option `--fsa-scope none`
 
+## Known Limitations / Edge Cases
+
+Does not currently encrypt data (by design — relies on encrypted storage)
+
+One backup definition per file
+
+.par2 files created for each slice (may be moved in future)
+
 ## Reference
 
+### CLI Tools Overview
+
+| Command               | Description                               |
+|-----------------------|-------------------------------------------|
+| `dar-backup`          | Perform full, differential, or incremental backups with verification and restore testing |
+| `manager`             | Maintain and query catalog databases for archives |
+| `cleanup`             | Remove outdated DIFF/INCR archives (and optionally FULLs) |
+| `clean-log`           | Clean up excessive log output from dar command logs |
+| `installer`           | Set up required directories and default config files |
+| `dar-backup-systemd`  | Generate (and optionally install) systemd timers and services for automated backups |
+
 ### test coverage
 
 Running
@@ -951,23 +983,26 @@ Running
 pytest --cov=dar_backup tests/
 ````
 
-results for version 0.6.17 in this report:
+results for a dev version 0.6.19 in this report:
 
 ```` code
 ---------- coverage: platform linux, python 3.12.3-final-0 -----------
-Name                                                              Stmts   Miss  Cover
--------------------------------------------------------------------------------------
-venv/lib/python3.12/site-packages/dar_backup/__about__.py             1      0   100%
-venv/lib/python3.12/site-packages/dar_backup/__init__.py              0      0   100%
-venv/lib/python3.12/site-packages/dar_backup/clean_log.py            68     14    79%
-venv/lib/python3.12/site-packages/dar_backup/cleanup.py             196     53    73%
-venv/lib/python3.12/site-packages/dar_backup/config_settings.py      66      8    88%
-venv/lib/python3.12/site-packages/dar_backup/dar_backup.py          464     99    79%
-venv/lib/python3.12/site-packages/dar_backup/installer.py            46     46     0%
-venv/lib/python3.12/site-packages/dar_backup/manager.py             316     72    77%
-venv/lib/python3.12/site-packages/dar_backup/util.py                162     34    79%
--------------------------------------------------------------------------------------
-TOTAL                                                              1319    326    75%
+Name                                   Stmts   Miss  Cover
+----------------------------------------------------------
+src/dar_backup/__about__.py                1      0   100%
+src/dar_backup/__init__.py                 0      0   100%
+src/dar_backup/clean_log.py               68     13    81%
+src/dar_backup/cleanup.py                193     17    91%
+src/dar_backup/command_runner.py          73      1    99%
+src/dar_backup/config_settings.py         66      8    88%
+src/dar_backup/dar_backup.py             535     56    90%
+src/dar_backup/dar_backup_systemd.py      56      7    88%
+src/dar_backup/installer.py               59      6    90%
+src/dar_backup/manager.py                351     56    84%
+src/dar_backup/rich_progress.py           70      7    90%
+src/dar_backup/util.py                   130     15    88%
+----------------------------------------------------------
+TOTAL                                   1602    186    88%
 ````
 
 ### dar-backup options

dar_backup-0.6.19/src/dar_backup/__about__.py

@@ -0,0 +1 @@
+__version__ = "0.6.19"

{dar_backup-0.6.18 → dar_backup-0.6.19}/src/dar_backup/clean_log.py

@@ -11,6 +11,8 @@ See section 15 and section 16 in the supplied "LICENSE" file
 
 This script can be used to remove (much of) the logged output from `dar`.
 When `dar` verbose options are enabled, quite a lot of information is emitted.
+
+If a rerex is matched, the entire line is removed (change in v2-beta-0.6.19).
 """
 
 
@@ -19,7 +21,7 @@ import re
 import os
 import sys 
 
-from . import __about__ as about
+from dar_backup import __about__ as about
 from dar_backup.config_settings import ConfigSettings
 
 LICENSE = '''Licensed under GNU GENERAL PUBLIC LICENSE v3, see the supplied file "LICENSE" for details.
@@ -32,7 +34,7 @@ def clean_log_file(log_file_path, dry_run=False):
 
     if not os.path.isfile(log_file_path):
         print(f"File '{log_file_path}' not found!")
-        sys.exit(1)
+        sys.exit(127)
 
     if not os.access(log_file_path, os.R_OK):
         print(f"No read permission for '{log_file_path}'")
@@ -49,13 +51,18 @@ def clean_log_file(log_file_path, dry_run=False):
     temp_file_path = log_file_path + ".tmp"
     
     patterns = [
+        r"INFO\s*-\s*Inspecting\s*directory",
+        r"INFO\s*-\s*Finished\s*Inspecting",
         r"INFO\s*-\s*<File",
+        r"INFO\s*-\s*</File",
         r"INFO\s*-\s*<Attributes",
+        r"INFO\s*-\s*</Attributes",
         r"INFO\s*-\s*</Directory",
         r"INFO\s*-\s*<Directory",
-        r"INFO\s*-\s*</File",
-        r"INFO\s*-\s*Inspecting\s*directory",
-        r"INFO\s*-\s*Finished\s*Inspecting"
+        r"INFO\s*-\s*<Catalog",
+        r"INFO\s*-\s*</Catalog",
+        r"INFO\s*-\s*<Symlink",
+        r"INFO\s*-\s*</Symlink",
     ]
 
     try:
@@ -70,9 +77,9 @@ def clean_log_file(log_file_path, dry_run=False):
                         if dry_run:
                             print(f"Would remove: {original_line.strip()}")  # Print full line for dry-run
                         matched = True  # Mark that a pattern matched
-                        line = re.sub(pattern, "", line).strip()  # Remove only matched part
+                        break  # No need to check other patterns if one matches
 
-                if not dry_run and line:  # In normal mode, only write non-empty lines
+                if not dry_run and not matched:  # In normal mode, only write non-empty lines
                     outfile.write(line.rstrip() + "\n")
 
                 if dry_run and matched:

{dar_backup-0.6.18 → dar_backup-0.6.19}/src/dar_backup/cleanup.py

@@ -13,6 +13,7 @@ This script removes old DIFF and INCR archives + accompanying .par2 files accord
 [AGE] settings in the configuration file.
 """
 
+import argcomplete
 import argparse
 import logging
 import os
@@ -31,6 +32,7 @@ from dar_backup.util import list_backups
 from dar_backup.util import setup_logging
 from dar_backup.util import get_logger
 from dar_backup.util import requirements
+from dar_backup.util import backup_definition_completer, list_archive_completer
 
 from dar_backup.command_runner import CommandRunner   
 from dar_backup.command_runner import CommandResult
@@ -186,16 +188,19 @@ def main():
     global logger, runner
 
     parser = argparse.ArgumentParser(description="Cleanup old archives according to AGE configuration.")
-    parser.add_argument('-d', '--backup-definition', help="Specific backup definition to cleanup.")
+    parser.add_argument('-d', '--backup-definition', help="Specific backup definition to cleanup.").completer = backup_definition_completer
     parser.add_argument('-c', '--config-file', '-c', type=str, help="Path to 'dar-backup.conf'", default='~/.config/dar-backup/dar-backup.conf')
     parser.add_argument('-v', '--version', action='store_true', help="Show version information.")
     parser.add_argument('--alternate-archive-dir', type=str, help="Cleanup in this directory instead of the default one.")
-    parser.add_argument('--cleanup-specific-archives', type=str, help="Comma separated list of archives to cleanup") 
+    parser.add_argument('--cleanup-specific-archives', type=str, help="Comma separated list of archives to cleanup").completer = list_archive_completer 
     parser.add_argument('-l', '--list', action='store_true', help="List available archives.")
     parser.add_argument('--verbose', action='store_true', help="Print various status messages to screen")
     parser.add_argument('--log-level', type=str, help="`debug` or `trace`, default is `info`", default="info")
     parser.add_argument('--log-stdout', action='store_true', help='also print log messages to stdout')
     parser.add_argument('--test-mode', action='store_true', help='Read envvars in order to run some pytest cases')
+
+    argcomplete.autocomplete(parser)
+
     args = parser.parse_args()
 
     args.config_file = os.path.expanduser(os.path.expandvars(args.config_file))