From c72aa231c7509e4b39f2e679a870cb245bdc1fc8 Mon Sep 17 00:00:00 2001 From: jaydee Date: Thu, 21 Aug 2025 11:45:53 +0200 Subject: [PATCH] build --- omv_backup.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/omv_backup.py b/omv_backup.py index d736c00..bd10779 100755 --- a/omv_backup.py +++ b/omv_backup.py @@ -616,7 +616,7 @@ if _BACKUP: logging.info("Removing old dirs") # input("????") #cmnd = "find {} -maxdepth 1 -type d -mtime +30 -exec rm -rf {{}} \;".format(BACKUP_DIR) - cmnd = f"cd {BACKUP_ROOT} find ./ -maxdepth 1 -type d -mmin +30 -exec rm -rf {{}} \\;" + #cmnd = f"cd {BACKUP_ROOT} find ./ -maxdepth 1 -type d -mmin +30 -exec rm -rf {{}} \\;" cmnd = "ls {BACKUP_ROOT}" @@ -627,7 +627,7 @@ if _BACKUP: status, output = subprocess.getstatusoutput(cmnd) for f in output.splitlines(): pattern = r"^[0-9]{4}.*" # regex pattern: string starts with 'abc' - + logging.info(f"Checking {f}") if re.match(pattern, f): logging.info("Match!") dt = datetime.datetime.strptime(f, "%Y-%m-%d_%H-%M-%S") @@ -638,10 +638,21 @@ if _BACKUP: if x > "2592000": dir_path = "{BACKUP_ROOT}/{f}" logging.info(f"removing {dir_path}") - #shutil.rmtree(dir_path) + shutil.rmtree(dir_path) else: print("No match.") - + + cmnd = "ls {BACKUP_ROOT}|grep _running" + #print(cmnd) + # input("????") + logging.info(f"removing obsolete dirs") + if _EXECUTE: + status, output = subprocess.getstatusoutput(cmnd) + for f in output.splitlines(): + dir_path = "{BACKUP_ROOT}/{f}" + logging.info(f"removing {dir_path}") + shutil.rmtree(dir_path) + now = datetime.datetime.now() ENDTIME = now.strftime("%Y-%m-%d_%H:%M:%S") #msg = {"status":"finished","bak_name":b,"start_time":DATETIME,"end_time":ENDTIME,"progress":0}