improve logging

Author: arch

contrib/Installer/assets/main.lua.next

@@ -44,7 +44,7 @@ function start_funscript_generator()
     end
 
     scriptIdx = ofs.ActiveIdx()
-    local tmpFile = ofs.ExtensionDir() .. "/" .. tmpFileName 
+    local tmpFile = ofs.ExtensionDir() .. "/" .. tmpFileName
     local video = player.CurrentVideo()
     local script = ofs.Script(scriptIdx)
     local currentTimeMs = player.CurrentTime() * 1000
@@ -77,7 +77,7 @@ function start_funscript_generator()
     end
 
     table.insert(args, "--generator")
-    
+
     if multiaxis then;
         table.insert(args, "--multiaxis")
     end
@@ -140,7 +140,7 @@ function import_funscript_generator_json_result()
         print('Funscript Generator json output file not found')
         return
     end
-    
+
     local content = f:read("*a")
     f:close()
     json_body = json.decode(content)

funscript_editor/api.py

@@ -13,7 +13,7 @@
 
 def show_editor() -> None:
     """ Show the Funscript Editor Main Window """
-    setup_logging()
+    setup_logging(silent=False)
     logging.info("Python Funscript Editor %s", VERSION)
     logging.info("Startup Path: %s", str(os.getcwd()))
     app = QtWidgets.QApplication(sys.argv)
@@ -37,7 +37,7 @@ def generate_funscript(
         output_file (str): path for the output file
         include_multiaxis_options (bool): include options for multiaxis output
     """
-    setup_logging()
+    setup_logging(silent=True)
     logging.info("Python Funscript Generator %s", VERSION)
     logging.info("Startup Path: %s", str(os.getcwd()))
     logging.info("Args: video_file=%s, start_time=%s, end_time=%s, output_file=%s", \

funscript_editor/config/logging_windows.yaml

@@ -23,5 +23,5 @@ handlers:
 
 root:
     level: NOTSET
-    handlers: [file_handler]
+    handlers: [file_handler, console]
     propogate: yes

funscript_editor/config/settings.yaml

@@ -39,8 +39,5 @@ dark_theme: False
 # enable the tracking plausiblity check
 tracking_plausibility_check: False
 
-# enable logging on windows. logging cause some problems on windows only enable for debugging.
-logging: False
-
 # timeout for an ffmpeg stream
 ffmpeg_timeout_in_seconds: 15

funscript_editor/utils/logging.py

@@ -8,7 +8,6 @@
 import logging.config
 
 from funscript_editor.definitions import WINDOWS_LOG_CONFIG_FILE, LINUX_LOG_CONFIG_FILE
-from funscript_editor.utils.config import SETTINGS
 
 
 def create_log_directories(config: dict) -> None:
@@ -116,13 +115,7 @@ def getLogger(name) -> LoggerInterface:
     Args:
         name (str): name of the logger instance
     """
-    if platform.system() == 'Windows':
-        if SETTINGS['logging']:
-            return PythonLogger(name)
-        else:
-            return DevZeroLogger(name)
-    else:
-        return PythonLogger(name)
+    return PythonLogger(name)
 
 
 def get_logfiles_paths() -> list:
@@ -145,6 +138,7 @@ def get_logfiles_paths() -> list:
 
 
 def setup_logging(
+        silent=False,
         default_level :int = logging.INFO,
         env_key :str = 'LOG_CFG') -> None:
     """ Logging Setup
@@ -160,16 +154,22 @@ def setup_logging(
         with open(config_path, 'rt') as f:
             try:
                 config = yaml.safe_load(f.read())
+                if silent:
+                    if "console" in config["root"]["handlers"]:
+                        config["root"]["handlers"] = [x for x in config["root"]["handlers"] if x != "console"]
                 create_log_directories(config)
                 logging.config.dictConfig(config)
-                coloredlogs.install(level=default_level)
+                if not silent:
+                    coloredlogs.install(level=default_level)
                 logging.debug('Loging setup completed')
             except Exception as e:
                 print(e)
                 print('Error in Logging Configuration. Using default configs')
                 logging.basicConfig(level=default_level)
-                coloredlogs.install(level=default_level)
+                if not silent:
+                    coloredlogs.install(level=default_level)
     else:
         logging.basicConfig(level=default_level)
-        coloredlogs.install(level=default_level)
+        if not silent:
+            coloredlogs.install(level=default_level)
         print('Failed to load configuration file. Using default configs')