dar-backup 0.6.3__py3-none-any.whl → 0.6.4__py3-none-any.whl

dar_backup/.darrc

@@ -14,13 +14,13 @@ verbose:
 # -vs
 
 # shows diretory currently being processed
-# -vd 
+ -vd 
 
 # shows detailed messages, not related to files and directories
 # -vm
 
 # shows summary of each treated directory, including average compression
-# -vf
+ -vf
 
 # equivalent to "-vm -vs -vt"
 # -va

dar_backup/__about__.py

@@ -1 +1 @@
-__version__ = "0.6.3"
+__version__ = "0.6.4"

dar_backup/manager.py

@@ -119,11 +119,11 @@ def cat_no_for_name(archive: str, config_settings: ConfigSettings) -> int:
         return -1
     line_no = 1
     for line in process.stdout.splitlines():
-        #print(f"{line_no}: {line}")
+        #print(f"{line_no}: '{line}'")
         line_no += 1
-        search = re.search(f"\s+(\d+)\s+.*?({archive}).*", line)
+        search = re.search(f".*?(\d+)\s+.*?({archive}).*", line)
         if search:
-            #print("FOUND")
+            #print(f"FOUND: archive: {search.group(2)}, catalog #: '{search.group(1)}'")
             logger.info(f"Found archive: '{archive}', catalog #: '{search.group(1)}'")
             return int(search.group(1))
     return -1
@@ -288,7 +288,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)
-    if cat_no > 0:
+    if cat_no >= 0:
         command = ['dar_manager', '--base', database_path, "--delete", str(cat_no)]
         process = run_command(command)
     else:
@@ -430,7 +430,11 @@ See section 15 and section 16 in the supplied "LICENSE" file.''')
 
 
     if args.remove_specific_archive:
-        sys.exit(remove_specific_archive(args.remove_specific_archive, config_settings))
+        
+        if remove_specific_archive(args.remove_specific_archive, config_settings) == 0:
+            sys.exit(0)
+        else:  
+            sys.exit(1)
 
 
 

dar_backup/util.py

@@ -15,10 +15,11 @@ import re
 import subprocess
 import shlex
 import sys
+import threading
 import traceback
 from datetime import datetime
 
-from typing import NamedTuple
+from typing import NamedTuple, List
 
 logger=None
 
@@ -101,45 +102,110 @@ class CommandResult(NamedTuple):
     command: list[str]
 
     def __str__(self):
-        return f"CommandResult: [Return Code: '{self.returncode}', Stdout: '{self.stdout}', Stderr: '{self.stderr}', Timeout: '{self.timeout}', Command: '{self.command}']"
+        #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))}']"
 
 
-def run_command(command: list[str], timeout: int=30) -> typing.NamedTuple:
+
+def  _stream_reader(pipe, log_func, 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.
+    """
+    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
+
+
+def run_command(command: List[str], timeout: int = 30) -> CommandResult:
     """
-    Executes a given command via subprocess and captures its output.
+    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.
+        timeout (int): The maximum time in seconds to wait for the command to complete. Defaults to 30 seconds.
 
     Returns:
-        a typing.NamedTuple of class dar-backup.util.CommandResult with the following properties:
-        - process: of type subprocess.CompletedProcess: The result of the command execution.
-        - stdout: of type str: The standard output of the command.
-        - stderr: of type str: The standard error of the command.
-        - returncode: of type int: The return code of the command.
-        - timeout: of type int: The timeout value in seconds used to run the command.
-        - command: of type list[str): The command executed.
-    
+        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: raise exceptions during command runs.
+        subprocess.TimeoutExpired: If the command execution times out (see `timeout` parameter).
+        Exception: If other exceptions occur during command execution.
+
+    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 = None
-    stderr = None
+    stdout_lines = []  # To accumulate stdout
+    stderr_lines = []  # To accumulate stderr
+    process = None  # Track the process for cleanup
+
     try:
         logger.debug(f"Running command: {command}")
         process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-        stdout, stderr = process.communicate(timeout)  # Wait with timeout
-        result = CommandResult(process=process, stdout=stdout, stderr=stderr, returncode=process.returncode, timeout=timeout, command=command)
-        logger.debug(f"Command result: {str(result)}")
+
+        # 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 subprocess.TimeoutExpired:
-        process.terminate()
+        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()
+
+        # 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}")
     return result
 
 

{dar_backup-0.6.3.dist-info → dar_backup-0.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dar-backup
-Version: 0.6.3
+Version: 0.6.4
 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
 Project-URL: Issues, https://github.com/per2jensen/dar-backup/issues

dar_backup-0.6.4.dist-info/RECORD

@@ -0,0 +1,13 @@
+dar_backup/.darrc,sha256=3d9opAnnZGU9XLyQpTDsLtgo6hqsvZ3JU-yMLz-7_f0,2110
+dar_backup/__about__.py,sha256=ZbrGjsYU2ekVSe1-DcOOl7YsjrwB1bbJTUQlEi8pMjU,21
+dar_backup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dar_backup/cleanup.py,sha256=DgmxSUwKrLLIQuYSIY_yTRhIuOMgI6ivjlQuH4u3wX4,9057
+dar_backup/config_settings.py,sha256=CBMUhLOOZ-x7CRdS3vBDk4TYaGqC4N1Ot8IMH-qPaI0,3617
+dar_backup/dar_backup.py,sha256=YZoVu9NJX3_WIkQIG8EMLSK3-VWdslI0c2XKrM2Un38,32214
+dar_backup/manager.py,sha256=2qTcn1HiDrejc6S7dLpkylURGzMQ0QqTaSl2KQQ58Uw,19198
+dar_backup/util.py,sha256=SSSJYM9lQZfubhTUBlX1xDGWmCpYEF3ePARmlY544xM,11283
+dar_backup-0.6.4.dist-info/METADATA,sha256=9AKTUu-uyxNQqKoxtYdAWbAyMgHsmLCblvchEvT_B94,22496
+dar_backup-0.6.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dar_backup-0.6.4.dist-info/entry_points.txt,sha256=x9vnW-JEl8mpDJC69f_XBcn0mBSkV1U0cyvFV-NAP1g,126
+dar_backup-0.6.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+dar_backup-0.6.4.dist-info/RECORD,,

dar_backup-0.6.3.dist-info/RECORD

@@ -1,13 +0,0 @@
-dar_backup/.darrc,sha256=ggex9N6eETOS6u003_QRRJMeWbveQfkT1lDBt0XpU-I,2112
-dar_backup/__about__.py,sha256=_SsQ0ZcyZbUqlFFT370nQxs8UER9D0oW_EmCr4Q-hx4,21
-dar_backup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dar_backup/cleanup.py,sha256=DgmxSUwKrLLIQuYSIY_yTRhIuOMgI6ivjlQuH4u3wX4,9057
-dar_backup/config_settings.py,sha256=CBMUhLOOZ-x7CRdS3vBDk4TYaGqC4N1Ot8IMH-qPaI0,3617
-dar_backup/dar_backup.py,sha256=YZoVu9NJX3_WIkQIG8EMLSK3-VWdslI0c2XKrM2Un38,32214
-dar_backup/manager.py,sha256=Y1dQ7CRGQx5sGoGrjAO62QfJcuW_0Vod-ZGaQmHInFU,19062
-dar_backup/util.py,sha256=6lPCFHr3MDdaLWAW9EDMZ4jdL7pt8rki-5dOXcesmP8,8955
-dar_backup-0.6.3.dist-info/METADATA,sha256=6120hSt2mUxhn3u8PfbJweoPY4ToWFlAPHAgLozaK7Q,22496
-dar_backup-0.6.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dar_backup-0.6.3.dist-info/entry_points.txt,sha256=x9vnW-JEl8mpDJC69f_XBcn0mBSkV1U0cyvFV-NAP1g,126
-dar_backup-0.6.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-dar_backup-0.6.3.dist-info/RECORD,,