dar-backup 0.6.8__py3-none-any.whl → 0.6.9__py3-none-any.whl

dar_backup/__about__.py

@@ -1 +1 @@
-__version__ = "0.6.8"
+__version__ = "0.6.9"

dar_backup/clean_log.py

@@ -0,0 +1,151 @@
+#!/usr/bin/env python3
+"""
+clean-log.py source code is here: https://github.com/per2jensen/dar-backup/tree/main/v2/src/dar_backup/clean-log.py
+This script is part of dar-backup, a backup solution for Linux using dar and systemd.
+
+Licensed under GNU GENERAL PUBLIC LICENSE v3, see the supplied file "LICENSE" for details.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW, 
+not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See section 15 and section 16 in the supplied "LICENSE" file
+
+This script can be used to remove (much of) the logged output from `dar`.
+When `dar` verbose options are enabled, quite a lot of information is emitted.
+"""
+
+
+import argparse
+import re
+import os
+import sys 
+
+from . import __about__ as about
+from dar_backup.config_settings import ConfigSettings
+
+LICENSE = '''Licensed under GNU GENERAL PUBLIC LICENSE v3, see the supplied file "LICENSE" for details.
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW, not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See section 15 and section 16 in the supplied "LICENSE" file.'''
+
+def clean_log_file(log_file_path, dry_run=False):
+    """Removes specific log lines from the given file using a memory-efficient streaming approach."""
+
+
+    if not os.path.isfile(log_file_path):
+        print(f"File '{log_file_path}' not found!")
+        sys.exit(1)
+
+    if not os.access(log_file_path, os.R_OK):
+        print(f"No read permission for '{log_file_path}'")
+        sys.exit(1)
+
+    if not os.access(log_file_path, os.W_OK):
+        print(f"Error: No write permission for '{log_file_path}'")
+        sys.exit(1)
+
+
+    if dry_run:
+        print(f"Performing a dry run on: {log_file_path}")
+
+    temp_file_path = log_file_path + ".tmp"
+    
+    patterns = [
+        r"INFO\s*-\s*<File",
+        r"INFO\s*-\s*<Attributes",
+        r"INFO\s*-\s*</Directory",
+        r"INFO\s*-\s*<Directory",
+        r"INFO\s*-\s*</File",
+        r"INFO\s*-\s*Inspecting\s*directory",
+        r"INFO\s*-\s*Finished\s*Inspecting"
+    ]
+
+    try:
+        with open(log_file_path, "r", errors="ignore") as infile, open(temp_file_path, "w") as outfile:
+
+            for line in infile:
+                original_line = line  # Store the original line before modifying it
+                matched = False  # Track if a pattern is matched
+
+                for pattern in patterns:
+                    if re.search(pattern, line):  # Check if the pattern matches
+                        if dry_run:
+                            print(f"Would remove: {original_line.strip()}")  # Print full line for dry-run
+                        matched = True  # Mark that a pattern matched
+                        line = re.sub(pattern, "", line).strip()  # Remove only matched part
+
+                if not dry_run and line:  # In normal mode, only write non-empty lines
+                    outfile.write(line.rstrip() + "\n")
+
+                if dry_run and matched:
+                    continue  # In dry-run mode, skip writing (since we’re just showing)
+
+        
+        # Ensure the temp file exists before renaming
+        if not os.path.exists(temp_file_path):
+            open(temp_file_path, "w").close()  # Create an empty file if nothing was written
+
+        os.replace(temp_file_path, log_file_path)
+        print(f"Successfully cleaned log file: {log_file_path}")
+
+    except Exception as e:
+        print(f"Error processing file: {e}")
+        sys.exit(1)
+
+
+    
+def main():
+    parser = argparse.ArgumentParser(
+        description="Clean dar-backup log file for `dar` output"
+    )
+    parser.add_argument(
+        "-f", "--file",
+        nargs="+",
+        type=str, help="Path(s) to the log file(s) that needs cleaning. Default is the log file specified in the configuration file."
+    )
+
+    parser.add_argument(
+        '-c', '--config-file',
+        type=str, help="Path to 'dar-backup.conf'",
+        default='~/.config/dar-backup/dar-backup.conf')
+
+    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",
+        version=f"%(prog)s version {about.__version__}, {LICENSE}"
+    )
+
+    args = parser.parse_args()
+
+    config_settings = ConfigSettings(os.path.expanduser(args.config_file))
+
+    if not args.file:
+        args.file = [config_settings.logfile_location]
+
+    for file_path in args.file:
+        if not isinstance(file_path, (str, bytes, os.PathLike)):
+            print(f"Error: Invalid file path type: {file_path}")
+            sys.exit(1)
+
+        if not os.path.exists(file_path):
+            print(f"Error: Log file '{file_path}' does not exist.")
+            sys.exit(1)
+
+        if file_path.strip() == "":
+            print(f"Error: Invalid empty filename '{file_path}'.")
+            sys.exit(1)
+
+
+    # Run the log file cleaning function
+    for log_file in args.file:
+        clean_log_file(log_file, dry_run=args.dry_run)
+    print(f"Log file '{args.file}' has been cleaned successfully.")
+
+
+if __name__ == "__main__":
+    main()

dar_backup/dar_backup.py

@@ -322,7 +322,7 @@ def list_contents(backup_name, backup_dir, selection=None):
         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))
+            raise RuntimeError(str(process))
         for line in stdout.splitlines():
             if "[--- REMOVED ENTRY ----]" in line or "[Saved]" in line:
                 print(line)

{dar_backup-0.6.8.dist-info → dar_backup-0.6.9.dist-info}/METADATA

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

dar_backup-0.6.9.dist-info/RECORD

@@ -0,0 +1,14 @@
+dar_backup/.darrc,sha256=-aerqivZmOsW_XBCh9IfbYTUvw0GkzDSr3Vx4GcNB1g,2113
+dar_backup/__about__.py,sha256=42fbYUSZonpHevrA9hTI2EzfgLNO9LBK95poG3HeDEQ,21
+dar_backup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dar_backup/clean_log.py,sha256=VXKA2BMyQmaC6R08Bq9a3wP3mczdFb_moy6HkL-mnF8,5176
+dar_backup/cleanup.py,sha256=9yEdRR84XPtEvBGc2QfwGBQl2tdTPttjetHeiSc_TsM,11419
+dar_backup/config_settings.py,sha256=CBMUhLOOZ-x7CRdS3vBDk4TYaGqC4N1Ot8IMH-qPaI0,3617
+dar_backup/dar_backup.py,sha256=hDy7aXU-XiWOtW40Pxql441liNkSYKGU76eOwy8m7fU,32714
+dar_backup/manager.py,sha256=HDa8eYF89QFhlBRR4EWRzzmswOW00S_w8ToZ5SARO_o,21359
+dar_backup/util.py,sha256=SSSJYM9lQZfubhTUBlX1xDGWmCpYEF3ePARmlY544xM,11283
+dar_backup-0.6.9.dist-info/METADATA,sha256=mqAzHZp_-X9pw8w77c4FA7QwXnKikkSodJ-oJnaFT3M,64610
+dar_backup-0.6.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dar_backup-0.6.9.dist-info/entry_points.txt,sha256=p6c4uQLjlTIVP1Od2iorGefrVUH0IWZdFRMl63mNaRg,164
+dar_backup-0.6.9.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+dar_backup-0.6.9.dist-info/RECORD,,

{dar_backup-0.6.8.dist-info → dar_backup-0.6.9.dist-info}/entry_points.txt

@@ -1,4 +1,5 @@
 [console_scripts]
+clean-log = dar_backup.clean_log:main
 cleanup = dar_backup.cleanup:main
 dar-backup = dar_backup.dar_backup:main
 manager = dar_backup.manager:main

dar_backup-0.6.8.dist-info/RECORD

@@ -1,13 +0,0 @@
-dar_backup/.darrc,sha256=-aerqivZmOsW_XBCh9IfbYTUvw0GkzDSr3Vx4GcNB1g,2113
-dar_backup/__about__.py,sha256=qbWTdDuFyvScwNj95KArnOcQph9tiLZZ8rgNJYlJ4AE,21
-dar_backup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dar_backup/cleanup.py,sha256=9yEdRR84XPtEvBGc2QfwGBQl2tdTPttjetHeiSc_TsM,11419
-dar_backup/config_settings.py,sha256=CBMUhLOOZ-x7CRdS3vBDk4TYaGqC4N1Ot8IMH-qPaI0,3617
-dar_backup/dar_backup.py,sha256=VbpyiCnoVvJuMWS7LO9wo8WIcDegCPVjb5Q7xN9J9Gg,32731
-dar_backup/manager.py,sha256=HDa8eYF89QFhlBRR4EWRzzmswOW00S_w8ToZ5SARO_o,21359
-dar_backup/util.py,sha256=SSSJYM9lQZfubhTUBlX1xDGWmCpYEF3ePARmlY544xM,11283
-dar_backup-0.6.8.dist-info/METADATA,sha256=U3iy7Gzz-D6p5UePy0VLzX2lNbELs0teKBEZXr-sSqc,64610
-dar_backup-0.6.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dar_backup-0.6.8.dist-info/entry_points.txt,sha256=x9vnW-JEl8mpDJC69f_XBcn0mBSkV1U0cyvFV-NAP1g,126
-dar_backup-0.6.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-dar_backup-0.6.8.dist-info/RECORD,,