Use command line args and config more

[loctrkd.git] / gps303 / config.py

diff --git a/gps303/config.py b/gps303/config.py
index 6102e4ab8c5f5fa6f3ef74f129f432696bd9f958..fe4f696faa201474ea03de47a80b8c46ab42c2fe 100644 (file)
--- a/gps303/config.py
+++ b/gps303/config.py
@@ -5,20 +5,25 @@ DBFN = "/var/lib/gps303/gps303.sqlite"
 
 def readconfig(fname):
     config = ConfigParser()
+    config["daemon"] = {
+        "port": PORT,
+        "dbfn": DBFN,
+    }
+    config["device"] = {}
+    #_print_config(config)
+    #print("now reading", fname)
     config.read(fname)
-    if not config.has_section("daemon"):
-        config.add_section("daemon")
-    if not config.has_option("daemon", "port"):
-        config["daemon"]["port"] = str(PORT)
-    if not config.has_option("daemon", "dbfn"):
-        config["daemon"]["dbfn"] = DBFN
+    #_print_config(config)
     return config
 
-if __name__ == "__main__":
-    from sys import argv
-    conf = readconfig(argv[1])
+def _print_config(conf):
     for section in conf.sections():
         print("section", section)
         for option in conf.options(section):
             print("    ", option, conf[section][option])
+
+if __name__ == "__main__":
+    from sys import argv
+    conf = readconfig(argv[1])
+    _print_config(conf)
     print("binaryswitch", int(conf.get("device", "binaryswitch"), 0))