dar-backup 0.6.12__py3-none-any.whl → 0.6.13.1__py3-none-any.whl

dar_backup/__about__.py

@@ -1 +1 @@
-__version__ = "0.6.12"
+__version__ = "0.6.13.1"

dar_backup/cleanup.py

@@ -181,7 +181,11 @@ def main():
     config_settings = ConfigSettings(args.config_file)
 
     start_time=int(time())
-    logger = setup_logging(config_settings.logfile_location, args.log_level, args.log_stdout)
+
+#    command_output_log = os.path.join(config_settings.logfile_location.removesuffix("dar-backup.log"), "dar-backup-commands.log")
+    command_output_log = config_settings.logfile_location.replace("dar-backup.log", "dar-backup-commands.log")
+    logger = setup_logging(config_settings.logfile_location, command_output_log, args.log_level, args.log_stdout)
+
 
     logger.info(f"=====================================")
     logger.info(f"cleanup.py started, version: {about.__version__}")

dar_backup/dar_backup.py

@@ -7,9 +7,10 @@ import os
 import random
 import re
 import shlex
+import shutil
 import subprocess
 import xml.etree.ElementTree as ET
-
+import tempfile
 
 from argparse import ArgumentParser
 from datetime import datetime
@@ -30,6 +31,7 @@ from dar_backup.util import BackupError
 from dar_backup.util import RestoreError
 
 
+RESULT = True
 logger = None
 
 def generic_backup(type: str, command: List[str], backup_file: str, backup_definition: str, darrc: str,  config_settings: ConfigSettings, args: argparse.Namespace):
@@ -99,12 +101,12 @@ def find_files_with_paths(xml_root: ET.Element):
     current_path = []
 
     for elem in xml_root.iter():
-        if elem.tag == "directory":
+        if elem.tag == "Directory":
             current_path.append(elem.get('name'))
-        elif elem.tag == "file":
+        elif elem.tag == "File":
             file_path = ("/".join(current_path + [elem.get('name')]), elem.get('size'))
             files.append(file_path)
-        elif elem.tag == "directory" and elem.get('name') in current_path:
+        elif elem.tag == "Directory" and elem.get('Name') in current_path:
             current_path.pop()
 
     return files
@@ -192,10 +194,10 @@ def verify(args: argparse.Namespace, backup_file: str, backup_definition: str, c
         logger.info(f"No files between {config_settings.min_size_verification_mb}MB and {config_settings.max_size_verification_mb}MB for verification, skipping")
         return result
 
+    # find Root path in backup definition
     with open(backup_definition, 'r') as f:
         backup_definition_content = f.readlines()
         logger.debug(f"Backup definition: '{backup_definition}', content:\n{backup_definition_content}")
-    # Initialize a variable to hold the path after "-R"
     root_path = None
     for line in backup_definition_content:
         line = line.strip()
@@ -203,7 +205,10 @@ def verify(args: argparse.Namespace, backup_file: str, backup_definition: str, c
             root_path = line.split("-R", 1)[1].strip()
             break
     if root_path is None:
-        logger.warning("No Root (-R) path specified in the backup definition file.")
+        msg = f"No Root (-R) path found in the backup definition file: '{backup_definition}', restore verification skipped"
+        raise BackupError(msg)
+
+
 
     no_files_verification = config_settings.no_files_verification
     if len(files) < config_settings.no_files_verification:
@@ -438,9 +443,10 @@ def perform_backup(args: argparse.Namespace, config_settings: ConfigSettings, ba
             logger.info("Generate par2 redundancy files.")
             generate_par2_files(backup_file, config_settings, args)
             logger.info("par2 files completed successfully.")
-            
 
         except Exception as e:
+            global RESULT
+            RESULT = False
             logger.exception(f"Error during {backup_type} backup process, continuing to next backup definition.")
 
 
@@ -494,6 +500,44 @@ def generate_par2_files(backup_file: str, config_settings: ConfigSettings, args)
 
 
 
+def filter_darrc_file(darrc_path):
+    """
+    Filters the .darrc file to remove lines containing the options: -vt, -vs, -vd, -vf, and -va.
+    The filtered version is stored in a uniquely named file in the home directory of the user running the script.
+    The file permissions are set to 440.
+    
+    :param darrc_path: Path to the original .darrc file.
+    :return: Path to the filtered .darrc file.
+    """
+    # Define options to filter out
+    options_to_remove = {"-vt", "-vs", "-vd", "-vf", "-va"}
+
+    # Get the user's home directory
+    home_dir = os.path.expanduser("~")
+
+    # Create a unique file name in the home directory
+    filtered_darrc_path = os.path.join(home_dir, f"filtered_darrc_{next(tempfile._get_candidate_names())}.darrc")
+
+    try:
+        with open(darrc_path, "r") as infile, open(filtered_darrc_path, "w") as outfile:
+            for line in infile:
+                # Check if any unwanted option is in the line
+                if not any(option in line for option in options_to_remove):
+                    outfile.write(line)
+        
+        # Set file permissions to 440 (read-only for owner and group, no permissions for others)
+        os.chmod(filtered_darrc_path, 0o440)
+
+        return filtered_darrc_path
+
+    except Exception as e:
+        # If anything goes wrong, clean up the temp file if it was created
+        if os.path.exists(filtered_darrc_path):
+            os.remove(filtered_darrc_path)
+        raise RuntimeError(f"Error filtering .darrc file: {e}")
+
+
+
 def show_version():
     script_name = os.path.basename(argv[0])
     print(f"{script_name} {about.__version__}") 
@@ -580,14 +624,14 @@ def requirements(type: str, config_setting: ConfigSettings):
 
 
 def main():
-    global logger 
+    global logger, RESULT 
 
     MIN_PYTHON_VERSION = (3, 9)
     if version_info < MIN_PYTHON_VERSION:
         stderr.write(f"Error: This script requires Python {'.'.join(map(str, MIN_PYTHON_VERSION))} or higher.\n")
         exit(1)
 
-    parser = argparse.ArgumentParser(description="Backup and verify using dar backup definitions.")
+    parser = argparse.ArgumentParser(description="Backup, verify & redundancy using dar and par2.")
     parser.add_argument('-F', '--full-backup', action='store_true', help="Perform a full backup.")
     parser.add_argument('-D', '--differential-backup', action='store_true', help="Perform differential backup.")
     parser.add_argument('-I', '--incremental-backup', action='store_true', help="Perform incremental backup.")
@@ -603,6 +647,7 @@ def main():
     parser.add_argument('-r', '--restore', type=str, help="Restore specified archive.")
     parser.add_argument('--restore-dir',   type=str, help="Directory to restore files to.")
     parser.add_argument('--verbose', action='store_true', help="Print various status messages to screen")
+    parser.add_argument('--suppress-dar-msg', action='store_true', help="cancel dar options in .darrc: -vt, -vs, -vd, -vf and -va")
     parser.add_argument('--log-level', type=str, help="`debug` or `trace`", default="info")
     parser.add_argument('--log-stdout', action='store_true', help='also print log messages to stdout')
     parser.add_argument('--do-not-compare', action='store_true', help="do not compare restores to file system")
@@ -628,23 +673,29 @@ def main():
     args.config_file = config_settings_path
     config_settings = ConfigSettings(args.config_file)
 
+    command_output_log = config_settings.logfile_location.replace("dar-backup.log", "dar-backup-commands.log")
+    if command_output_log == config_settings.logfile_location:
+        print(f"Error: logfile_location in {args.config_file} does not end at 'dar-backup.log', exiting", file=stderr)
 
-    logger = setup_logging(config_settings.logfile_location, args.log_level, args.log_stdout)
-
-    if not args.darrc:
-        current_script_dir = os.path.dirname(os.path.abspath(__file__))
-        args.darrc = os.path.join(current_script_dir, ".darrc")
+    logger = setup_logging(config_settings.logfile_location, command_output_log, args.log_level, args.log_stdout)
 
-    darrc_file = os.path.expanduser(os.path.expandvars(args.darrc))
-    if os.path.exists(darrc_file) and os.path.isfile(darrc_file):
-        logger.debug(f"Using .darrc: {args.darrc}")                
-    else:
-        logger.error(f"Supplied .darrc: '{args.darrc}' does not exist or is not a file, exiting", file=stderr)
-        exit(127)
+    try:
+        if not args.darrc:
+            current_script_dir = os.path.dirname(os.path.abspath(__file__))
+            args.darrc = os.path.join(current_script_dir, ".darrc")
 
+        darrc_file = os.path.expanduser(os.path.expandvars(args.darrc))
+        if os.path.exists(darrc_file) and os.path.isfile(darrc_file):
+            logger.debug(f"Using .darrc: {args.darrc}")                
+        else:
+            logger.error(f"Supplied .darrc: '{args.darrc}' does not exist or is not a file, exiting", file=stderr)
+            exit(127)
 
+        if args.suppress_dar_msg:
+            logger.info("Suppressing dar messages: -vt, -vs, -vd, -vf and -va")
+            args.darrc = filter_darrc_file(args.darrc)
+            logger.debug(f"Filtered .darrc file saved at: {args.darrc}")
 
-    try:
         start_time=int(time())
         logger.info(f"=====================================")
         logger.info(f"dar-backup.py started, version: {about.__version__}")
@@ -672,7 +723,6 @@ def main():
         args.verbose and (print(f"PAR2 enabled:      {config_settings.par2_enabled}"))
         args.verbose and (print(f"--do-not-compare:  {args.do_not_compare}"))
 
-
         # sanity check
         if args.backup_definition and not os.path.exists(os.path.join(config_settings.backup_d_dir, args.backup_definition)):
             logger.error(f"Backup definition: '{args.backup_definition}' does not exist, exiting")
@@ -702,19 +752,24 @@ def main():
 
         requirements('POSTREQ', config_settings)
 
-        args.verbose and print("\033[1m\033[32mSUCCESS\033[0m No errors encountered")
-        exit(0)
     except Exception as e:
         logger.exception("An error occurred")
         logger.error("Exception details:", exc_info=True)
         args.verbose and print("\033[1m\033[31mErrors\033[0m encountered")
-        exit(1) 
+        RESULT = False
     finally:
         end_time=int(time())
         logger.info(f"END TIME: {end_time}")
-
-#    error_lines = extract_error_lines(config_settings.logfile_location, start_time, end_time)
+        # Clean up
+        if args.suppress_dar_msg and os.path.exists(args.darrc) and os.path.dirname(args.darrc) == os.path.expanduser("~"):
+            if args.darrc.startswith("filtered_darrc_"):
+                os.remove(args.darrc)
+                logger.info(f"Removed filtered .darrc: {args.darrc}")
 
 
+    if RESULT:
+        exit(0)
+    else:
+        exit(1)
 if __name__ == "__main__":
     main()

dar_backup/installer.py

@@ -73,13 +73,6 @@ def main():
         help="Deploy a simple config file, use ~/dar-backup/ for log file, archives and restore tests."
     )
 
-    parser.add_argument(
-        "--dry-run",
-        action="store_true",
-        help="Show which lines would be removed without modifying the file."
-    )
-
-
     parser.add_argument(
         "-v", "--version",
         action="version",

dar_backup/manager.py

@@ -335,7 +335,7 @@ def remove_specific_archive(archive: str, config_settings: ConfigSettings) -> in
     """
     backup_def = backup_def_from_archive(archive)
     database_path = os.path.join(config_settings.backup_dir, f"{backup_def}{DB_SUFFIX}")
-    cat_no = cat_no_for_name(archive, config_settings)
+    cat_no:int = cat_no_for_name(archive, config_settings)
     if cat_no >= 0:
         command = ['dar_manager', '--base', database_path, "--delete", str(cat_no)]
         process: CommandResult = run_command(command)
@@ -400,7 +400,11 @@ See section 15 and section 16 in the supplied "LICENSE" file.''')
     if not os.path.dirname(config_settings.logfile_location):
         print(f"Directory for log file '{config_settings.logfile_location}' does not exist, exiting")
         sys.exit(1) 
-    logger = setup_logging(config_settings.logfile_location, args.log_level, args.log_stdout)
+
+#    command_output_log = os.path.join(config_settings.logfile_location.removesuffix("dar-backup.log"), "dar-backup-commands.log")
+    command_output_log = config_settings.logfile_location.replace("dar-backup.log", "dar-backup-commands.log")
+    logger = setup_logging(config_settings.logfile_location, command_output_log, args.log_level, args.log_stdout)
+
 
     start_time=int(time())
     logger.info(f"=====================================")

dar_backup/util.py

@@ -23,115 +23,98 @@ from datetime import datetime
 from typing import NamedTuple, List
 
 logger=None
+secondary_logger=None   
 
-class BackupError(Exception):
-    """Exception raised for errors in the backup process."""
-    pass
-
-class DifferentialBackupError(BackupError):
-    """Exception raised for errors in the differential backup process."""
-    pass
-
-class IncrementalBackupError(BackupError):
-    """Exception raised for errors in the incremental backup process."""
-    pass
-
-class RestoreError(Exception):
-    """Exception raised for errors in the restore process."""
-    pass
 
+def setup_logging(log_file: str, command_output_log_file: str, log_level: str = "info", log_to_stdout: bool = False) -> logging.Logger:
+    """
+    Sets up logging for the main program and a separate secondary logfile for command outputs.
 
+    Args:
+        log_file (str): The path to the main log file.
+        command_output_log_file (str): The path to the secondary log file for command outputs.
+        log_level (str): The log level to use. Can be "info", "debug", or "trace". Defaults to "info".
+        log_to_stdout (bool): If True, log messages will be printed to the console. Defaults to False.
 
+    Returns:
+        None
 
-def setup_logging(log_file: str, log_level: str, log_to_stdout: bool=False, logger_name: str=__name__) -> logging.Logger:
+    Raises:
+        Exception: If an error occurs during logging initialization
     """
-    log_level can be set to "debug" or "trace" for more verbose logging.
-    """    
-    global logger
+    global logger, secondary_logger
     try:
         TRACE_LEVEL_NUM = 5
         logging.addLevelName(TRACE_LEVEL_NUM, "TRACE")
 
         def trace(self, message, *args, **kws):
             if self.isEnabledFor(TRACE_LEVEL_NUM):
-                self.log(TRACE_LEVEL_NUM, message, args, **kws)
+                self.log(TRACE_LEVEL_NUM, message, *args, **kws)
 
         logging.Logger.trace = trace
 
-        # Create a custom logger
-        logger = logging.getLogger(__name__)
-
-        level_used = logging.INFO
-        logger.setLevel(logging.INFO)
-        if log_level == "debug":
-            level_used = logging.DEBUG
-            logger.setLevel(logging.DEBUG)
-        elif log_level == "trace":
-            level_used = TRACE_LEVEL_NUM
-            logger.setLevel(TRACE_LEVEL_NUM)
-
-        formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')  
-
+        # Setup main logger
+        logger = logging.getLogger("main_logger")
+        logger.setLevel(logging.DEBUG if log_level == "debug" else TRACE_LEVEL_NUM if log_level == "trace" else logging.INFO)
+        formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
         file_handler = logging.FileHandler(log_file)
-        file_handler.setLevel(level_used)
         file_handler.setFormatter(formatter)
         logger.addHandler(file_handler)
 
+        # Setup secondary logger for command outputs
+        secondary_logger = logging.getLogger("command_output_logger")
+        secondary_logger.setLevel(logging.DEBUG if log_level == "debug" else TRACE_LEVEL_NUM if log_level == "trace" else logging.INFO)
+        sec_file_handler = logging.FileHandler(command_output_log_file)
+        sec_file_handler.setFormatter(formatter)
+        secondary_logger.addHandler(sec_file_handler)
+
         if log_to_stdout:
             stdout_handler = logging.StreamHandler(sys.stdout)
-            stdout_handler.setLevel(level_used)
             stdout_handler.setFormatter(formatter)
             logger.addHandler(stdout_handler)
+            secondary_logger.addHandler(stdout_handler)
 
+        return logger
     except Exception as e:
-        print("logging not initialized, exiting.")
+        print("Logging initialization failed.")
         traceback.print_exc()
         sys.exit(1)
 
-    return logger
 
 
-class CommandResult(NamedTuple):
+def get_logger(command_output_logger: bool = False) -> logging.Logger:
     """
-    The reult of the run_command() function.
+    Returns a logger
+
+    Args:
+        use_secondary (bool): If True, returns the secondary logger. Defaults to False.
+
+    Returns:
+      logger to dar-backup.log or the logger for command output.
     """
-    process: subprocess.CompletedProcess
-    stdout: str
-    stderr: str
-    returncode: int
-    timeout: int
-    command: list[str]
+    global logger, secondary_logger
 
-    def __str__(self):
-        #return f"CommandResult: [Return Code: '{self.returncode}', \nCommand: '{' '.join(map(shlex.quote, self.command))}', \nStdout:\n'{self.stdout}', \nStderr:\n'{self.stderr}', \nTimeout: '{self.timeout}']"
-        return f"CommandResult: [Return Code: '{self.returncode}', \nCommand: '{' '.join(map(shlex.quote, self.command))}']"
+    return secondary_logger if command_output_logger else logger
 
 
 
-def  _stream_reader(pipe, log_func, output_accumulator: List[str]):
+def _stream_reader(pipe, log_funcs, output_accumulator: List[str]):
     """
-    Reads lines from the subprocess pipe, logs them, and accumulates them.
-
-    Args:
-        pipe: The pipe to read from (stdout or stderr).
-        log_func: The logging function to use (e.g., logger.info, logger.error).
-        output_accumulator: A list to store the lines read from the pipe.
+    Reads lines from the subprocess pipe and logs them to multiple destinations.
     """
     with pipe:
         for line in iter(pipe.readline, ''):
             stripped_line = line.strip()
-            output_accumulator.append(stripped_line)  # Accumulate the output
-            log_func(stripped_line)  # Log the output in real time
+            output_accumulator.append(stripped_line)
+            for log_func in log_funcs:
+                log_func(stripped_line)  # Log the output in real-time
 
 
 
-def run_command(command: List[str], timeout: int = 30) -> CommandResult:
+def run_command(command: List[str], timeout: int = 30, no_output_log: bool = False):
     """
-    Executes a given command via subprocess, logs its output in real time, and returns the result.
+    Executes a command and streams output only to the secondary log unless no_log is set to True.
 
-    Args:
-        command (list): The command to be executed, represented as a list of strings.
-        timeout (int): The maximum time in seconds to wait for the command to complete. Defaults to 30 seconds.
 
     Returns:
         A CommandResult NamedTuple with the following properties:
@@ -143,41 +126,39 @@ def run_command(command: List[str], timeout: int = 30) -> CommandResult:
         - command: list[str]: The command executed.
 
     Logs:
-        - Logs standard output (`stdout`) in real-time at the INFO log level.
-        - Logs standard error (`stderr`) in real-time at the ERROR log level.
-
+        - Logs standard output (`stdout`) and standard error in real-time to the
+          logger.secondary_log (that contains the command output).  
+    
     Raises:
         subprocess.TimeoutExpired: If the command execution times out (see `timeout` parameter).
         Exception: If other exceptions occur during command execution.
         FileNotFoundError: If the command is not found.
-
-    Notes:
-        - While the command runs, its `stdout` and `stderr` streams are logged in real-time.
-        - The returned `stdout` and `stderr` capture the complete output, even though the output is also logged.
-        - The command is forcibly terminated if it exceeds the specified timeout.
     """
-    stdout_lines = []  # To accumulate stdout
-    stderr_lines = []  # To accumulate stderr
-    process = None  # Track the process for cleanup
-    stdout_thread = None
-    stderr_thread = None
+    stdout_lines, stderr_lines = [], []
+    process = None
+    stdout_thread, stderr_thread = None, None
 
     try:
-        # Check if the command exists before executing
+        logger =         get_logger(command_output_logger=False)
+        command_logger = get_logger(command_output_logger=True)
+
         if not shutil.which(command[0]):
             raise FileNotFoundError(f"Command not found: {command[0]}")
-
+   
         logger.debug(f"Running command: {command}")
+        command_logger.info(f"Running command: {command}")
+
         process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
 
-        # Start threads to read and log stdout and stderr
-        stdout_thread = threading.Thread(target=_stream_reader, args=(process.stdout, logger.info, stdout_lines))
-        stderr_thread = threading.Thread(target=_stream_reader, args=(process.stderr, logger.error, stderr_lines))
+        log_funcs = [command_logger.info] if not no_output_log else []
+        err_log_funcs = [command_logger.error] if not no_output_log else []
+
+        stdout_thread = threading.Thread(target=_stream_reader, args=(process.stdout, log_funcs,     stdout_lines))
+        stderr_thread = threading.Thread(target=_stream_reader, args=(process.stderr, err_log_funcs, stderr_lines))
         
         stdout_thread.start()
         stderr_thread.start()
 
-        # Wait for process to complete or timeout
         process.wait(timeout=timeout)
 
     except FileNotFoundError as e:
@@ -199,132 +180,60 @@ def run_command(command: List[str], timeout: int = 30) -> CommandResult:
         logger.error(f"Error running command: {command}", exc_info=True)
         raise
     finally:
-        # Ensure threads are joined to clean up (only if they were started)
         if stdout_thread and stdout_thread.is_alive():
             stdout_thread.join()
         if stderr_thread and stderr_thread.is_alive():
             stderr_thread.join()
+        if process:
+            if process.stdout:
+                process.stdout.close()
+            if process.stderr:
+                process.stderr.close()
 
-        # Ensure process streams are closed
-        if process and process.stdout:
-            process.stdout.close()
-        if process and process.stderr:
-            process.stderr.close()
-
+    
     # Combine captured stdout and stderr lines into single strings
     stdout = "\n".join(stdout_lines)
     stderr = "\n".join(stderr_lines)
 
-    # Build the result object
-    result = CommandResult(
-        process=process,
-        stdout=stdout,
-        stderr=stderr,
-        returncode=process.returncode,
-        timeout=timeout,
-        command=command
-    )
-    logger.debug(f"Command result: {result}")
+    #Build the result object
+    result = CommandResult(process=process, stdout=stdout, stderr=stderr, returncode=process.returncode, timeout=timeout, command=command)
     return result
 
-def run_command2(command: List[str], timeout: int = 30) -> CommandResult:
-    """
-    Executes a given command via subprocess, logs its output in real time, and returns the result.
-
-    Args:
-        command (list): The command to be executed, represented as a list of strings.
-        timeout (int): The maximum time in seconds to wait for the command to complete. Defaults to 30 seconds.
-
-    Returns:
-        A CommandResult NamedTuple with the following properties:
-        - process: subprocess.CompletedProcess
-        - stdout: str: The full standard output of the command.
-        - stderr: str: The full standard error of the command.
-        - returncode: int: The return code of the command.
-        - timeout: int: The timeout value in seconds used to run the command.
-        - command: list[str]: The command executed.
-
-    Logs:
-        - Logs standard output (`stdout`) in real-time at the INFO log level.
-        - Logs standard error (`stderr`) in real-time at the ERROR log level.
 
-    Raises:
-        subprocess.TimeoutExpired: If the command execution times out (see `timeout` parameter).
-        Exception: If other exceptions occur during command execution.
+class BackupError(Exception):
+    """Exception raised for errors in the backup process."""
+    pass
 
-    Notes:
-        - While the command runs, its `stdout` and `stderr` streams are logged in real-time.
-        - The returned `stdout` and `stderr` capture the complete output, even though the output is also logged.
-        - The command is forcibly terminated if it exceeds the specified timeout.
-    """
-    stdout_lines = []  # To accumulate stdout
-    stderr_lines = []  # To accumulate stderr
-    process = None  # Track the process for cleanup
+class DifferentialBackupError(BackupError):
+    """Exception raised for errors in the differential backup process."""
+    pass
 
-    try:
-        # Check if the command exists before executing
-        if not shutil.which(command[0]):
-            raise FileNotFoundError(f"Command not found: {command[0]}")
+class IncrementalBackupError(BackupError):
+    """Exception raised for errors in the incremental backup process."""
+    pass
 
-        logger.debug(f"Running command: {command}")
-        process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+class RestoreError(Exception):
+    """Exception raised for errors in the restore process."""
+    pass
 
-        # Start threads to read and log stdout and stderr
-        stdout_thread = threading.Thread(target=_stream_reader, args=(process.stdout, logger.info, stdout_lines))
-        stderr_thread = threading.Thread(target=_stream_reader, args=(process.stderr, logger.error, stderr_lines))
-        
-        stdout_thread.start()
-        stderr_thread.start()
 
-        # Wait for process to complete or timeout
-        process.wait(timeout=timeout)
 
-    except FileNotFoundError as e:
-        logger.error(f"Command not found: {command[0]}")
-        return CommandResult(
-            process=None,
-            stdout="",
-            stderr=str(e),
-            returncode=127,
-            timeout=timeout,
-            command=command
-        )
-    except subprocess.TimeoutExpired:
-        if process:
-            process.terminate()
-        logger.error(f"Command: '{command}' timed out and was terminated.")
-        raise
-    except Exception as e:
-        logger.error(f"Error running command: {command}", exc_info=True)
-        raise
-    finally:
-        # Ensure threads are joined to clean up
-        if stdout_thread.is_alive():
-            stdout_thread.join()
-        if stderr_thread.is_alive():
-            stderr_thread.join()
+class CommandResult(NamedTuple):
+    """
+    The reult of the run_command() function.
+    """
+    process: subprocess.CompletedProcess
+    stdout: str
+    stderr: str
+    returncode: int
+    timeout: int
+    command: list[str]
 
-        # Ensure process streams are closed
-        if process and process.stdout:
-            process.stdout.close()
-        if process and process.stderr:
-            process.stderr.close()
+    def __str__(self):
+        #return f"CommandResult: [Return Code: '{self.returncode}', \nCommand: '{' '.join(map(shlex.quote, self.command))}', \nStdout:\n'{self.stdout}', \nStderr:\n'{self.stderr}', \nTimeout: '{self.timeout}']"
+        return f"CommandResult: [Return Code: '{self.returncode}', \nCommand: '{' '.join(map(shlex.quote, self.command))}']"
 
-    # Combine captured stdout and stderr lines into single strings
-    stdout = "\n".join(stdout_lines)
-    stderr = "\n".join(stderr_lines)
 
-    # Build the result object
-    result = CommandResult(
-        process=process,
-        stdout=stdout,
-        stderr=stderr,
-        returncode=process.returncode,
-        timeout=timeout,
-        command=command
-    )
-    logger.debug(f"Command result: {result}")
-    return result
 
 
 def extract_error_lines(log_file_path: str, start_time: str, end_time: str):

{dar_backup-0.6.12.dist-info → dar_backup-0.6.13.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dar-backup
-Version: 0.6.12
+Version: 0.6.13.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: Homepage, https://github.com/per2jensen/dar-backup/tree/main/v2
 Project-URL: Changelog, https://github.com/per2jensen/dar-backup/blob/main/v2/Changelog.md
@@ -692,8 +692,10 @@ Description-Content-Type: text/markdown
 
 # Full, differential or incremental backups using 'dar'
 
-  The wonderful 'dar' [Disk Archiver](https://github.com/Edrusb/DAR) is used for
-  the heavy lifting, together with the par2 suite in these scripts.
+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`.
 
 ## Table of Contents
 
@@ -736,17 +738,20 @@ Description-Content-Type: text/markdown
   - [dar manager databases](#dar-manager-databases)
   - [Performance tip due to par2](#performance-tip-due-to-par2)
   - [.darrc sets -vd -vf (since v0.6.4)](#darrc-sets--vd--vf-since-v064)
+  - [Separate log file for command output](#separate-log-file-for-command-output)
+- [Todo](#todo)
 - [Reference](#reference)
-  - [dar-backup.py](#dar-backuppy)
-  - [manager.py](#managerpy)
-  - [cleanup.py](#cleanuppy)
-  - [clean-log.py](#clean-logpy)
-
+  - [dar-backup](#dar-backup)
+  - [manager](#manager)
+  - [cleanup](#cleanup)
+  - [clean-log](#clean-log)
+  - [installer](#installer)
+  
 ## My use case
 
 I have cloud storage mounted on a directory within my home dir. The filesystem is [FUSE based](https://www.kernel.org/doc/html/latest/filesystems/fuse.html), which gives it a few special features
 
-- a non-privileged user (me :-)) can perform a mount
+- a non-privileged user can perform a mount
 - a privileged user cannot look into the filesystem --> a backup script running as root is not suitable
 
  I needed the following:
@@ -763,7 +768,7 @@ I have cloud storage mounted on a directory within my home dir. The filesystem i
 ## License
 
   These scripts are licensed under the GPLv3 license.
-  Read more here: https://www.gnu.org/licenses/gpl-3.0.en.html, or have a look at the ["LICENSE"](https://github.com/per2jensen/dar-backup/blob/main/LICENSE) file in this repository.
+  Read more here: [GNU CPL 3.0](https://www.gnu.org/licenses/gpl-3.0.en.html), or have a look at the ["LICENSE"](https://github.com/per2jensen/dar-backup/blob/main/LICENSE) file in this repository.
 
 ## Status
 
@@ -777,7 +782,7 @@ Version 0.6.0 and forwards requires the config variable *COMMAND_TIMEOUT_SECS* i
 
 ## Homepage - Github
 
-This 'dar-backup' package lives at: https://github.com/per2jensen/dar-backup/tree/main/v2
+This 'dar-backup' package lives at: [Github - dar-backup](https://github.com/per2jensen/dar-backup/tree/main/v2)
 
 This python version is v2 of dar-backup, the first is made in bash.
 
@@ -785,7 +790,7 @@ This python version is v2 of dar-backup, the first is made in bash.
 
 - dar
 - par2
-- python3 :-)
+- python3
 
 On Ubuntu, install the requirements this way:
 
@@ -852,7 +857,7 @@ The output is
 Directories created: `/home/user/dar-backup/` and `/home/user/.config/dar-backup`
 Config file deployed to /home/user/.config/dar-backup/dar-backup.conf
 Default backup definition deployed to /home/user/.config/dar-backup/backup.d/default
-1. Now run `manager --create` to create the catalog database.
+1. Now run `manager --create-db` to create the catalog database.
 2. Then you can run `dar-backup --full-backup` to create a backup.
 3. List backups with `dar-backup --list`
 4. List contents of a backup with `dar-backup --list-contents <backup-name>`
@@ -865,7 +870,7 @@ Generate the archive catalog database(s).
 `dar-backup` expects the catalog databases to be in place, it does not automatically create them (by design)
 
 ```` bash
-manager --create
+manager --create-db
 ````
 
 ### 4 - do FULL backups
@@ -1091,14 +1096,14 @@ gives
 ``` code
 [Data ][D][ EA  ][FSA][Compr][S]| Permission | User  | Group | Size    |          Date                 |    filename
 --------------------------------+------------+-------+-------+---------+-------------------------------+------------
-[Saved][-]       [-L-][   0%][ ]  drwxr-xr-x   root	root	113 Mio	Sat May 11 16:16:48 2024	home
-[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj	pj	113 Mio	Sun Jun 23 10:46:30 2024	home/pj
-[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj	pj	113 Mio	Sun Jun 23 09:17:42 2024	home/pj/tmp
-[Saved][-]       [-L-][   1%][ ]  drwxrwxr-x   pj	pj	50 Mio	Wed Jun 19 20:52:13 2024	home/pj/tmp/LUT-play
-[Saved][ ]       [-L-][   0%][X]  -rw-rw-r--   pj	pj	49 Mio	Sun Jun 16 12:52:22 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15.NEF
+[Saved][-]       [-L-][   0%][ ]  drwxr-xr-x   root   root    113 Mio   Sat May 11 16:16:48 2024        home
+[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj     pj      113 Mio   Sun Jun 23 10:46:30 2024        home/pj
+[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj     pj      113 Mio   Sun Jun 23 09:17:42 2024        home/pj/tmp
+[Saved][-]       [-L-][   1%][ ]  drwxrwxr-x   pj     pj      50 Mio    Wed Jun 19 20:52:13 2024        home/pj/tmp/LUT-play
+[Saved][ ]       [-L-][   0%][X]  -rw-rw-r--   pj     pj      49 Mio    Sun Jun 16 12:52:22 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15.NEF
 ```
 
-## dar file selection exmaples
+## dar file selection examples
 
 ### select a directory
 
@@ -1111,33 +1116,33 @@ gives
 ```` code
 [Data ][D][ EA  ][FSA][Compr][S]| Permission | User  | Group | Size    |          Date                 |    filename
 --------------------------------+------------+-------+-------+---------+-------------------------------+------------
-[Saved][-]       [-L-][   0%][ ]  drwxr-xr-x   root	root	113 Mio	Sat May 11 16:16:48 2024	home
-[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj	pj	113 Mio	Sun Jun 23 10:46:30 2024	home/pj
-[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj	pj	113 Mio	Sun Jun 23 09:17:42 2024	home/pj/tmp
-[Saved][-]       [-L-][   1%][ ]  drwxrwxr-x   pj	pj	50 Mio	Wed Jun 19 20:52:13 2024	home/pj/tmp/LUT-play
-[Saved][ ]       [-L-][   0%][X]  -rw-rw-r--   pj	pj	49 Mio	Sun Jun 16 12:52:22 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15.NEF
-[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj	pj	48 kio	Sat Jun 22 21:51:24 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15.NEF.xmp
-[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj	pj	50 kio	Sat Jun 22 21:51:25 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_01.NEF.xmp
-[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj	pj	51 kio	Sat Jun 22 21:51:26 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_02.NEF.xmp
-[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj	pj	51 kio	Sat Jun 22 21:51:27 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_03.NEF.xmp
-[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj	pj	51 kio	Sat Jun 22 21:51:27 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_04.NEF.xmp
-[Saved][ ]       [-L-][  97%][ ]  -rw-rw-r--   pj	pj	77 kio	Sat Jun 22 21:50:16 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_05.NEF.xmp
-[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj	pj	52 kio	Sat Jun 22 21:49:37 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_06.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:50:47 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_07.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:51:12 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_08.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:51:12 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_09.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:50:39 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_10.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:50:36 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_11.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:50:35 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_12.NEF.xmp
-[Saved][ ]       [-L-][  88%][ ]  -rw-rw-r--   pj	pj	15 kio	Sat Jun 22 21:51:11 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_13.NEF.xmp
-[Saved][ ]       [-L-][  96%][ ]  -rw-rw-r--   pj	pj	84 kio	Sat Jun 22 21:51:09 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_14.NEF.xmp
-[Saved][ ]       [-L-][  96%][ ]  -rw-rw-r--   pj	pj	90 kio	Sat Jun 22 21:51:04 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_15.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:51:15 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_16.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:50:48 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_17.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:50:19 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_18.NEF.xmp
+[Saved][-]       [-L-][   0%][ ]  drwxr-xr-x   root   root    113 Mio   Sat May 11 16:16:48 2024        home
+[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj     pj      113 Mio   Sun Jun 23 10:46:30 2024        home/pj
+[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj     pj      113 Mio   Sun Jun 23 09:17:42 2024        home/pj/tmp
+[Saved][-]       [-L-][   1%][ ]  drwxrwxr-x   pj     pj      50 Mio    Wed Jun 19 20:52:13 2024        home/pj/tmp/LUT-play
+[Saved][ ]       [-L-][   0%][X]  -rw-rw-r--   pj     pj      49 Mio    Sun Jun 16 12:52:22 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15.NEF
+[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj     pj      48 kio    Sat Jun 22 21:51:24 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15.NEF.xmp
+[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj     pj      50 kio    Sat Jun 22 21:51:25 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_01.NEF.xmp
+[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj     pj      51 kio    Sat Jun 22 21:51:26 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_02.NEF.xmp
+[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj     pj      51 kio    Sat Jun 22 21:51:27 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_03.NEF.xmp
+[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj     pj      51 kio    Sat Jun 22 21:51:27 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_04.NEF.xmp
+[Saved][ ]       [-L-][  97%][ ]  -rw-rw-r--   pj     pj      77 kio    Sat Jun 22 21:50:16 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_05.NEF.xmp
+[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj     pj      52 kio    Sat Jun 22 21:49:37 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_06.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:50:47 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_07.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:51:12 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_08.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:51:12 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_09.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:50:39 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_10.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:50:36 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_11.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:50:35 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_12.NEF.xmp
+[Saved][ ]       [-L-][  88%][ ]  -rw-rw-r--   pj     pj      15 kio    Sat Jun 22 21:51:11 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_13.NEF.xmp
+[Saved][ ]       [-L-][  96%][ ]  -rw-rw-r--   pj     pj      84 kio    Sat Jun 22 21:51:09 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_14.NEF.xmp
+[Saved][ ]       [-L-][  96%][ ]  -rw-rw-r--   pj     pj      90 kio    Sat Jun 22 21:51:04 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_15.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:51:15 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_16.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:50:48 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_17.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:50:19 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_18.NEF.xmp
 ````
 
-### select file dates in the directory:
+### select file dates in the directory
 
 ``` bash
 dar -l /tmp/example_FULL_2024-06-23  -I '*2024-06-16*' -g home/pj/tmp/LUT-play
@@ -1148,30 +1153,30 @@ gives
 ``` code
 [Data ][D][ EA  ][FSA][Compr][S]| Permission | User  | Group | Size    |          Date                 |    filename
 --------------------------------+------------+-------+-------+---------+-------------------------------+------------
-[Saved][-]       [-L-][   0%][ ]  drwxr-xr-x   root	root	113 Mio	Sat May 11 16:16:48 2024	home
-[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj	pj	113 Mio	Sun Jun 23 10:46:30 2024	home/pj
-[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj	pj	113 Mio	Sun Jun 23 09:17:42 2024	home/pj/tmp
-[Saved][-]       [-L-][   1%][ ]  drwxrwxr-x   pj	pj	50 Mio	Wed Jun 19 20:52:13 2024	home/pj/tmp/LUT-play
-[Saved][ ]       [-L-][   0%][X]  -rw-rw-r--   pj	pj	49 Mio	Sun Jun 16 12:52:22 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15.NEF
-[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj	pj	48 kio	Sat Jun 22 21:51:24 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15.NEF.xmp
-[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj	pj	50 kio	Sat Jun 22 21:51:25 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_01.NEF.xmp
-[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj	pj	51 kio	Sat Jun 22 21:51:26 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_02.NEF.xmp
-[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj	pj	51 kio	Sat Jun 22 21:51:27 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_03.NEF.xmp
-[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj	pj	51 kio	Sat Jun 22 21:51:27 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_04.NEF.xmp
-[Saved][ ]       [-L-][  97%][ ]  -rw-rw-r--   pj	pj	77 kio	Sat Jun 22 21:50:16 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_05.NEF.xmp
-[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj	pj	52 kio	Sat Jun 22 21:49:37 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_06.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:50:47 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_07.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:51:12 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_08.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:51:12 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_09.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:50:39 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_10.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:50:36 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_11.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:50:35 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_12.NEF.xmp
-[Saved][ ]       [-L-][  88%][ ]  -rw-rw-r--   pj	pj	15 kio	Sat Jun 22 21:51:11 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_13.NEF.xmp
-[Saved][ ]       [-L-][  96%][ ]  -rw-rw-r--   pj	pj	84 kio	Sat Jun 22 21:51:09 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_14.NEF.xmp
-[Saved][ ]       [-L-][  96%][ ]  -rw-rw-r--   pj	pj	90 kio	Sat Jun 22 21:51:04 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_15.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:51:15 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_16.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:50:48 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_17.NEF.xmp
-[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj	pj	24 kio	Sat Jun 22 21:50:19 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_18.NEF.xmp
+[Saved][-]       [-L-][   0%][ ] drwxr-xr-x   root    root    113 Mio   Sat May 11 16:16:48 2024        home
+[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj     pj      113 Mio   Sun Jun 23 10:46:30 2024        home/pj
+[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj     pj      113 Mio   Sun Jun 23 09:17:42 2024        home/pj/tmp
+[Saved][-]       [-L-][   1%][ ]  drwxrwxr-x   pj     pj      50 Mio    Sed Jun 19 20:52:13 2024        home/pj/tmp/LUT-play
+[Saved][ ]       [-L-][   0%][X]  -rw-rw-r--   pj     pj      49 Mio    Sun Jun 16 12:52:22 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15.NEF
+[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj     pj      48 kio    Sat Jun 22 21:51:24 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15.NEF.xmp
+[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj     pj      50 kio    Sat Jun 22 21:51:25 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_01.NEF.xmp
+[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj     pj      51 kio    Sat Jun 22 21:51:26 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_02.NEF.xmp
+[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj     pj      51 kio    Sat Jun 22 21:51:27 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_03.NEF.xmp
+[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj     pj      51 kio    Sat Jun 22 21:51:27 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_04.NEF.xmp
+[Saved][ ]       [-L-][  97%][ ]  -rw-rw-r--   pj     pj      77 kio    Sat Jun 22 21:50:16 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_05.NEF.xmp
+[Saved][ ]       [-L-][  95%][ ]  -rw-rw-r--   pj     pj      52 kio    Sat Jun 22 21:49:37 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_06.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:50:47 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_07.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:51:12 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_08.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:51:12 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_09.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:50:39 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_10.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:50:36 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_11.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:50:35 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_12.NEF.xmp
+[Saved][ ]       [-L-][  88%][ ]  -rw-rw-r--   pj     pj      15 kio    Sat Jun 22 21:51:11 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_13.NEF.xmp
+[Saved][ ]       [-L-][  96%][ ]  -rw-rw-r--   pj     pj      84 kio    Sat Jun 22 21:51:09 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_14.NEF.xmp
+[Saved][ ]       [-L-][  96%][ ]  -rw-rw-r--   pj     pj      90 kio    Sat Jun 22 21:51:04 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_15.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:51:15 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_16.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:50:48 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_17.NEF.xmp
+[Saved][ ]       [-L-][  92%][ ]  -rw-rw-r--   pj     pj      24 kio    Sat Jun 22 21:50:19 2024        home/pj/tmp/LUT-play/2024-06-16_12:52:22,15_18.NEF.xmp
 ```
 
 ### exclude .xmp files from that date
@@ -1183,17 +1188,15 @@ dar -l /tmp/example_FULL_2024-06-23 -X '*.xmp' -I '*2024-06-16*' -g home/pj/tmp/
 
 gives
 
-``` code
+```` code
 [Data ][D][ EA  ][FSA][Compr][S]| Permission | User  | Group | Size    |          Date                 |    filename
 --------------------------------+------------+-------+-------+---------+-------------------------------+------------
-[Saved][-]       [-L-][   0%][ ]  drwxr-xr-x   root	root	113 Mio	Sat May 11 16:16:48 2024	home
-[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj	pj	113 Mio	Sun Jun 23 10:46:30 2024	home/pj
-[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj	pj	113 Mio	Sun Jun 23 09:17:42 2024	home/pj/tmp
-[Saved][-]       [-L-][   1%][ ]  drwxrwxr-x   pj	pj	50 Mio	Wed Jun 19 20:52:13 2024	home/pj/tmp/LUT-play
-[Saved][ ]       [-L-][   0%][X]  -rw-rw-r--   pj	pj	49 Mio	Sun Jun 16 12:52:22 2024	home/pj/tmp/LUT-play/2024-06-16_12:52:22,15.NEF
-```
-
-Nice :-)
+[Saved][-]       [-L-][   0%][ ]  drwxr-xr-x   root   root    113 Mio   Sat May 11 16:16:48 2024        home
+[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj     pj      113 Mio   Sun Jun 23 10:46:30 2024        ome/pj
+[Saved][-]       [-L-][   0%][ ]  drwxrwxr-x   pj     pj      113 Mio   Sun Jun 23 09:17:42 2024        ome/pj/tmp
+[Saved][-]       [-L-][   1%][ ]  drwxrwxr-x   pj     pj      50 Mio    Wed Jun 19 20:52:13 2024      ` ome/pj/tmp/LUT-play
+[Saved][ ]       [-L-][   0%][X]  -rw-rw-r--   pj     pj      49 Mio    Sun Jun 16 12:52:22 2024      ` home/pj/tmp/LUT-play/2024-06-16_12:52:22,15.NEF
+````
 
 ## Restoring
 
@@ -1249,7 +1252,7 @@ deactivate
 
 "dar" in newer versions emits a question about file ownership, which is "answered" with a "no" via the "-Q" option. That in turn leads to an error code 4.
 
-Thus the dar option "--comparison-field=ignore-owner" has been placed in the supplied .darrc file (located in the virtual environment where dar-backup is installed). 
+Thus the dar option "--comparison-field=ignore-owner" has been placed in the supplied .darrc file (located in the virtual environment where dar-backup is installed).
 
 This causes dar to restore without an error.
 
@@ -1340,66 +1343,82 @@ if --log-stdout is used the information would be picked up by systemd and logged
 
 The log file can get quite cluttered, if you want the clutter to be removed, run the `clean-log`script.
 
+### Separate log file for command output
+
+Dar-backup's log file is called `dar-backup.log`.
+
+In order to not clutter that log file with the output of commands being run, a new log file has been introduced `dar-backup-commands.log`.
+
+## Todo
+
+- `installer` to generate, but not deploy systemd units and timers for:
+  - FULL, DIFF and INCR backups.
+  - cleanup.
+
 ## Reference
 
-### dar-backup.py
+### dar-backup
 
 This script is responsible for managing the backup creation and validation process. It supports the following options:
 
 ``` code
---full-backup                     Perform a full backup.
---differential-backup             Perform a differential backup.
---incremental-backup              Perform an incremental backup.
---backup-definition <name>        Specify the backup definition file.
+--full-backup                         Perform a full backup.
+--differential-backup                 Perform a differential backup.
+--incremental-backup                  Perform an incremental backup.
+--backup-definition <name>            Specify the backup definition file.
 --alternate-reference-archive <file>  Use a different archive for DIFF/INCR backups.
---config-file <path>              Specify the path to the configuration file.
---darrc <path>                    Specify an optional path to .darrc.
---examples                        Show examples of using dar-backup.py.
---list                            List available backups.
---list-contents <archive>         List the contents of a specified archive.
---selection <params>              Define file selection for listing/restoring.
---restore <archive>               Restore a specified archive.
---restore-dir <path>              Directory to restore files to.
---verbose                         Enable verbose output.
---log-level <level>               Set log level (debug, trace, etc.).
---log-stdout                      Also print log messages to stdout.
---do-not-compare                  Do not compare restores to file system.
---version                         Show version and license information.
+--config-file <path>                  Specify the path to the configuration file.
+--darrc <path>                        Specify an optional path to .darrc.
+--examples                            Show examples of using dar-backup.py.
+--list                                List available backups.
+--list-contents <archive>             List the contents of a specified archive.
+--selection <params>                  Define file selection for listing/restoring.
+--restore <archive>                   Restore a specified archive.
+--restore-dir <path>                  Directory to restore files to.
+--verbose                             Enable verbose output.
+--suppress-dar-msg                    Filter out this from the darrc: "-vt", "-vs", "-vd", "-vf", "-va"
+--log-level <level>                   `debug` or `trace`, default is `info`", default="info".
+--log-stdout                          Also print log messages to stdout.
+--do-not-compare                      Do not compare restores to file system.
+--version                             Show version and license information.
 ```
 
-### manager.py
+### manager
 
 This script manages `dar` databases and catalogs. Available options include:
 
 ``` code
---create-db                     Create missing databases for all backup definitions.
---alternate-archive-dir <path>   Use this directory instead of BACKUP_DIR in the config file.
---add-dir <path>                 Add all archive catalogs in this directory to databases.
--d, --backup-def <name>          Restrict to work only on this backup definition.
---add-specific-archive <file>    Add this archive to the catalog database.
---remove-specific-archive <file> Remove this archive from the catalog database.
--l, --list-catalogs              List catalogs in databases for all backup definitions.
---list-catalog-contents <num>    List contents of a catalog by archive number.
---list-archive-contents <file>   List contents of an archive’s catalog.
---find-file <file>               Search catalogs for a specific file.
---verbose                        Enable verbose output.
---log-level <level>              Set log level.
+--create-db                           Create missing databases for all backup definitions.
+--alternate-archive-dir <path>        Use this directory instead of BACKUP_DIR in the config file.
+--add-dir <path>                      Add all archive catalogs in this directory to databases.
+-d, --backup-def <name>               Restrict to work only on this backup definition.
+--add-specific-archive <archive>      Add this archive to the catalog database.
+--remove-specific-archive <archive>   Remove this archive from the catalog database.
+-l, --list-catalogs                   List catalogs in databases for all backup definitions.
+--list-catalog-contents <num>         List contents of a catalog by catalog number.
+--list-archive-contents <archive>     List contents of an archive’s catalog, given the archive name.
+--find-file <file>                    Search catalogs for a specific file.
+--verbose                             Enable verbose output.
+--log-level <level>                   `debug` or `trace`, default is `info`", default="info".
 ```
 
-### cleanup.py
+### cleanup
 
 This script cleans up old backups and manages storage. Supported options:
 
 ``` code
---prune-older-than <days>   Remove backups older than the specified number of days.
---keep-last <num>           Retain only the last <num> backups.
---dry-run                   Show what would be deleted without actually deleting.
---backup-dir <path>         Specify the backup directory.
---verbose                   Enable verbose output.
---help                      Show this help message and exit.
+-d, --backup-definition                       Backup definition to cleanup.
+-c, --config-file                             Path to 'dar-backup.conf', default='~/.config/dar-backup/dar-backup.conf.
+-v, --version                                 Show version & license information.
+--alternate-archive-dir                       Clean up in this directory instead of the default one.
+--cleanup-specific-archives <archive>, ...    Comma separated list of archives to cleanup.
+-l,  --list                                   List available archives.
+--verbose                                     Print various status messages to screen.
+--log-level <level>                           `debug` or `trace`, default is `info`", default="info".
+--log-stdout                                  Print log messages to stdout.
 ```
 
-### clean-log.py
+### clean-log
 
 This script removes excessive logging output from `dar` logs, improving readability and efficiency. Available options:
 
@@ -1408,4 +1427,30 @@ This script removes excessive logging output from `dar` logs, improving readabil
 -c, --config-file <path>   Specify the configuration file (default: ~/.config/dar-backup/dar-backup.conf).
 --dry-run                  Show which lines would be removed without modifying the file.
 -v, --version              Display version and licensing information.
+-h, --help                 Displays usage info
+```
+
+### installer
+
+Sets up `dar-backup`for a user.
+
+It is non-destructive and stops if directories are already in place.
+
+Create directories:
+
+- ~/.config/dar-backup/
+  - ~/.config/dar-backup/backup.d/
+- ~/dar-backup/
+  - ~/dar-backup/backups
+  - ~/dar-backup/restore
+
+Sets up demo config files:
+
+- ~/.config/dar-backup/dar-backup.conf
+- ~/.config/dar-backup/backup.d/default
+
+``` code
+-i, --install              Sets up `dar-backup`.
+-v, --version              Display version and licensing information.
+-h, --help                 Displays usage info
 ```

dar_backup-0.6.13.1.dist-info/RECORD

@@ -0,0 +1,16 @@
+dar_backup/.darrc,sha256=-aerqivZmOsW_XBCh9IfbYTUvw0GkzDSr3Vx4GcNB1g,2113
+dar_backup/__about__.py,sha256=WhY38gJ9InHtiokbumhF5t6Q_JtwytMg5oigYIZ6CZ0,24
+dar_backup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dar_backup/clean_log.py,sha256=cGhtKYnQJ2ceNQfw5XcCln_WNBasbmlfhO3kRydjDNk,5196
+dar_backup/cleanup.py,sha256=1g2si9-jPEL8T4OKaiGSKFGsF6rWh-Ke1-zQHE7HaPc,11703
+dar_backup/config_settings.py,sha256=uicCq6FnpxPFzbv7xfYSXNnQf1tfLk1Z3VIO9M71fsE,4659
+dar_backup/dar-backup.conf,sha256=-wXqP4vj5TS7cCfMJN1nbk-1Sqkq00Tg22ySQXynUF4,902
+dar_backup/dar_backup.py,sha256=yJjDqyPBWsjsMZeMbEgLzLt0N8R2y-YZGdfxvZjm8gs,35723
+dar_backup/installer.py,sha256=ehp4KSgTc8D9Edsyve5v3NY2MuDbuTFYQQPgou8woV8,4331
+dar_backup/manager.py,sha256=VBeZEIETDL_Lxhmo-T47xSQAxbOPGU-ZLI7GFXJx-Go,21647
+dar_backup/util.py,sha256=lfgfxC_C6x3I8f9vzyxpQE7P-7rm6tTEr3P-2uWlVtQ,12278
+dar_backup-0.6.13.1.dist-info/METADATA,sha256=zWP8JXewEWB5x-dbTjnDBJ8PBFiFdwBPtkptaSP9Fg4,72698
+dar_backup-0.6.13.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dar_backup-0.6.13.1.dist-info/entry_points.txt,sha256=Z7P5BUbhtJxo8_nB9qNIMay2eGDbsMKB3Fjwv3GMa4g,202
+dar_backup-0.6.13.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+dar_backup-0.6.13.1.dist-info/RECORD,,

dar_backup-0.6.12.dist-info/RECORD

@@ -1,16 +0,0 @@
-dar_backup/.darrc,sha256=-aerqivZmOsW_XBCh9IfbYTUvw0GkzDSr3Vx4GcNB1g,2113
-dar_backup/__about__.py,sha256=AY38r3HUSyMqkCPP-vaHASQmjQF5-PRm11j_QYtx28w,22
-dar_backup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dar_backup/clean_log.py,sha256=cGhtKYnQJ2ceNQfw5XcCln_WNBasbmlfhO3kRydjDNk,5196
-dar_backup/cleanup.py,sha256=NaZMrTdtYv4uJSw3jwDQWc5F5jMfIdfIQdrcPGAVcnM,11439
-dar_backup/config_settings.py,sha256=uicCq6FnpxPFzbv7xfYSXNnQf1tfLk1Z3VIO9M71fsE,4659
-dar_backup/dar-backup.conf,sha256=-wXqP4vj5TS7cCfMJN1nbk-1Sqkq00Tg22ySQXynUF4,902
-dar_backup/dar_backup.py,sha256=Cye8gS0E0mNKaUzcjqsdsuTyyeZYCspRMBIdcGbsEik,33171
-dar_backup/installer.py,sha256=0TgC_O-T7Y3sLn_NIQ9lBYt8GJqLZzxPqkmbjElfgkM,4491
-dar_backup/manager.py,sha256=MkrB0AL0MefE_cUAvdzQb_0bzvqsPmYi5s0M3EPw-z8,21379
-dar_backup/util.py,sha256=E-sEBQZY1hmdeVx5xNE22zKQ0BXDee1eI9F1-w7Fq1Q,15756
-dar_backup-0.6.12.dist-info/METADATA,sha256=YEbPNJr_ntP03BVKSACo2MU-Qko_9quyzmuqrhryBz0,69768
-dar_backup-0.6.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dar_backup-0.6.12.dist-info/entry_points.txt,sha256=Z7P5BUbhtJxo8_nB9qNIMay2eGDbsMKB3Fjwv3GMa4g,202
-dar_backup-0.6.12.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-dar_backup-0.6.12.dist-info/RECORD,,