build

omv_backup.py

@@ -544,7 +544,7 @@ if _BACKUP:
                     #cmd = f"rsync -avz --delete {BACKUP_DIR} --link-dest {FULL_BACKUP_LATEST}/ --exclude=\"jellyfin/cache/transcodes\" --exclude=\"gitlab/logs/prometheus\" --exclude=\"home-assistant.log\" --exclude=\"gitlab/logs/*\" --exclude=\"esphome/config/.esphome\" --exclude=\".cache\" --exclude=\".git\" --exclude=\"var_lib_motioneye\" {NEW_BACKUP_DIR}"
                     #cmd = [ 'rsync', '-avz','--info=progress2', BACKUP_DIR , NEW_BACKUP_DIR]
                     
-                    cmd = ['rsync', '-avz', '--delete', BACKUP_DIR,  '--link-dest', FULL_BACKUP_LATEST, '--exclude="jellyfin/cache/transcodes"', '--exclude=".@__thumb/"', '--exclude="gitlab/logs/prometheus"', '--exclude="home-assistant.log"', '--exclude="gitlab/logs/*"', '--exclude="esphome/config/.esphome"', '--exclude=".cache"', '--exclude=".git"', '--exclude="var_lib_motioneye"', '--exclude="/.esphome/build"', NEW_BACKUP_DIR]
+                    cmd = ['rsync', '-avz', '--delete', BACKUP_DIR,  '--link-dest', FULL_BACKUP_LATEST, '--exclude="home-assistant_v2.db"', '--exclude="jellyfin/cache/transcodes"', '--exclude=".@__thumb/"', '--exclude="gitlab/logs/prometheus"', '--exclude="home-assistant.log"', '--exclude="gitlab/logs/*"', '--exclude="esphome/config/.esphome"', '--exclude=".cache"', '--exclude=".git"', '--exclude="var_lib_motioneye"', '--exclude="/.esphome/build"', NEW_BACKUP_DIR]
                     logging.info(" ".join(cmd))
                     process = subprocess.Popen(cmd,
                            stdout=subprocess.PIPE)
@@ -616,9 +616,9 @@ 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}"
+                    cmnd = f"ls {BACKUP_ROOT}"
                     
                     
                     #print(cmnd)
@@ -627,21 +627,32 @@ 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")
                                 epoch_time = int(dt.timestamp())
                                 now_epoch = int(datetime.datetime.now().timestamp())
                                 x = now_epoch - epoch_time
-                                logging.info(epoch_time)  # Output: 45
+                                # logging.info(epoch_time)  # Output: 45
-                                if x > "2592000":
+                                if x > 2592000:
-                                    dir_path = "{BACKUP_ROOT}/{f}"
+                                    dir_path = f"{BACKUP_ROOT}/{f}"
                                     logging.info(f"removing {dir_path}")
-                                    #shutil.rmtree(dir_path)
+                                    shutil.rmtree(dir_path)
                             else:
                                 print("No match.")
                                 
+                    cmnd = f"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}