diff --git a/auto_import_v2.py b/auto_import_v2.py index d8dc2c1..2723eae 100644 --- a/auto_import_v2.py +++ b/auto_import_v2.py @@ -40,7 +40,7 @@ class mqtt_sender(): mqtt_s = mqtt_sender("mqtt.home.lan", 1883, "jaydee", "jaydee1") -mqtt_s.send_mqtt_message("sectorq/auto_import/job", {"status": "started","file":""}) +mqtt_s.send_mqtt_message("sectorq/auto_import/job", {"status": "started","file":"","device":""}) @@ -196,7 +196,7 @@ for d in import_drives: cmnd = "mkdir -p {}".format(_FDEST) status, output = subprocess.getstatusoutput(cmnd) logging.debug("Moving file {} into {}".format(filename, _FDEST)) - mqtt_s.send_mqtt_message("sectorq/auto_import/job", {"status": "started","file":filename}) + mqtt_s.send_mqtt_message("sectorq/auto_import/job", {"status": "started","file":filename,"device":_DEV}) try: shutil.move("{}/{}".format(FULL_PATH,filename),_FDEST) @@ -214,7 +214,7 @@ for d in import_drives: subprocess.getstatusoutput(myCmd) else: logging.debug(f"File: {file_or_dir}") - mqtt_s.send_mqtt_message("sectorq/auto_import/job", {"status": "started","file":file_or_dir}) + mqtt_s.send_mqtt_message("sectorq/auto_import/job", {"status": "started","file":file_or_dir,"device":_DEV}) try: shutil.move("{}/{}".format(_DEV_DIR,file_or_dir),_FDEST) @@ -225,7 +225,7 @@ for d in import_drives: logging.debug("failed to move file {}".format(file_or_dir)) else: logging.debug("Nothing to import") - mqtt_s.send_mqtt_message("sectorq/auto_import/job", {"status": "finished","file":f"{files_imported}"}) + mqtt_s.send_mqtt_message("sectorq/auto_import/job", {"status": "finished","file":f"{files_imported}","device":_DEV}) else: logging.debug("Unknown device")