update read_settings.py and main.py

rename debuglevellogfile to debuglevel_logfile and import old settings
Honey-Pi · Jan 20, 2021 · f1f3de5 · f1f3de5
1 parent b2150b1
commit f1f3de5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/main.py b/main.py
@@ -156,7 +156,7 @@ def main():
         fh.setLevel(logging.getLevelName(debuglevel_logfile))
         ch.setLevel(logging.getLevelName(debuglevel))
         print("Debuglevel: " + logging.getLevelName(debuglevel))
-        print("debuglevel_logfile: " + logging.getLevelName(debuglevel_logfile))
+        print("Debuglevel logfile: " + logging.getLevelName(debuglevel_logfile))
         time.sleep(5)
         if debuglevel <= 10:
             debug = True # flag to enable debug mode (HDMI output enabled and no rebooting)

diff --git a/read_settings.py b/read_settings.py
@@ -123,18 +123,22 @@ def validate_settings(settings):
     try:
         settings["debuglevel_logfile"]
     except:
-        # Migrate debug to debuglevel
+        # Migrate debuglevellogfile to debuglevel_logfile
         try:
-            settings["debug"]
-            if settings["debug"]:
-                settings["debuglevel_logfile"] = 10
-            else:
-                settings["debuglevel_logfile"] = get_defaults()["debuglevel_logfile"]
-            updateSettingsFile = True
-            #settings.remove("debug")
+            settings["debuglevel_logfile"] = settings["debuglevellogfile"]
+            # Migrate debug to debuglevel
         except:
-            settings["debuglevel_logfile"] = get_defaults()["debuglevel_logfile"]
-            updateSettingsFile = True
+            try:
+                settings["debug"]
+                if settings["debug"]:
+                    settings["debuglevel_logfile"] = 10
+                else:
+                    settings["debuglevel_logfile"] = get_defaults()["debuglevel_logfile"]
+                updateSettingsFile = True
+                #settings.remove("debug")
+            except:
+                settings["debuglevel_logfile"] = get_defaults()["debuglevel_logfile"]
+                updateSettingsFile = True
 
     try:
         settings["debuglevel"]