Shift functions around for poetry

bmspy/bms.py

@@ -29,6 +29,7 @@ try:
     writeapi = None
 except:
     can_export_influxdb = False
+    influxclient = None
 
 DAEMON_UPDATE_PERIOD = 30
 SERIALPORT = "/dev/ttyUSB0"
@@ -550,21 +551,6 @@ def collect_data():
     return data
 
 
-def main():
-    global debug
-    data = dict()
-    while bool(data) is False:
-        data = collect_data()
-        time.sleep(1)
-
-    if args.report_json:
-        print(json.dumps(data))
-
-    elif args.report_print:
-        pp = pprint.PrettyPrinter(indent=4)
-        pp.pprint(data)
-
-
 def prometheus_export(daemonize=True, filename=None):
     global debug
     if not can_export_prometheus:
@@ -738,12 +724,7 @@ def influxdb_create_snapshot(data):
     return points
 
 
-
+def parse_args():
-if __name__ == '__main__':
-    debug = 0
-    atexit.register(cleanup)
-    atexit.register(shutdown)
-    try:
     parser = argparse.ArgumentParser(
                 description='Query JBD BMS and report status',
                 add_help=True,
@@ -769,6 +750,13 @@ if __name__ == '__main__':
     parser.add_argument('--verbose', '-v', action='count',
                 default=0, help='Print more verbose information (can be specified multiple times)')
     args = parser.parse_args()
+    return args
+
+
+def main():
+    global debug
+    try:
+        args = parse_args()
 
         debug=args.verbose
 
@@ -791,6 +779,24 @@ if __name__ == '__main__':
         elif args.report_textfile:
             prometheus_export(daemonize=False, filename=args.report_textfile)
         else:
-            main()
+            data = dict()
+            while bool(data) is False:
+                data = collect_data()
+                time.sleep(1)
+
+            if args.report_json:
+                print(json.dumps(data))
+
+            elif args.report_print:
+                pp = pprint.PrettyPrinter(indent=4)
+                pp.pprint(data)
     except KeyboardInterrupt:
         cleanup()
+
+
+
+if __name__ == '__main__':
+    debug = 0
+    atexit.register(cleanup)
+    atexit.register(shutdown)
+    main()