From bbe4d7266687eeeba3bba66a4676f6f1a1b00e48 Mon Sep 17 00:00:00 2001
From: jaydee <jaydee@sectorq.eu>
Date: Mon, 1 Sep 2025 12:47:25 +0200
Subject: [PATCH] build

---
 omv_backup.py | 87 +++++++++++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 38 deletions(-)

diff --git a/omv_backup.py b/omv_backup.py
index 8ced86b..838fb13 100755
--- a/omv_backup.py
+++ b/omv_backup.py
@@ -478,12 +478,20 @@ def restore_job(_APP):
         cmnd = "ssh root@amd.home.lan 'systemctl suspend &'"
         status, output = subprocess.getstatusoutput(cmnd)
 
-def backup_job(server):
+def backup_job(pl):
     client2 = mqtt.Client()
     client2.username_pw_set("jaydee", "jaydee1")
     client2.connect("mqtt.home.lan",1883,60)
     logging.info(f'starting backup job')
     
+    server = pl["host"]
+    if pl["mode"] == "dry":
+        _DRYRUN = True
+        logging.info("Dry run active")
+    else:
+        _DRYRUN = False
+        logging.info("Full mode active")
+    
     finished = []
     now = datetime.datetime.now()
     STARTTIME = now.strftime("%Y-%m-%d_%H:%M:%S")
@@ -554,26 +562,26 @@ def backup_job(server):
         progress = 0
         cmd = ['rsync', '-avz', '--delete', BACKUP_DIR,  '--link-dest', FULL_BACKUP_LATEST, '--exclude-from=/myapps/exclude.txt', NEW_BACKUP_DIR]
         logging.info(" ".join(cmd))
-        process = subprocess.Popen(cmd,
-                stdout=subprocess.PIPE)
-        
-        while process.poll() is None:
-            line = process.stdout.readline().decode("utf-8").split("/")
-            print(line[0])
-            if line[0] in apps:
-                logging.info(f"Working on app {line[0]}")
-                while True:
-                    if line[0] != apps[0]:
-                        del apps[0]
-                        progress = progress + step
-                    else:
-                        break
-                apps.remove(line[0])
-                #print(len(apps))
-                topic = "sectorq/amd/backups"
-                msg = {"mode":_MODE, "status":"started","bak_name":"complete","host":host,"cur_job":b,"sub":line[0],"start_time":STARTTIME,"end_time":"in progress","progress":str(round(progress)) + "%","finished":",".join(finished)}
-                client2.publish(topic, json.dumps(msg),qos=0, retain=False)
-                progress = progress + step
+        if not _DRYRUN:
+            process = subprocess.Popen(cmd,
+                    stdout=subprocess.PIPE)
+            while process.poll() is None:
+                line = process.stdout.readline().decode("utf-8").split("/")
+                print(line[0])
+                if line[0] in apps:
+                    logging.info(f"Working on app {line[0]}")
+                    while True:
+                        if line[0] != apps[0]:
+                            del apps[0]
+                            progress = progress + step
+                        else:
+                            break
+                    apps.remove(line[0])
+                    #print(len(apps))
+                    topic = "sectorq/amd/backups"
+                    msg = {"mode":_MODE, "status":"started","bak_name":"complete","host":host,"cur_job":b,"sub":line[0],"start_time":STARTTIME,"end_time":"in progress","progress":str(round(progress)) + "%","finished":",".join(finished)}
+                    client2.publish(topic, json.dumps(msg),qos=0, retain=False)
+                    progress = progress + step
             
         cmnd = f"rm -rf {FULL_BACKUP_LATEST}"
         
@@ -589,7 +597,7 @@ def backup_job(server):
         logging.info("Creating new latest link")
         #print(cmnd)
     #    input("????")
-        if _EXECUTE:
+        if not _DRYRUN:
             status, output = subprocess.getstatusoutput(cmnd)
 
         #Remove old
@@ -597,7 +605,7 @@ def backup_job(server):
         
         cmnd = f"ls {BACKUP_ROOT}"
 
-        if _EXECUTE:
+        if not _DRYRUN:
             status, output = subprocess.getstatusoutput(cmnd)
             for f in output.splitlines():
                 pattern = r"^[0-9]{4}-[0-9]{2}-[0-9]{2}_[0-9]{2}-[0-9]{2}-[0-9]{2}$"  # regex pattern: string starts with 'abc'
@@ -619,7 +627,7 @@ def backup_job(server):
                     
         cmnd = f"ls {BACKUP_ROOT}|grep _running"
         logging.info(f"removing obsolete dirs")
-        if _EXECUTE:
+        if not _DRYRUN:
             status, output = subprocess.getstatusoutput(cmnd)
             for f in output.splitlines():
                 dir_path = f"{BACKUP_ROOT}/{f}"
@@ -650,11 +658,13 @@ def backup_job(server):
     topic = "sectorq/backups/start"
     logging.info(f"LALA : {topic}")
     client2.publish(topic, "finished",qos=0, retain=True)
+    time.sleep(1)
     client2.publish(topic, "finished2",qos=0, retain=True)
     client2.disconnect()
     #return "finished"
     
-    
+    if _DRYRUN:
+        return
     topic = "sectorq/amd/restore"
     for s in servers:
         logging.info(f"Restoring {s}")
@@ -752,20 +762,21 @@ def handle_payload(payload):
         pl = json.loads(payload)
     except:
         pl = payload
-    logging.info(pl)
-    return
-       
-    if payload == 'm-server':
-        logging.info("💡 Starting backup job")
-        backup_job(payload)
-        logging.info(f"💡 Finished backup job")
-    elif payload == 'nas':
-        logging.info("💡 Starting backup job")
-        backup_job(payload)
-        logging.info(f"💡 Finished backup job")
-    else:
-        logging.error(f"⚠️ Unknown command: {payload}")
+    logging.debug(pl)
 
+    if "host" in pl:
+        if pl["host"] == 'm-server':
+            logging.info("💡 Starting backup job")
+            backup_job(pl)
+            logging.info(f"💡 Finished backup job")
+        elif pl["host"] == 'nas':
+            logging.info("💡 Starting backup job")
+            backup_job(pl)
+            logging.info(f"💡 Finished backup job")
+        else:
+            logging.error(f"⚠️ Unknown command: {pl}")
+    else:
+            logging.error(f"⚠️ Wrong payload: {pl}")
 # Callback when connected
 def on_connect(client, userdata, flags, rc):
     if rc == 0: