mirror of
https://github.com/Project-Babble/ProjectBabble.git
synced 2026-11-20 09:01:16 -08:00
(tweak) Move logger to own file
- Remove duplicate console prints - Strip ANSI escape codes - BUG: Inner C/C++ Exceptions are not handled
This commit is contained in:
1 parent
f9ff263208
commit
3be3d9a42c
2 files changed
+48
-47
No files matched your search
+2
-47
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
Reference in new issue
Block a user