diff --git a/omv_backup_v2.py b/omv_backup_v2.py index a10f8e0..0372543 100644 --- a/omv_backup_v2.py +++ b/omv_backup_v2.py @@ -76,7 +76,7 @@ client.username_pw_set(mqtt_username, mqtt_password) client.connect(broker,1883,60) now = datetime.datetime.now() STARTTIME = now.strftime("%Y-%m-%d_%H:%M:%S") -msg = {"mode":_MODE, "status":"started","bak_name":"complete","start_time":STARTTIME,"end_time":"in progress","progress":0} +msg = {"mode":_MODE, "status":"started","bak_name":"complete","host":"","cur_job":"","start_time":STARTTIME,"end_time":"in progress","progress":0} client.publish(topic_sum, json.dumps(msg)); client.disconnect() @@ -312,6 +312,7 @@ if _BACKUP: else: # iterate over files in # that directory + finished = [] for filename in os.scandir(directory): if filename.is_file(): print(filename.path) @@ -345,7 +346,8 @@ if _BACKUP: FULL_BACKUP_LATEST = f"{BACKUP_ROOT}/latest" - msg = {"status":"started","bak_name":b,"start_time":DATETIME,"end_time":"in progress", "progress":0} + # msg = {"status":"started","bak_name":b,"start_time":DATETIME,"end_time":"in progress", "progress":0} + msg = {"mode":_MODE, "status":"started","bak_name":b,"host":host,"cur_job":b,"start_time":STARTTIME,"end_time":"in progress","progress":0} client.connect(broker,1883,60) client.publish(topic, json.dumps(msg)) client.disconnect() @@ -409,7 +411,9 @@ if _BACKUP: status, output = subprocess.getstatusoutput(cmnd) 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} + #msg = {"status":"finished","bak_name":b,"start_time":DATETIME,"end_time":ENDTIME,"progress":0} + finished.append(b) + msg = {"mode":_MODE, "status":"finished","bak_name":b,"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.disconnect() @@ -423,7 +427,8 @@ if _BACKUP: ENDJOB = now.strftime("%Y-%m-%d_%H:%M:%S") print("Size : {}".format(used_space)) print("Sending finished status") - msg = {"mode":_MODE,"status":"finished","bak_name":"complete","start_time":STARTTIME,"end_time":ENDJOB,"progress":0,"used_space":used_space} + #msg = {"mode":_MODE,"status":"finished","bak_name":"complete","start_time":STARTTIME,"end_time":ENDJOB,"progress":0,"used_space":used_space} + msg = {"mode":_MODE, "status":"finished","bak_name":"complete","host":host,"cur_job":b,"start_time":STARTTIME,"end_time":ENDTIME,"progress":0,"finished":",".join(finished)} print(msg)