Merge branch 'dev' of https://github.com/Fangt-ing/speedtest-cli into raspShield

# Conflicts:
#	speedtest.py

runtest.py

@@ -0,0 +1,19 @@
+
+import subprocess
+import time
+import datetime
+
+
+if __name__ == "__main__":
+    # Replace 'script.py' with the name of the Python script you want to run
+    script_path = "speedtest.py"
+    schedule_time = "23:38"
+    repeat_count = 2
+    while True:
+        current_time = datetime.datetime.now().strftime("%H:%M")
+        if current_time == schedule_time:
+            for i in range(repeat_count):
+                subprocess.run(["python", script_path])
+            break
+        else:
+            time.sleep(1)

speedtest.py

@@ -2000,33 +2000,21 @@ def shell():
     utilities.convert_and_save_to_xlsx(str(results), "tmp/f24-ch1-coi-db0-Shield.xlsx")
 
 
-def main(iteration=1):
+def main():
-    for i in range(iteration):
+    try:
-        try:
+        shell()
-            shell()
+    except KeyboardInterrupt:
-        except KeyboardInterrupt:
+        printer('\nCancelling...', error=True)
-            printer('\nCancelling...', error=True)
+    except (SpeedtestException, SystemExit):
-        except (SpeedtestException, SystemExit):
+        e = get_exception()
-            e = get_exception()
+        # Ignore a successful exit, or argparse exit
-            # Ignore a successful exit, or argparse exit
+        if getattr(e, 'code', 1) not in (0, 2):
-            if getattr(e, 'code', 1) not in (0, 2):
+            msg = '%s' % e
-                msg = '%s' % e
+            if not msg:
-                if not msg:
+                msg = '%r' % e
-                    msg = '%r' % e
+            raise SystemExit('ERROR: %s' % msg)
-                raise SystemExit('ERROR: %s' % msg)
+
-        i+=1
-        if i == iteration:
-            break
 
 
 if __name__ == '__main__':
-    schedule_time = "19:39"
+    main()
-    repeat_count = 0
-    while True:
-        current_time = datetime.datetime.now().strftime("%H:%M")
-        if current_time == schedule_time:
-            main(500)
-            break
-        else:
-            time.sleep(1)
-    # main(5)