From f9ff2632085c5c3ee025284e2c93eedcb938745e Mon Sep 17 00:00:00 2001 From: Benjamin Evans <51272212+dfgHiatus@users.noreply.github.com> Date: Tue, 14 Jan 2025 20:27:46 -0600 Subject: [PATCH 1/5] (feat) Start of persistent logging --- BabbleApp/babbleapp.py | 50 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/BabbleApp/babbleapp.py b/BabbleApp/babbleapp.py index 18e2587..836d011 100644 --- a/BabbleApp/babbleapp.py +++ b/BabbleApp/babbleapp.py @@ -17,6 +17,8 @@ Copyright (c) 2023 Project Babble <3 """ import os +import sys +import logging import PySimpleGUI as sg import queue import requests @@ -25,7 +27,7 @@ from ctypes import windll, c_int from babble_model_loader import * from camera_widget import CameraWidget from config import BabbleConfig -from tab import CamInfo, Tab +from tab import Tab from osc import VRChatOSCReceiver, VRChatOSC from general_settings_widget import SettingsWidget from algo_settings_widget import AlgoSettingsWidget @@ -60,6 +62,50 @@ CALIB_SETTINGS_RADIO_NAME = "-CALIBSETTINGSRADIO-" page_url = "https://github.com/SummerSigh/ProjectBabble/releases/latest" appversion = "Babble v2.1.0 Beta" +def setupLogging(): + # Determine the user's Documents directory + documents_dir = os.path.join(os.path.expanduser("~"), "Documents") + log_dir = os.path.join(documents_dir, "ProjectBabble") + os.makedirs(log_dir, exist_ok=True) + + log_file = os.path.join(log_dir, "latest.log") + + # Set up logging + logger = logging.getLogger("debug_logger") + logger.setLevel(logging.DEBUG) + + # File handler for logging to file + file_handler = logging.FileHandler(log_file, mode='w', encoding='utf-8') + file_handler.setLevel(logging.DEBUG) + formatter = logging.Formatter('%(asctime)s - %(message)s', datefmt='%Y-%m-%d %H:%M:%S') + file_handler.setFormatter(formatter) + + logger.addHandler(file_handler) + + # Optionally output to console as well + console_handler = logging.StreamHandler(sys.stdout) + console_handler.setLevel(logging.DEBUG) + console_handler.setFormatter(formatter) + logger.addHandler(console_handler) + + # Redirect stdout and stderr to logger + class StreamToLogger: + def __init__(self, stream, log_level): + self.stream = stream + self.log_level = log_level + + def write(self, message): + if message.strip(): + logger.log(self.log_level, message.strip()) + self.stream.write(message) + self.stream.flush() + + def flush(self): + self.stream.flush() + + sys.stdout = StreamToLogger(sys.stdout, logging.INFO) + sys.stderr = StreamToLogger(sys.stderr, logging.ERROR) + def timerResolution(toggle): if winmm != None: if toggle: @@ -72,6 +118,7 @@ def timerResolution(toggle): def main(): EnsurePath() + setupLogging() # Get Configuration config: BabbleConfig = BabbleConfig.load() @@ -343,6 +390,5 @@ def main(): if setting.started(): setting.render(window, event, values) - if __name__ == "__main__": main() From 3be3d9a42c0b992da51e47545065a7bbbda16cd2 Mon Sep 17 00:00:00 2001 From: dfgHiatus <51272212+dfgHiatus@users.noreply.github.com> Date: Fri, 17 Jan 2025 08:16:53 -0700 Subject: [PATCH 2/5] (tweak) Move logger to own file - Remove duplicate console prints - Strip ANSI escape codes - BUG: Inner C/C++ Exceptions are not handled --- BabbleApp/babbleapp.py | 49 ++---------------------------------------- BabbleApp/logger.py | 46 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 47 deletions(-) create mode 100644 BabbleApp/logger.py diff --git a/BabbleApp/babbleapp.py b/BabbleApp/babbleapp.py index 836d011..c949e89 100644 --- a/BabbleApp/babbleapp.py +++ b/BabbleApp/babbleapp.py @@ -17,8 +17,6 @@ Copyright (c) 2023 Project Babble <3 """ import os -import sys -import logging import PySimpleGUI as sg import queue import requests @@ -34,6 +32,7 @@ from algo_settings_widget import AlgoSettingsWidget from calib_settings_widget import CalibSettingsWidget from utils.misc_utils import EnsurePath, is_nt, bg_color_highlight, bg_color_clear from lang_manager import LocaleStringManager as lang +from logger import setup_logging winmm = None @@ -62,50 +61,6 @@ CALIB_SETTINGS_RADIO_NAME = "-CALIBSETTINGSRADIO-" page_url = "https://github.com/SummerSigh/ProjectBabble/releases/latest" appversion = "Babble v2.1.0 Beta" -def setupLogging(): - # Determine the user's Documents directory - documents_dir = os.path.join(os.path.expanduser("~"), "Documents") - log_dir = os.path.join(documents_dir, "ProjectBabble") - os.makedirs(log_dir, exist_ok=True) - - log_file = os.path.join(log_dir, "latest.log") - - # Set up logging - logger = logging.getLogger("debug_logger") - logger.setLevel(logging.DEBUG) - - # File handler for logging to file - file_handler = logging.FileHandler(log_file, mode='w', encoding='utf-8') - file_handler.setLevel(logging.DEBUG) - formatter = logging.Formatter('%(asctime)s - %(message)s', datefmt='%Y-%m-%d %H:%M:%S') - file_handler.setFormatter(formatter) - - logger.addHandler(file_handler) - - # Optionally output to console as well - console_handler = logging.StreamHandler(sys.stdout) - console_handler.setLevel(logging.DEBUG) - console_handler.setFormatter(formatter) - logger.addHandler(console_handler) - - # Redirect stdout and stderr to logger - class StreamToLogger: - def __init__(self, stream, log_level): - self.stream = stream - self.log_level = log_level - - def write(self, message): - if message.strip(): - logger.log(self.log_level, message.strip()) - self.stream.write(message) - self.stream.flush() - - def flush(self): - self.stream.flush() - - sys.stdout = StreamToLogger(sys.stdout, logging.INFO) - sys.stderr = StreamToLogger(sys.stderr, logging.ERROR) - def timerResolution(toggle): if winmm != None: if toggle: @@ -118,7 +73,7 @@ def timerResolution(toggle): def main(): EnsurePath() - setupLogging() + setup_logging() # Get Configuration config: BabbleConfig = BabbleConfig.load() diff --git a/BabbleApp/logger.py b/BabbleApp/logger.py new file mode 100644 index 0000000..2030ab0 --- /dev/null +++ b/BabbleApp/logger.py @@ -0,0 +1,46 @@ +import re +import logging +import os +import sys + +def strip_ansi_codes(text): + """Remove ANSI color codes from a string.""" + ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])') + return ansi_escape.sub('', text) + +def setup_logging(): + # Determine the user's Documents directory + documents_dir = os.path.join(os.path.expanduser("~"), "Documents") + log_dir = os.path.join(documents_dir, "ProjectBabble") + os.makedirs(log_dir, exist_ok=True) + log_file = os.path.join(log_dir, "latest.log") + + # Set up logging + logger = logging.getLogger("debug_logger") + logger.setLevel(logging.DEBUG) + + file_handler = logging.FileHandler(log_file, mode='w', encoding='utf-8') + file_handler.setLevel(logging.DEBUG) + formatter = logging.Formatter('%(asctime)s - %(message)s', datefmt='%Y-%m-%d %H:%M:%S') + file_handler.setFormatter(formatter) + + logger.addHandler(file_handler) + + # Redirect stdout and stderr + class StreamToLogger: + def __init__(self, stream, log_level): + self.stream = stream + self.log_level = log_level + + def write(self, message): + message = strip_ansi_codes(message) + if message.strip(): + logger.log(self.log_level, message.strip()) + self.stream.write(message) + self.stream.flush() + + def flush(self): + self.stream.flush() + + sys.stdout = StreamToLogger(sys.stdout, logging.INFO) + sys.stderr = StreamToLogger(sys.stderr, logging.ERROR) \ No newline at end of file From 9e17ad31365d1f412bd182baea7a295ab2819474 Mon Sep 17 00:00:00 2001 From: dfgHiatus <51272212+dfgHiatus@users.noreply.github.com> Date: Fri, 17 Jan 2025 08:24:31 -0700 Subject: [PATCH 3/5] (tweak) Add system hardware to logs --- BabbleApp/logger.py | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/BabbleApp/logger.py b/BabbleApp/logger.py index 2030ab0..5bfbc85 100644 --- a/BabbleApp/logger.py +++ b/BabbleApp/logger.py @@ -2,12 +2,41 @@ import re import logging import os import sys +import platform +import psutil def strip_ansi_codes(text): """Remove ANSI color codes from a string.""" ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])') return ansi_escape.sub('', text) +def log_system_info(logger): + """ + Logs basic system and hardware information to the provided logger. + """ + try: + # Operating system details + os_name = platform.system() + os_version = platform.version() + os_release = platform.release() + machine = platform.machine() + processor = platform.processor() + + # CPU and Memory + cpu_count = psutil.cpu_count(logical=True) + total_memory = psutil.virtual_memory().total // (1024 ** 2) # Convert bytes to MB + + logger.info("========== System Information ==========") + logger.info(f"Operating System: {os_name} {os_release} (Version: {os_version})") + logger.info(f"Architecture: {machine}") + logger.info(f"Processor: {processor}") + logger.info(f"Logical CPUs: {cpu_count}") + logger.info(f"Total Memory: {total_memory} MB") + logger.info("========================================") + except Exception as e: + logger.error(f"Failed to log system information: {e}") + + def setup_logging(): # Determine the user's Documents directory documents_dir = os.path.join(os.path.expanduser("~"), "Documents") @@ -43,4 +72,6 @@ def setup_logging(): self.stream.flush() sys.stdout = StreamToLogger(sys.stdout, logging.INFO) - sys.stderr = StreamToLogger(sys.stderr, logging.ERROR) \ No newline at end of file + sys.stderr = StreamToLogger(sys.stderr, logging.ERROR) + + log_system_info(logger) \ No newline at end of file From e81d5ae660f676c805e6cf68f4210df4b343f756 Mon Sep 17 00:00:00 2001 From: Benjamin Evans <51272212+dfgHiatus@users.noreply.github.com> Date: Fri, 31 Jan 2025 11:17:46 -0600 Subject: [PATCH 4/5] (tweak) Add python version --- BabbleApp/logger.py | 1 + 1 file changed, 1 insertion(+) diff --git a/BabbleApp/logger.py b/BabbleApp/logger.py index 5bfbc85..be6ceff 100644 --- a/BabbleApp/logger.py +++ b/BabbleApp/logger.py @@ -32,6 +32,7 @@ def log_system_info(logger): logger.info(f"Processor: {processor}") logger.info(f"Logical CPUs: {cpu_count}") logger.info(f"Total Memory: {total_memory} MB") + logger.info(f"Python Version: {platform.python_version()}") logger.info("========================================") except Exception as e: logger.error(f"Failed to log system information: {e}") From 92f9439cc265c8107c31d3e597b2aa367231c446 Mon Sep 17 00:00:00 2001 From: Rames The Generic Date: Fri, 31 Jan 2025 15:14:37 -0500 Subject: [PATCH 5/5] Log to program directory. --- BabbleApp/logger.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BabbleApp/logger.py b/BabbleApp/logger.py index be6ceff..d94f1e5 100644 --- a/BabbleApp/logger.py +++ b/BabbleApp/logger.py @@ -40,7 +40,8 @@ def log_system_info(logger): def setup_logging(): # Determine the user's Documents directory - documents_dir = os.path.join(os.path.expanduser("~"), "Documents") + #documents_dir = os.path.join(os.path.expanduser("~"), "Documents") + documents_dir = "./Logs" log_dir = os.path.join(documents_dir, "ProjectBabble") os.makedirs(log_dir, exist_ok=True) log_file = os.path.join(log_dir, "latest.log")