From 385bca84a73a2f00f46831ad8c20e5003df38d69 Mon Sep 17 00:00:00 2001 From: pikachu <40382944+pic4xiu@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:12:07 +0800 Subject: [PATCH 1/2] Modify log.py to adapt to Windows Solve the log path problem on Windows --- d810/log.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/d810/log.py b/d810/log.py index 685f79f..29c5f35 100644 --- a/d810/log.py +++ b/d810/log.py @@ -2,21 +2,29 @@ import shutil import logging import logging.config +import platform LOG_CONFIG_FILENAME = "log.ini" LOG_FILENAME = "d810.log" Z3_TEST_FILENAME = "z3_check_instructions_substitution.py" +def check_platform(): + return platform.system() == "Windows" + +def normalize_path(path): + return path.replace('\\', '/') def clear_logs(log_dir): shutil.rmtree(log_dir, ignore_errors=True) - def configure_loggers(log_dir): os.makedirs(log_dir, exist_ok=True) log_main_file = os.path.join(log_dir, LOG_FILENAME) z3_test_file = os.path.join(log_dir, Z3_TEST_FILENAME) log_conf_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), LOG_CONFIG_FILENAME) + if check_platform(): + log_main_file=normalize_path(log_main_file) + z3_test_file=normalize_path(z3_test_file) logging.config.fileConfig(log_conf_file, defaults={"default_log_filename": log_main_file, "z3_log_filename": z3_test_file}) z3_file_logger = logging.getLogger('D810.z3_test') From 73f4f4cdb076d83738f30eefdc34d0a2de737d14 Mon Sep 17 00:00:00 2001 From: pikachu <40382944+pic4xiu@users.noreply.github.com> Date: Sat, 14 Sep 2024 13:51:08 +0800 Subject: [PATCH 2/2] Update log.py --- d810/log.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/d810/log.py b/d810/log.py index 29c5f35..fb26f41 100644 --- a/d810/log.py +++ b/d810/log.py @@ -11,7 +11,7 @@ def check_platform(): return platform.system() == "Windows" -def normalize_path(path): +def normalize_path_for_Windows(path): return path.replace('\\', '/') def clear_logs(log_dir): @@ -23,8 +23,8 @@ def configure_loggers(log_dir): z3_test_file = os.path.join(log_dir, Z3_TEST_FILENAME) log_conf_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), LOG_CONFIG_FILENAME) if check_platform(): - log_main_file=normalize_path(log_main_file) - z3_test_file=normalize_path(z3_test_file) + log_main_file=normalize_path_for_Windows(log_main_file) + z3_test_file=normalize_path_for_Windows(z3_test_file) logging.config.fileConfig(log_conf_file, defaults={"default_log_filename": log_main_file, "z3_log_filename": z3_test_file}) z3_file_logger = logging.getLogger('D810.z3_test')