dar-backup 0.6.5__py3-none-any.whl → 0.6.6__py3-none-any.whl

dar_backup/__about__.py

@@ -1 +1 @@
-__version__ = "0.6.5"
+__version__ = "0.6.6"

dar_backup/dar_backup.py

@@ -30,7 +30,7 @@ from dar_backup.util import RestoreError
 
 logger = None
 
-def generic_backup(type: str, command: List[str], backup_file: str, backup_definition: str, darrc: str,  config_settings: ConfigSettings):
+def generic_backup(type: str, command: List[str], backup_file: str, backup_definition: str, darrc: str,  config_settings: ConfigSettings, args: argparse.Namespace):
     """
     Performs a backup using the 'dar' command.
 
@@ -64,6 +64,15 @@ def generic_backup(type: str, command: List[str], backup_file: str, backup_defin
             logger.warning("Backup completed with some files not backed up, this can happen if files are changed/deleted during the backup.")
         else:
             raise Exception(str(process))
+
+        if process.returncode == 0 or process.returncode == 5:
+            add_catalog_command = ['manager', '--add-specific-archive' ,backup_file, '--config-file', args.config_file, '--log-level', "debug", "--log-stdout"]
+            command_result = run_command(add_catalog_command, config_settings.command_timeout_secs)
+            if command_result.returncode == 0:
+                logger.info(f"Catalog for archive '{backup_file}' added successfully to its manager.")
+            else:
+                logger.error(f"Catalog for archive '{backup_file}' not added.")
+
     except subprocess.CalledProcessError as e:
         logger.error(f"Backup command failed: {e}")
         raise BackupError(f"Backup command failed: {e}") from e
@@ -409,19 +418,22 @@ def perform_backup(args: argparse.Namespace, config_settings: ConfigSettings, ba
             command = create_backup_command(backup_type, backup_file, args.darrc, backup_definition_path, latest_base_backup)
 
             # Perform backup
-            generic_backup(backup_type, command, backup_file, backup_definition_path, args.darrc, config_settings)
+            generic_backup(backup_type, command, backup_file, backup_definition_path, args.darrc, config_settings, args)
 
             logger.info("Starting verification...")
-            result = verify(args, backup_file, backup_definition_path, config_settings)
-            if result:
+            verify_result = verify(args, backup_file, backup_definition_path, config_settings)
+            if verify_result:   
                 logger.info("Verification completed successfully.")
             else:
                 logger.error("Verification failed.")
 
-            if config_settings.par2_enabled:
+            
+            if verify_result and config_settings.par2_enabled:
                 logger.info("Generate par2 redundancy files.")
                 generate_par2_files(backup_file, config_settings, args)
                 logger.info("par2 files completed successfully.")
+            
+
         except Exception as e:
             logger.exception(f"Error during {backup_type} backup process, continuing to next backup definition.")
 
@@ -461,16 +473,14 @@ def generate_par2_files(backup_file: str, config_settings: ConfigSettings, args)
     for slice_file in dar_slices:
         file_path = os.path.join(config_settings.backup_dir, slice_file)
     
-        if args.verbose or args.log_level == "debug" or args.log_level == "trace":
-            logger.info(f"{counter}/{number_of_slices}: Now generating par2 files for {file_path}")
+        logger.info(f"{counter}/{number_of_slices}: Now generating par2 files for {file_path}")
 
         # Run the par2 command to generate redundancy files with error correction
         command = ['par2', 'create', f'-r{config_settings.error_correction_percent}', '-q', '-q', file_path]
         process = run_command(command, config_settings.command_timeout_secs)
 
         if process.returncode == 0:
-            if args.verbose or args.log_level == "debug" or args.log_level == "trace":
-                logger.info(f"{counter}/{number_of_slices}: Done")
+            logger.info(f"{counter}/{number_of_slices}: Done")
         else:
             logger.error(f"Error generating par2 files for {file_path}")
             raise subprocess.CalledProcessError(process.returncode, command)

dar_backup/manager.py

@@ -60,6 +60,7 @@ def create_db(backup_def: str, config_settings: ConfigSettings):
 
     if os.path.exists(database_path):
         logger.warning(f'"{database_path}" already exists, skipping creation')
+        return 0
     else:
         logger.info(f'Create catalog database: "{database_path}"')
         command = ['dar_manager', '--create' , database_path]

{dar_backup-0.6.5.dist-info → dar_backup-0.6.6.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: dar-backup
-Version: 0.6.5
+Version: 0.6.6
 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: Homepage, https://github.com/per2jensen/dar-backup/tree/main/v2
 Project-URL: Changelog, https://github.com/per2jensen/dar-backup/blob/main/v2/Changelog.md
 Project-URL: Issues, https://github.com/per2jensen/dar-backup/issues
 Author-email: dar-backup <per2jensen@gmail.com>
@@ -845,6 +845,7 @@ Example of backup definition for a home directory
 Installation is currently in a venv. These commands are installed in the venv:
 - dar-back
 - cleanup
+- manager
 
 To install, create a venv and run pip:
 ````    
@@ -911,22 +912,32 @@ options:
   --log-stdout          also print log messages to stdout
   --do-not-compare      do not compare restores to file system
   -v, --version         Show version and license information.
-
 ````    
 
 ## 4
+Generate the archive catalog database(s). 
+`dar-backup` expects the catalog databases to be in place, it does not automatically create them (by design)
+
+````    
+manager --create-db --config-file <path to config file> --log-level debug --log-stdout
+````    
+
+
+
+
+## 5
 You are ready to do backups of all your backup definitions, if your backup definitions are 
 in place in BACKUP.D_DIR (see config file)
 ````    
 dar-backup --full-backup 
 ````    
 
-or a backup of a single definition
+or a backup of a single definition. The definition's name is the filename of the definition in the `backup.d` config directory.
 ````    
 dar-backup --full-backup -d <your backup definition>
 ````
 
-## 5 
+## 6 
 
 Deactivate the virtual environment
 ````

dar_backup-0.6.6.dist-info/RECORD

@@ -0,0 +1,13 @@
+dar_backup/.darrc,sha256=3d9opAnnZGU9XLyQpTDsLtgo6hqsvZ3JU-yMLz-7_f0,2110
+dar_backup/__about__.py,sha256=GTf8rijLTDSqTWQgxKQN312t-j2E-t3ioZB4U22DXxc,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=oUlGCLeYwkJKSqn1qzKqkhpoQVTp-fCWyJcpmkSnLjc,32703
+dar_backup/manager.py,sha256=7bo64O4Pk5mLBp5NaID7YQ9GOuLunl5R42z_SUORW-Q,19215
+dar_backup/util.py,sha256=SSSJYM9lQZfubhTUBlX1xDGWmCpYEF3ePARmlY544xM,11283
+dar_backup-0.6.6.dist-info/METADATA,sha256=NklByKxLaD_ATU-XniHmM_EaOiBc5Gen93QkqVO2jfY,64184
+dar_backup-0.6.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dar_backup-0.6.6.dist-info/entry_points.txt,sha256=x9vnW-JEl8mpDJC69f_XBcn0mBSkV1U0cyvFV-NAP1g,126
+dar_backup-0.6.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+dar_backup-0.6.6.dist-info/RECORD,,

dar_backup-0.6.5.dist-info/RECORD

@@ -1,13 +0,0 @@
-dar_backup/.darrc,sha256=3d9opAnnZGU9XLyQpTDsLtgo6hqsvZ3JU-yMLz-7_f0,2110
-dar_backup/__about__.py,sha256=_f8whmZJ36ZCTk0Zldzy3KONxDBm0bxyKt7pCSHC3cE,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.5.dist-info/METADATA,sha256=z0xQGBCg2sGMi93gtNCK0DXINE1ZgsohQbQh0zutlD4,63802
-dar_backup-0.6.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dar_backup-0.6.5.dist-info/entry_points.txt,sha256=x9vnW-JEl8mpDJC69f_XBcn0mBSkV1U0cyvFV-NAP1g,126
-dar_backup-0.6.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-dar_backup-0.6.5.dist-info/RECORD,,