From 07ee03bdca822d5d6b74ffabe5a4deae2daf3765 Mon Sep 17 00:00:00 2001 From: jaydee Date: Sat, 11 Jan 2025 03:13:20 +0100 Subject: [PATCH] lala --- omv_backup_v2.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/omv_backup_v2.py b/omv_backup_v2.py index 77b5c3d..8116ffb 100644 --- a/omv_backup_v2.py +++ b/omv_backup_v2.py @@ -132,6 +132,8 @@ print("Starting") print(_RESTORE) if _RESTORE: print("Starting Restore") + now = datetime.datetime.now() + STARTTIME = now.strftime("%Y-%m-%d_%H:%M:%S") if _APP == "all": _APP = ["nginx","ha","gitlab","mailu","bitwarden","esphome","grafana","ingluxdb","kestra","matter-server","mosquitto","octoprint","octoprint2","pihole","unify_block","webhub"] else: @@ -168,7 +170,7 @@ if _RESTORE: msg = {"status":"started","bak_name":app,"start_time":DATETIME,"end_time":"in progress", "progress":0} client.connect(broker,1883,60) - client.publish(topic, json.dumps(msg)) + client.publish(topic, json.dumps(msg),2,True) client.disconnect() print("Create backup dir") @@ -280,7 +282,7 @@ if _RESTORE: ENDTIME = now.strftime("%Y-%m-%d_%H:%M:%S") msg = {"status":"finished","bak_name":app,"start_time":DATETIME,"end_time":ENDTIME,"progress":0} client.connect(broker,1883,10) - client.publish(topic, json.dumps(msg)) + client.publish(topic, json.dumps(msg),2,True) client.disconnect() now = datetime.datetime.now() @@ -289,7 +291,7 @@ if _RESTORE: msg = {"mode":_MODE,"status":"finished","bak_name":"complete","start_time":STARTTIME,"end_time":ENDJOB,"progress":0,"used_space":"?"} print(msg) client.connect(broker,1883,10) - client.publish(topic_sum, json.dumps(msg)) + client.publish(topic_sum, json.dumps(msg),2,True) client.disconnect() if _MODE == "auto": @@ -313,7 +315,7 @@ if _BACKUP: now = datetime.datetime.now() STARTTIME = now.strftime("%Y-%m-%d_%H:%M:%S") msg = {"mode":_MODE, "status":"started","bak_name":"complete","host":"","cur_job":"","start_time":STARTTIME,"end_time":"in progress","progress":0,"finished":",".join(finished)} - client.publish(topic_sum, json.dumps(msg)); + client.publish(topic_sum, json.dumps(msg),2,True); client.disconnect() # iterate over files in # that directory @@ -354,7 +356,7 @@ if _BACKUP: # msg = {"status":"started","bak_name":b,"start_time":DATETIME,"end_time":"in progress", "progress":0} msg = {"mode":_MODE, "status":"started","bak_name":"complete","host":host,"cur_job":b,"start_time":STARTTIME,"end_time":"in progress","progress":0,"finished":",".join(finished)} client.connect(broker,1883,60) - client.publish(topic, json.dumps(msg)) + client.publish(topic, json.dumps(msg),2,True) client.disconnect() cmnd = "mkdir -p " + NEW_BACKUP_DIR @@ -423,7 +425,7 @@ if _BACKUP: finished.append(b) msg = {"mode":_MODE, "status":"finished","bak_name":"complete","host":host,"cur_job":b,"start_time":ENDTIME,"end_time":"in progress","progress":0,"finished":",".join(finished)} client.connect(broker,1883,10) - client.publish(topic, json.dumps(msg)) + client.publish(topic, json.dumps(msg),2,True) client.disconnect() print("Getting size of FS") @@ -441,7 +443,7 @@ if _BACKUP: client.connect(broker,1883,10) - client.publish(topic_sum, json.dumps(msg)) + client.publish(topic_sum, json.dumps(msg),2,True) client.disconnect() os.remove(filename.path)