dar-backup 0.6.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

dar_backup/__about__.py

@@ -1 +1 @@
-__version__ = "0.6.0"
+__version__ = "0.6.1"

dar_backup/dar_backup.py

@@ -64,23 +64,18 @@ def backup(backup_file: str, backup_definition: str, darrc: str,  config_setting
     logger.info(f"Running command: {' '.join(map(shlex.quote, command))}")
     try:
         process = run_command(command, config_settings.command_timeout_secs)
-        stdout, stderr = process.stdout, process.stderr
+        logger.info("Back from run_command")
         if process.returncode == 0:
             logger.info("FULL backup completed successfully.")
         elif process.returncode == 5:
             logger.warning("Backup completed with some files not backed up, this can happen if files are changed/deleted during the backup.")
         else:
-            logger.error("dar return code: ", process.returncode)
-            logger.error("stdout: ", stdout)
-            logger.error("stderr: ", stderr)
-            raise Exception(stderr)
+            raise Exception(str(process))
     except subprocess.CalledProcessError as e:
         logger.error(f"Backup command failed: {e}")
         raise BackupError(f"Backup command failed: {e}") from e
     except Exception as e:
         logger.exception(f"Unexpected error during backup")
-        logger.error("stderr:", stderr)
-        logger.error("stdout: ", stdout)
         raise BackupError(f"Unexpected error during backup: {e}") from e
  
  
@@ -120,16 +115,12 @@ def differential_backup(backup_file: str, backup_definition: str, base_backup_fi
     logger.info(f"Running command: {' '.join(map(shlex.quote, command))}")
     try:
         process = run_command(command)
-        stdout, stderr = process.stdout, process.stderr
         if process.returncode == 0:
             logger.info("DIFF backup completed successfully.")
         elif process.returncode == 5:
             logger.warning("Backup completed with some files not backed up, this can happen if files are changed/deleted during the backup.")
         else:
-            logger.error("dar return code: ", process.returncode)
-            logger.error("stdout: ", stdout)
-            logger.error("stderr: ", stderr)
-            raise Exception(stderr)
+            raise Exception(str(process))
     except subprocess.CalledProcessError as e:
         logger.error(f"Differential backup command failed: {e}")
         raise DifferentialBackupError(f"Differential backup command failed: {e}") from e
@@ -174,22 +165,17 @@ def incremental_backup(backup_file: str, backup_definition: str, last_backup_fil
     logger.info(f"Running command: {' '.join(map(shlex.quote, command))}")
     try:
         process = run_command(command, config_settings.command_timeout_secs)
-        stdout, stderr = process.stdout, process.stderr
         if process.returncode == 0:
             logger.info("INCR backup completed successfully.")
         elif process.returncode == 5:
             logger.warning("Backup completed with some files not backed up, this can happen if files are changed/deleted during the backup.")
         else:
-            logger.error("dar return code: ", process.returncode)
-            logger.error("stdout: ", stdout)
-            logger.error("stderr: ", stderr)
-            raise Exception(stderr)
+            raise Exception(str(process))
     except subprocess.CalledProcessError as e:
         logger.error(f"Incremental backup command failed: {e}")
         raise IncrementalBackupError(f"Incremental backup command failed: {e}") from e
     except Exception as e:
         logger.exception(f"Unexpected error during incremental backup")
-        logger.error("Exception details:", exc_info=True)
         raise IncrementalBackupError(f"Unexpected error during incremental backup: {e}") from e
 
 
@@ -286,11 +272,10 @@ def verify(args: argparse.Namespace, backup_file: str, backup_definition: str, c
     command = ['dar', '-t', backup_file, '-Q']
     logger.info(f"Running command: {' '.join(map(shlex.quote, command))}")
     process = run_command(command, config_settings.command_timeout_secs)
-    stdout, stderr = process.stdout, process.stderr
     if process.returncode == 0:
         logger.info("Archive integrity test passed.")
     else:
-        raise Exception(stderr)
+        raise Exception(str(process))
 
     if args.do_not_compare:
         return result
@@ -325,10 +310,8 @@ def verify(args: argparse.Namespace, backup_file: str, backup_definition: str, c
             command = ['dar', '-x', backup_file, '-g', restored_file_path.lstrip("/"), '-R', config_settings.test_restore_dir, '-O', '-Q']
             logger.info(f"Running command: {' '.join(map(shlex.quote, command))}")
             process = run_command(command, config_settings.command_timeout_secs)    
-            stdout, stderr = process.stdout, process.stderr
             if process.returncode != 0:
-                logger.error(f"Restore failed, dar return code: {process.returncode}.")
-                raise Exception(stderr)
+                raise Exception(str(process))
 
             if filecmp.cmp(os.path.join(config_settings.test_restore_dir, restored_file_path.lstrip("/")), os.path.join(root_path, restored_file_path.lstrip("/")), shallow=False):
                 logger.info(f"Success: file '{restored_file_path}' matches the original")
@@ -365,17 +348,13 @@ def restore_backup(backup_name: str, config_settings: ConfigSettings, restore_di
     logger.info(f"Running command: {' '.join(map(shlex.quote, command))}")
     try:
         process = run_command(command, config_settings.command_timeout_secs)
-        stdout, stderr = process.stdout, process.stderr
+        if process.returncode == 0:
+            logger.info(f"Restore completed successfully to: '{restore_dir}'")
+        else:
+            raise Exception(str(process))
     except subprocess.CalledProcessError as e:
-        logger.error("Exception details:", exc_info=True)
-        logger.error(f"stdout: {stdout}")
-        logger.error(f"stderr: {stderr}")
         raise RestoreError(f"Restore command failed: {e}") from e
     except Exception as e:
-        logger.exception(f"Unexpected error during restore")
-        logger.error("Exception details:", exc_info=True)
-        logger.error(f"stdout: {stdout}")
-        logger.error(f"stderr: {stderr}")
         raise RestoreError(f"Unexpected error during restore: {e}") from e
 
 
@@ -393,19 +372,24 @@ def get_backed_up_files(backup_name: str, backup_dir: str):
     """
     logger.debug(f"Getting backed up files from DAR archive in xml: '{backup_name}'")
     backup_path = os.path.join(backup_dir, backup_name)
-    command = ['dar', '-l', backup_path, '-am', '-as', "-Txml" , '-Q']
-    logger.info(f"Running command: {' '.join(map(shlex.quote, command))}")
-    process = run_command(command)
-    stdout,stderr = process.stdout, process.stderr
-    # Parse the XML data
-    root = ET.fromstring(stdout)
-    output = None  # help gc
-    # Extract full paths and file size for all <File> elements
-    file_paths = find_files_with_paths(root)
-    root = None # help gc
-    logger.trace(f"Backed up files in dar archive: '{backup_name}'")
-    logger.trace(file_paths)
-    return file_paths
+    try:
+        command = ['dar', '-l', backup_path, '-am', '-as', "-Txml" , '-Q']
+        logger.info(f"Running command: {' '.join(map(shlex.quote, command))}")
+        process = run_command(command)
+        # Parse the XML data
+        root = ET.fromstring(process.stdout)
+        output = None  # help gc
+        # Extract full paths and file size for all <File> elements
+        file_paths = find_files_with_paths(root)
+        root = None # help gc
+        logger.trace(str(process))
+        logger.trace(file_paths)
+        return file_paths
+    except subprocess.CalledProcessError as e:
+        logger.error(f"Error listing backed up files from DAR archive: '{backup_name}'")
+        raise BackupError(f"Error listing backed up files from DAR archive: '{backup_name}'") from e
+    except Exception as e:
+        raise RuntimeError(f"Unexpected error listing backed up files from DAR archive: '{backup_name}'") from e
 
 
 def list_contents(backup_name, backup_dir, selection=None):
@@ -421,17 +405,26 @@ def list_contents(backup_name, backup_dir, selection=None):
         None
     """
     backup_path = os.path.join(backup_dir, backup_name)
-    command = ['dar', '-l', backup_path, '-am', '-as', '-Q']
-    if selection:
-        selection_criteria = shlex.split(selection)
-        command.extend(selection_criteria)
-    logger.info(f"Running command: {' '.join(map(shlex.quote, command))}")
-    process = run_command(command)
-    stdout,stderr = process.stdout, process.stderr
+    try:
+        command = ['dar', '-l', backup_path, '-am', '-as', '-Q']
+        if selection:
+            selection_criteria = shlex.split(selection)
+            command.extend(selection_criteria)
+        logger.info(f"Running command: {' '.join(map(shlex.quote, command))}")
+        process = run_command(command)
+        stdout,stderr = process.stdout, process.stderr
+        if process.returncode != 0:
+            logger.error(f"Error listing contents of backup: '{backup_name}'")
+            raise subprocess.CalledProcessError(str(process))
+        for line in stdout.splitlines():
+            if "[--- REMOVED ENTRY ----]" in line or "[Saved]" in line:
+                print(line)
+    except subprocess.CalledProcessError as e:
+        logger.error(f"Error listing contents of backup: '{backup_name}'")
+        raise BackupError(f"Error listing contents of backup: '{backup_name}'") from e  
+    except Exception as e:
+        raise RuntimeError(f"Unexpected error listing contents of backup: '{backup_name}'") from e  
 
-    for line in stdout.splitlines():
-        if "[--- REMOVED ENTRY ----]" in line or "[Saved]" in line:
-            print(line)
 
 
 def perform_backup(args: argparse.Namespace, config_settings: ConfigSettings, backup_type: str):
@@ -634,7 +627,7 @@ def requirements(type: str, config_setting: ConfigSettings):
         for key in sorted(config_setting.config[type].keys()):
             script = config_setting.config[type][key]
             try:
-                result = subprocess.run(script, shell=True, check=True)
+                result = subprocess.run(script, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, shell=True, check=True)
                 logger.info(f"{type} {key}: '{script}' run, return code: {result.returncode}")
                 logger.info(f"{type} stdout:\n{result.stdout}")
                 if result.returncode != 0:
@@ -642,9 +635,7 @@ def requirements(type: str, config_setting: ConfigSettings):
                     raise RuntimeError(f"{type} {key}: '{script}' failed, return code: {result.returncode}")    
             except subprocess.CalledProcessError as e:
                 logger.error(f"Error executing {key}: '{script}': {e}")
-                if result:
-                    logger.error(f"{type} stderr:\n{result.stderr}")
-                    raise e
+                raise e
 
 
 def main():
@@ -754,23 +745,18 @@ def main():
 
         requirements('POSTREQ', config_settings)
 
-
+        args.verbose and print("\033[1m\033[32mSUCCESS\033[0m No errors encountered")
+        sys.exit(0)
     except Exception as e:
         logger.exception("An error occurred")
         logger.error("Exception details:", exc_info=True)
-
-    end_time=int(time())
-    logger.info(f"END TIME: {end_time}")
-
-    error_lines = extract_error_lines(config_settings.logfile_location, start_time, end_time)
-    if len(error_lines) > 0:
         args.verbose and print("\033[1m\033[31mErrors\033[0m encountered")
-        for line in error_lines:
-            args.verbose and print(line)
-        sys.exit(1)
-    else:
-        args.verbose and print("\033[1m\033[32mSUCCESS\033[0m No errors encountered")
-        sys.exit(0)
+        sys.exit(1) 
+    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)
 
 
 if __name__ == "__main__":

dar_backup/util.py

@@ -81,9 +81,6 @@ def setup_logging(log_file: str, log_level: str, log_to_stdout: bool=False, logg
             stdout_handler.setFormatter(formatter)
             logger.addHandler(stdout_handler)
 
-#        logging.basicConfig(filename=log_file, level=level_used,
-#                            format='%(asctime)s - %(levelname)s - %(message)s')
-
     except Exception as e:
         print("logging not initialized, exiting.")
         traceback.print_exc()
@@ -103,6 +100,9 @@ class CommandResult(NamedTuple):
     timeout: int
     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}']"
+
 
 def run_command(command: list[str], timeout: int=30) -> typing.NamedTuple:
     """
@@ -125,23 +125,22 @@ def run_command(command: list[str], timeout: int=30) -> typing.NamedTuple:
         subprocess.TimeoutExpired: if the command execution times out (see `timeout` parameter).
         Exception: raise exceptions during command runs.
     """
-
+    stdout = None
+    stderr = None
     try:
-        logger.info(f"Running command: {command}")
+        logger.debug(f"Running command: {command}")
         process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-        stdout, stderr = process.communicate(timeout=30)  # Wait with timeout
+        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)}")
     except subprocess.TimeoutExpired:
         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:
-        if not stdout:
-            stdout = None
-        if not stderr:
-            stderr = None
-    return CommandResult(process=process, stdout=stdout, stderr=stderr, returncode=process.returncode, timeout=timeout, command=command)
+    return result
 
 
 def extract_error_lines(log_file_path: str, start_time: str, end_time: str):

{dar_backup-0.6.0.dist-info → dar_backup-0.6.1.dist-info}/METADATA

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

dar_backup-0.6.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+dar_backup/.darrc,sha256=ggex9N6eETOS6u003_QRRJMeWbveQfkT1lDBt0XpU-I,2112
+dar_backup/__about__.py,sha256=XvHFZM0padtrqitt9-p2enlBUGqc6vGvWNLx2iJv09g,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=xnDuqkpo8q_X1FLKID9I_s__FQozl5EIrwNHdIJAd_0,37525
+dar_backup/manager.py,sha256=lkw1ZAIdxY7WedLPKZMnHpuq_QbjkUdcG61ooiwUYpo,10197
+dar_backup/util.py,sha256=6lPCFHr3MDdaLWAW9EDMZ4jdL7pt8rki-5dOXcesmP8,8955
+dar_backup-0.6.1.dist-info/METADATA,sha256=m3P_iVauaMno0fAhc4iJgO_DS9FobsqV5StQzUdU6wY,22496
+dar_backup-0.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dar_backup-0.6.1.dist-info/entry_points.txt,sha256=x9vnW-JEl8mpDJC69f_XBcn0mBSkV1U0cyvFV-NAP1g,126
+dar_backup-0.6.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+dar_backup-0.6.1.dist-info/RECORD,,

dar_backup-0.6.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-dar_backup/.darrc,sha256=ggex9N6eETOS6u003_QRRJMeWbveQfkT1lDBt0XpU-I,2112
-dar_backup/__about__.py,sha256=DS49q_bFynltwBtgneHYeVXTHLg5bjAOFWvTkv-jYmY,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=Kz_Gwe9t6vHGk590D3pbqDe1ptyrhLNpQWCU8oDcqos,37870
-dar_backup/manager.py,sha256=lkw1ZAIdxY7WedLPKZMnHpuq_QbjkUdcG61ooiwUYpo,10197
-dar_backup/util.py,sha256=ZYalRptXvSI9laLmHOe67WOOHoHF0CS4osE9NP1MDWA,8892
-dar_backup-0.6.0.dist-info/METADATA,sha256=-D3-rzNmkAMpN5SpMSeoveXuGQ1x8EncsdBxs0Lfx-s,22496
-dar_backup-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dar_backup-0.6.0.dist-info/entry_points.txt,sha256=x9vnW-JEl8mpDJC69f_XBcn0mBSkV1U0cyvFV-NAP1g,126
-dar_backup-0.6.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-dar_backup-0.6.0.dist-info/RECORD,,