diff --git a/BabbleApp/babbleapp.py b/BabbleApp/babbleapp.py index e4017f5..1ae005b 100644 --- a/BabbleApp/babbleapp.py +++ b/BabbleApp/babbleapp.py @@ -35,6 +35,7 @@ from calib_settings_widget import CalibSettingsWidget from notification_manager import NotificationManager 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 @@ -74,6 +75,7 @@ def timerResolution(toggle): else: winmm.timeEndPeriod(1) + async def check_for_updates(config, notification_manager): if config.settings.gui_update_check: try: @@ -98,6 +100,7 @@ async def check_for_updates(config, notification_manager): async def async_main(): EnsurePath() + setup_logging() # Get Configuration config: BabbleConfig = BabbleConfig.load() @@ -333,9 +336,6 @@ async def async_main(): if setting.started(): setting.render(window, event, values) - # Does adding this help? - # await asyncio.sleep(0) - def main(): asyncio.run(async_main()) diff --git a/BabbleApp/logger.py b/BabbleApp/logger.py new file mode 100644 index 0000000..d94f1e5 --- /dev/null +++ b/BabbleApp/logger.py @@ -0,0 +1,79 @@ +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(f"Python Version: {platform.python_version()}") + 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") + 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") + + # 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) + + log_system_info(logger) \ No newline at end of file