From e917397d2bcd8157b35b7d91f5a2cb5329e00dc4 Mon Sep 17 00:00:00 2001 From: Martin Schett Date: Sat, 16 Jan 2021 17:05:23 +0100 Subject: [PATCH] Added sysargs for metadata file and image folder --- iotclient/iot_client.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/iotclient/iot_client.py b/iotclient/iot_client.py index 9a6d5c4..401e1d5 100644 --- a/iotclient/iot_client.py +++ b/iotclient/iot_client.py @@ -4,7 +4,7 @@ import requests import json import time from datetime import datetime - +import sys, getopt def build_post_payload(identifier, metadata_payload, file_payload): return { @@ -198,17 +198,32 @@ metadata_path = metadata_folder + os.path.sep + metadata_file image_folder = "." + os.path.sep + "images" +try: + opts, args = getopt.getopt(sys.argv[1:],"hm:i:",["metadata=","imagefolder="]) + for opt, arg in opts: + if opt == '-h': + print('iot_client.py -m -i ') + sys.exit() + elif opt in ("-m", "--metadata"): + metadata_path = arg + elif opt in ("-i", "--imagefolder"): + image_folder = arg +except getopt.GetoptError: + print('iot_client.py -m -i ') + + + if (os.path.isfile(metadata_path)): print("Loading metadata to memory from " + metadata_path) - metadata = sorted(json.load(open(metadata_file, "r")), + metadata = sorted(json.load(open(metadata_path, "r")), key=lambda k: datetime.strptime(k['datetime'], '%d-%b-%Y (%H:%M:%S.%f)')) else: - print("Default metadata_file not found.") + print("Metadata_file '" + str(metadata_path) + "' not found.") if (os.path.isdir(image_folder)): print("Image folder set to " + image_folder) else: - print("Default image folder not found.") + print("Image folder '" + str(image_folder) + "' not found.") def print_cursor(): @@ -294,7 +309,7 @@ while (command.lower() not in ["exit", "quit", "end"]): print("Error: No file on path " + path) continue print("Loading metadata to memory from " + path) - metadata = sorted(json.load(open(metadata_file, "r")), + metadata = sorted(json.load(open(path, "r")), key=lambda k: datetime.strptime(k['datetime'], '%d-%b-%Y (%H:%M:%S.%f)')) index = 0