dar-backup 0.6.20__py3-none-any.whl → 0.6.20.1__py3-none-any.whl

dar_backup/Changelog.md

@@ -1,6 +1,15 @@
 <!-- markdownlint-disable MD024 -->
 # dar-backup Changelog
 
+## v2-beta-0.6.20.1 - 2025-05-04
+
+Github link: [v2-beta-0.6.20.1](https://github.com/per2jensen/dar-backup/tree/v2-beta-0.6.20.1/v2)
+
+### Added
+
+- FIX: bash/zsh completers fixed to support MANAGER_DB_DIR config if set
+- `cleanup` and `manager` completer now sorts archives by \<backup-definition> and \<archive date> (so not using \<type>)
+
 ## v2-beta-0.6.20 - 2025-05-03
 
 Github link: [v2-beta-0.6.20](https://github.com/per2jensen/dar-backup/tree/v2-beta-0.6.20/v2)

dar_backup/__about__.py

@@ -1 +1 @@
-__version__ = "0.6.20"
+__version__ = "0.6.20.1"

dar_backup/manager.py

@@ -535,7 +535,6 @@ def main():
 
     args.config_file = os.path.expanduser(os.path.expandvars(args.config_file))
     config_settings = ConfigSettings(args.config_file)
-    print(f"Config settings: {config_settings}")
 
     if not os.path.dirname(config_settings.logfile_location):
         print(f"Directory for log file '{config_settings.logfile_location}' does not exist, exiting")

dar_backup/util.py

@@ -102,6 +102,24 @@ def get_logger(command_output_logger: bool = False) -> logging.Logger:
 
     return secondary_logger if command_output_logger else logger
 
+
+# Setup completer logger only once
+def _setup_completer_logger(logfile="/tmp/dar_backup_completer.log"):
+    logger = logging.getLogger("completer")
+    if not logger.handlers:
+        handler = logging.FileHandler(logfile)
+        formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
+        handler.setFormatter(formatter)
+        logger.addHandler(handler)
+        logger.setLevel(logging.DEBUG)
+    return logger
+
+# Singleton logger for completer debugging
+completer_logger = _setup_completer_logger()
+completer_logger.debug("Completer logger initialized.")
+
+
+
 def show_version():
     script_name = os.path.basename(sys.argv[0])
     print(f"{script_name} {about.__version__}")
@@ -346,6 +364,7 @@ def extract_backup_definition_fallback() -> str:
 
 
 
+
 def list_archive_completer(prefix, parsed_args, **kwargs):
     import os
     import configparser
@@ -369,12 +388,39 @@ def list_archive_completer(prefix, parsed_args, **kwargs):
     files = os.listdir(backup_dir)
     archive_re = re.compile(rf"^{re.escape(backup_def)}_.+_\d{{4}}-\d{{2}}-\d{{2}}\.1\.dar$") if backup_def else re.compile(r".+_\d{4}-\d{2}-\d{2}\.1\.dar$")
 
-    return [
+    completions = [
         f.rsplit(".1.dar", 1)[0]
         for f in files
         if archive_re.match(f)
     ]
 
+    completions = sorted(set(completions), key=sort_key)
+    return completions or ["[no matching archives]"]
+
+
+
+def sort_key(archive_name: str):
+    """
+    Sort by backup definition and then by date extracted from the archive name.
+    Handles formats like: <def>_<TYPE>_<YYYY-MM-DD>.<N>.dar
+    """
+    try:
+        base = archive_name.split('.')[0]  # remove .1.dar
+        parts = base.split('_')
+        if len(parts) < 3:
+            return (archive_name, datetime.min)  # fallback for non-matching formats
+
+        # Correct assumption: last two parts are TYPE and DATE
+        def_name = '_'.join(parts[:-2])  # everything before _TYPE_DATE
+        date_str = parts[-1]
+        date = datetime.strptime(date_str, "%Y-%m-%d")
+        completer_logger.debug(f"Archive: {archive_name}, Def: {def_name}, Date: {date}")
+        return (def_name, date)
+    except Exception:
+        return (archive_name, datetime.min)
+
+
+
 
 def archive_content_completer(prefix, parsed_args, **kwargs):
     """
@@ -392,14 +438,15 @@ def archive_content_completer(prefix, parsed_args, **kwargs):
     # Expand config path
     config_file = expand_path(getattr(parsed_args, "config_file", "~/.config/dar-backup/dar-backup.conf"))
     config = ConfigSettings(config_file=config_file)
-    backup_dir = config.backup_dir
+    #db_dir = expand_path((getattr(config, 'manager_db_dir', config.backup_dir)))   # use manager_db_dir if set, else backup_dir
+    db_dir = expand_path(getattr(config, 'manager_db_dir', None) or config.backup_dir)
 
     # Which db files to inspect?
     backup_def = getattr(parsed_args, "backup_def", None)
     db_files = (
-        [os.path.join(backup_dir, f"{backup_def}.db")]
+        [os.path.join( db_dir, f"{backup_def}.db")]
         if backup_def
-        else [os.path.join(backup_dir, f) for f in os.listdir(backup_dir) if f.endswith(".db")]
+        else [os.path.join( db_dir, f) for f in os.listdir( db_dir) if f.endswith(".db")]
     )
 
     completions = []
@@ -426,13 +473,6 @@ def archive_content_completer(prefix, parsed_args, **kwargs):
                 if archive.startswith(prefix):
                     completions.append(archive)
 
-    # Sort: first by name (before first '_'), then by date (YYYY-MM-DD)
-    def sort_key(archive):
-        name_part = archive.split("_")[0]
-        date_match = re.search(r"\d{4}-\d{2}-\d{2}", archive)
-        date = datetime.strptime(date_match.group(0), "%Y-%m-%d") if date_match else datetime.min
-        return (name_part, date)
-
     completions = sorted(set(completions), key=sort_key)
     return completions or ["[no matching archives]"]
 
@@ -452,6 +492,8 @@ def add_specific_archive_completer(prefix, parsed_args, **kwargs):
 
     config_file = expand_path(getattr(parsed_args, "config_file", "~/.config/dar-backup/dar-backup.conf"))
     config = ConfigSettings(config_file=config_file)
+    #db_dir = expand_path((getattr(config, 'manager_db_dir', config.backup_dir)))   # use manager_db_dir if set, else backup_dir
+    db_dir = expand_path(getattr(config, 'manager_db_dir') or config.backup_dir)
     backup_dir = config.backup_dir
     backup_def = getattr(parsed_args, "backup_def", None)
 
@@ -469,7 +511,7 @@ def add_specific_archive_completer(prefix, parsed_args, **kwargs):
                     all_archives.add(base)
 
     # Step 2: exclude ones already present in the .db
-    db_path = os.path.join(backup_dir, f"{backup_def}.db") if backup_def else None
+    db_path = os.path.join(db_dir, f"{backup_def}.db") if backup_def else None
     existing = set()
 
     if db_path and os.path.exists(db_path):

{dar_backup-0.6.20.dist-info → dar_backup-0.6.20.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dar-backup
-Version: 0.6.20
+Version: 0.6.20.1
 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

{dar_backup-0.6.20.dist-info → dar_backup-0.6.20.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 dar_backup/.darrc,sha256=-aerqivZmOsW_XBCh9IfbYTUvw0GkzDSr3Vx4GcNB1g,2113
-dar_backup/Changelog.md,sha256=hFz5NoZyezxgKza9i4VBv57aPnCuzhIQM9yK_2cxAZ8,9107
+dar_backup/Changelog.md,sha256=D993XIep6ECnK42XdH6ayE8RlXDJVCbpr-SeCqEFRH8,9448
 dar_backup/README.md,sha256=PcZQRaBw9i_GbRoA786OFKI0PwY87E7D30UzovWqEQQ,44902
-dar_backup/__about__.py,sha256=bhh1JgaMOqVsHTPoLk0PdjZxyDSXmYzOzEaRGXYuakc,22
+dar_backup/__about__.py,sha256=rQMac36Uw_nIjFumz9vuaDITRsJHLv1bbxAZYx-Ka4E,24
 dar_backup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dar_backup/clean_log.py,sha256=uQ_9HomK7RRkskXrgMPbAC84RgNlCFJ8RHL9KHeAMvc,5447
 dar_backup/cleanup.py,sha256=4IG736gdmvjurcQQ_DC-B5CoA3Ix9u5C3WfwmMmFIpc,12500
@@ -13,11 +13,11 @@ dar_backup/dar_backup_systemd.py,sha256=oehD_t9CFu0CsMgDWRH-Gt74Ynl1m29yqQEh5Kxv
 dar_backup/demo.py,sha256=fl2LHHWxuXRT814M_zuZh_YqqLk6nuNg9BI9HpLzdUU,4841
 dar_backup/exceptions.py,sha256=6fpHpnhkbtFcFZVDMqCsdESg-kQNCjF40EROGKeq8yU,113
 dar_backup/installer.py,sha256=gISJ3inz1uTjM5235gNtwjDUG-Fq6b3OZzMQuJl5eRg,2252
-dar_backup/manager.py,sha256=UyEcm9ydkok47slgSlpPEKP_mAdkvcwCghLCXdNlGpc,26622
+dar_backup/manager.py,sha256=JL-JX2C6RiDIj64Gw9pxNLUpxFqij1OBPp1BaUvV5sM,26573
 dar_backup/rich_progress.py,sha256=jTwM-4VlqHHzKqIfyXjL1pWEriobSJwCdN3YXzXzRdo,3105
-dar_backup/util.py,sha256=2Uwd1bf3N-AEzIvc69gvwEnGXNYNzZ-RqxUfbvmOUAc,20079
-dar_backup-0.6.20.dist-info/METADATA,sha256=dO6-9MvI9M_munyvCVFGNrq33NBbDDxn6UAIRLwVb5U,86624
-dar_backup-0.6.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dar_backup-0.6.20.dist-info/entry_points.txt,sha256=jFMqGdvGO8NeHrmcB0pxY7__PCSQAWRCFzsschMXsec,248
-dar_backup-0.6.20.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-dar_backup-0.6.20.dist-info/RECORD,,
+dar_backup/util.py,sha256=u_l6Hti6ZAHxaOqTZlSWBDspoKmkdoyzfZjhQgJqyOQ,21643
+dar_backup-0.6.20.1.dist-info/METADATA,sha256=bD9ou-yK2zva5xz8vPVd57xqkEsjN9OaNAWZeoxDajE,86626
+dar_backup-0.6.20.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dar_backup-0.6.20.1.dist-info/entry_points.txt,sha256=jFMqGdvGO8NeHrmcB0pxY7__PCSQAWRCFzsschMXsec,248
+dar_backup-0.6.20.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+dar_backup-0.6.20.1.dist-info/RECORD,,