merge version to allow nuitka build

.github/workflows/get_info.py

@@ -7,15 +7,24 @@
 import os
 import sys
 import rtoml
+import io
+
 
 sys.path.append(os.path.abspath(os.curdir))
 
+is_github = "-github" in sys.argv
+
+if is_github:
+    stdout = sys.stdout
+    sys.stdout = io.StringIO()
+
 try:
     from Difficult_Rocket import DR_status
 except ImportError:
     raise
 
-args = ["-env", "-github-dev"]
+if is_github:
+    sys.stdout = stdout
 
 
 if sys.argv == [__file__]:  # 没有输入参数，直接输出默认信息并输出
@@ -28,10 +37,6 @@ if sys.argv == [__file__]:  # 没有输入参数，直接输出默认信息并
     config_file["window"]["height"] = 768
     rtoml.dump(config_file, open("./config/main.toml", "w"))
 
-elif os.path.abspath(os.curdir) in sys.path and "-env" in sys.argv:
-    with open("./.github/workflows/env.ps1", encoding="utf-8", mode="w") as env_file:
-        print(f'$env:DR_version = "{DR_status.DR_version}"', file=env_file)
-        print(f'$env:Build_version = "{DR_status.Build_version}"', file=env_file)
 elif os.path.abspath(os.curdir) in sys.path and "-github" in sys.argv:
     print(f"DR_version={DR_status.DR_version}")
     print(f"Build_version={DR_status.Build_version}")

.github/workflows/nuitka.yml

@@ -86,7 +86,7 @@ jobs:
       - name: Build by nuitka
         shell: pwsh
         run: |
-          python nuitka_build.py --github
+          python -m lndl_nuitka . -y
           # 集成的构建脚本 好耶！
 
       # 获取短 sha

.github/workflows/release.yml

@@ -74,7 +74,7 @@ jobs:
       - name: Build by nuitka
         shell: pwsh
         run: |
-          python nuitka_build.py --github
+          python -m lndl_nuitka . -y
           # 集成的构建脚本 好耶！
 
       # 编译 dr_rs

Difficult_Rocket/__init__.py

@@ -4,28 +4,26 @@
 #  All rights reserved
 #  -------------------------------
 
-import time
-import logging.config
 from pathlib import Path
 
 from Difficult_Rocket.api.types import Options, Version
 
-sdk_version = Version("0.8.7.3")  # SDK 版本
+sdk_version = Version("0.9.0.0")  # SDK 版本
 build_version = Version("2.2.0.0")  # 编译文件版本(与游戏本体无关)
 api_version = Version("0.1.1.0")  # API 版本
 __version__ = sdk_version
 
-
 __all__ = [
     # __init__
     "DR_status",
     # folder
     "api",
+    "data",
     "client",
-    "server",
     "command",
     "crash",
     "exception",
+    "server",
     "mod",
     "utils",
     # file
@@ -37,12 +35,12 @@ __all__ = [
 ]
 
 
-class _DR_status(Options):
+class _DRStatus(Options):
     """
     DR 的特性开关 / 基本状态
     """
 
-    name = "DR Option"
+    name = "DR Status"
     # run status
     client_running: bool = False
     server_running: bool = False
@@ -53,7 +51,6 @@ class _DR_status(Options):
     report_translate_not_found: bool = True
     use_multiprocess: bool = False
     use_cProfile: bool = False
-    use_local_logging: bool = False
 
     # tests
     playing: bool = False
@@ -76,31 +73,52 @@ class _DR_status(Options):
         return round(12 * self.gui_scale)
 
 
-DR_status = _DR_status()
+DR_status = _DRStatus()
 
 
-def load_logging():
+def load_logger():
-    with open("./config/logger.toml") as f:
+    log_config_path = Path("./config/lndl-logger.toml")
+
     import rtoml
 
+    warn_config = False
+    if not log_config_path.is_file():
+        # 生成默认配置文件
+        from Difficult_Rocket.data import log_config
+
+        try:
+            log_config_path.write_text(log_config.default_config)
+        except (FileNotFoundError, OSError, PermissionError):
+            print("\033[31mFailed to write default log config file\033[0m")
+        warn_config = True
+        logger_config = rtoml.loads(log_config.default_config)
+    else:
+        # 读取配置文件
+        with open(log_config_path, encoding="utf-8") as f:
             logger_config = rtoml.load(f)
-    log_path = logger_config["handlers"]["file"]["filename"]
+    # 输入 lndl 进行配置
-    log_path = f"logs/{log_path.format(time.strftime('%Y-%m-%d %H-%M-%S', time.gmtime(time.time_ns() / 1000_000_000)))}"
+    from lib_not_dr.loggers.config import read_config, get_logger
-    if not Path("logs/").is_dir():
+
-        Path("logs/").mkdir()
+    read_config(logger_config)
-    logger_config["handlers"]["file"]["filename"] = log_path
+    logger = get_logger("main")
-    logging.config.dictConfig(logger_config)
+    logger.info("Logger config loaded", tag="DR-init")
+    logger.info(f"DR status:\n{DR_status.as_markdown()}", tag="DR-init")
+    if warn_config:
+        logger.warn("Failed to load log config file, use default config", tag="DR-init")
 
 
-load_logging()
+# 读取日志配置
-
+# 也保证可以直接运行，不带日志 ( 因为有默认配置 )
+load_logger()
 
 if DR_status.playing:
     from Difficult_Rocket.utils.thread import new_thread
 
+
     def think_it(something):
         return something
 
+
     @new_thread("think")
     def think(some_thing_to_think):
         gotcha = think_it(some_thing_to_think)

Difficult_Rocket/api/__init__.py

@@ -11,7 +11,6 @@ github: @shenjackyuanjie
 gitee:  @shenjackyuanjie
 """
 
-
 __all__ = [
     "exception",
     # 错误类定义

Difficult_Rocket/api/screen.py

@@ -33,7 +33,6 @@ class BaseScreen(EventDispatcher, Options):
         self.window_pointer = main_window
 
     if TYPE_CHECKING:
-
         def on_command(self, command: CommandText, window: ClientWindow):
             """
             命令输入事件

Difficult_Rocket/client/__init__.py

@@ -7,7 +7,6 @@
 import os
 import sys
 import time
-import logging
 import inspect
 import functools
 import traceback
@@ -43,8 +42,9 @@ from Difficult_Rocket.client.screen import DRDEBUGScreen
 from Difficult_Rocket.client.fps.fps_log import FpsLogger
 from Difficult_Rocket.exception.language import LanguageNotFound
 
+from lib_not_dr import loggers
 
-logger = logging.getLogger("client")
+logger = loggers.config.get_logger("client")
 
 
 class ClientOption(Options):
@@ -78,7 +78,7 @@ class Client:
     def __init__(self, game: "Game", net_mode="local"):
         start_time = time.time_ns()
         # logging
-        self.logger = logging.getLogger("client")
+        self.logger = loggers.get_logger("client")
         self.logger.info(tr().client.setup.start())
         # config
         self.config = ClientOption()
@@ -128,7 +128,7 @@ def pyglet_load_fonts_folder(folder) -> None:
     if not font_path.exists():
         font_path.mkdir(parents=True)
         return None
-    logger.info(tr().client.load.font.start().format(font_path))
+    logger.info(tr().client.load.font.start().format(font_path), tag="font")
     start_time = time.time_ns()
     for dir_path, dir_names, file_names in os.walk(font_path):
         dir_path = Path(dir_path)
@@ -136,7 +136,8 @@ def pyglet_load_fonts_folder(folder) -> None:
             file_name = Path(file_name)
             if file_name.suffix in (".ttf", ".otf"):
                 logger.debug(
-                    tr().client.load.font.file().format(str(dir_path / file_name))
+                    tr().client.load.font.file().format(str(dir_path / file_name)),
+                    tag="font",
                 )
                 try:
                     pyglet.font.add_file(str(dir_path / file_name))
@@ -148,7 +149,9 @@ def pyglet_load_fonts_folder(folder) -> None:
                     )
     end_time = time.time_ns()
     use_time = end_time - start_time
-    logger.info(tr().client.load.font.use_time().format(use_time / 1000000000))
+    logger.info(
+        tr().client.load.font.use_time().format(use_time / 1000000000), tag="font"
+    )
 
 
 def _call_back(call_back: Callable) -> Callable:
@@ -240,7 +243,7 @@ class ClientWindow(Window):
         start_time = time.time_ns()
         super().__init__(*args, **kwargs)
         # logging
-        self.logger = logging.getLogger("client")
+        self.logger = loggers.get_logger("client")
         self.logger.info(tr().window.setup.start())
         # value
         self.game = game
@@ -307,10 +310,13 @@ class ClientWindow(Window):
             # TODO: wait for pyglet 2.1
             pyglet.app.run(float(self.SPF))
         except KeyboardInterrupt:
-            self.logger.warning("==========client stop. KeyboardInterrupt info==========")
+            self.logger.warn(
+                "==========client stop. KeyboardInterrupt info==========", tag="starter"
+            )
             traceback.print_exc()
-            self.logger.warning(
+            self.logger.warn(
-                "==========client stop. KeyboardInterrupt info end=========="
+                "==========client stop. KeyboardInterrupt info end==========",
+                tag="starter",
             )
             self.dispatch_event("on_close", "input")
             sys.exit(0)

Difficult_Rocket/client/fps/fps_log.py

@@ -36,9 +36,9 @@ class FpsLogger:
         else:
             self.fps_list.append(float(1 / tick))
         if len(self.fps_list) > self.count:
-            self.fps_list = self.fps_list[-self.count + 1 :]  # 整个列表往前挪一位
+            self.fps_list = self.fps_list[-self.count + 1:]  # 整个列表往前挪一位
         if len(self.get_fps_list) > self.count:
-            self.get_fps_list = self.get_fps_list[-self.count + 1 :]  # 整个列表往前挪一位
+            self.get_fps_list = self.get_fps_list[-self.count + 1:]  # 整个列表往前挪一位
         try:
             self._fps = statistics.geometric_mean(
                 self.fps_list[-100:]

Difficult_Rocket/command/api.py

@@ -50,9 +50,9 @@ class CommandText:
             if find != -1:
                 if not len(text) == len(self.text):
                     self.text = (
-                        self.text[find + len(text) :]
+                        self.text[find + len(text):]
                         if not self.text[find + len(text)] == " "
-                        else self.text[find + len(text) + 1 :]
+                        else self.text[find + len(text) + 1:]
                     )
                 return True
         return False
@@ -68,7 +68,7 @@ class CommandText:
                 # 20230122 我现在也不知道为啥这么写了
                 # 果然使用正则表达式就是让一个问题变成两个问题
             except IndexError:
-                self.text = self.text[finding.span()[1] + 1 :]
+                self.text = self.text[finding.span()[1] + 1:]
                 return True
             if next_find == " ":
                 return True

Difficult_Rocket/data/log_config.py

@@ -0,0 +1,86 @@
+#  -------------------------------
+#  Difficult Rocket
+#  Copyright © 2020-2023 by shenjackyuanjie 3695888@qq.com
+#  All rights reserved
+#  -------------------------------
+
+
+default_config = """config_version = 1
+
+[Logger]
+
+    [Logger.client]
+    # 日志名称
+    logger_name = "client"
+    level_name = "debug"
+    # or 'DEBUG'
+    # or level = 10
+    outputs = ["std_out", "file_out"]
+
+    [Logger.server]
+    # 日志名称
+    logger_name = "server"
+    level_name = "debug"
+    # or 'DEBUG'
+    # or level = 10
+    outputs = ["std_out", "file_out"]
+
+    [Logger.main]
+    # 日志名称
+    logger_name = "main"
+    level_name = "debug"
+    # or 'DEBUG'
+    # or level = 10
+    outputs = ["std_out", "file_out"]
+
+[Formatter]
+
+    [Formatter.main_formatter]
+    # 格式化器名称
+    class = "MainFormatter"
+    # 格式化器参数
+    time_format = "%Y-%m-%d %H:%M:%S"
+    msec_time_format = "{}-{:03d}"
+    use_absolute_path = false
+
+    [Formatter.std_formatter]
+    class = "StdFormatter"
+    sub_formatter = ["main_formatter"]
+    default_template = "[${log_time}][${level}]|${logger_name}:${logger_tag}|${messages}"
+
+[Outstream]
+
+    [Outstream.std_out]
+    # 输出流名称
+    class = "StdioOutputStream"
+    # 输出流参数
+    formatter = "std_formatter"
+    use_stderr = false
+    # or true
+    level_name = "debug"
+    # or 'DEBUG'
+    # or level = 10
+
+    [Outstream.file_out]
+    class = "FileCacheOutputStream"
+
+    level = 10
+    # or level_name = 'DEBUG'
+    # or level_name = 'debug'
+    formatter = "std_formatter"
+    flush_count_limit = 10
+    # 5 条日志刷新一次
+    flush_time_limit = 5
+    # 5 秒刷新一次
+    # or flush_time_limit = 0.5
+    file_path = "./logs"
+    file_name = "dr-{time}.log"
+
+"""
+
+# 整的跟 export 一样
+# fmt: off
+__all__ = [
+    "default_config"
+]
+# fmt: on

Difficult_Rocket/gui/widget/theme/__init__.py

@@ -23,7 +23,6 @@ class BaseTheme(dict):
                 setattr(self, k, v)
 
     if TYPE_CHECKING:
-
         def init(self, batch: Batch, group: Group, **kwargs) -> None:
             """
             Init theme

Difficult_Rocket/main.py

@@ -11,28 +11,18 @@ github: @shenjackyuanjie
 gitee:  @shenjackyuanjie
 """
 
-# import time
-import logging
-
-# import traceback
-import logging.config
 import multiprocessing
 
-# from io import StringIO
-# from pathlib import Path
 from typing import List, Optional, Dict
 
-# from Difficult_Rocket.utils import tools
 from Difficult_Rocket.api.types import Options
-
-# from Difficult_Rocket.utils.translate import tr
-# from Difficult_Rocket.runtime import DR_runtime
 from Difficult_Rocket.mod.loader import ModManager
 from Difficult_Rocket.utils.thread import new_thread
-
-# from Difficult_Rocket.crash import write_info_to_cache
 from Difficult_Rocket import client, server, DR_status
 
+from lib_not_dr.loggers import config
+from lib_not_dr.loggers.logger import Logger
+
 
 class Console(Options):
     name = "python stdin console"
@@ -75,7 +65,7 @@ class Game(Options):
     console_class: Console = Console
 
     main_config: Dict
-    logger: logging.Logger
+    logger: Logger
 
     mod_manager: ModManager
 
@@ -84,9 +74,6 @@ class Game(Options):
 
     def init_mods(self) -> None:
         """验证/加载 mod"""
-        from Difficult_Rocket.mod import loader as mod_loader
-
-        mod_loader.logger = logging.getLogger("mod_manager")
         self.mod_manager = ModManager()
         mod_class = self.mod_manager.load_mods()
         self.mod_manager.init_mods(mod_class)
@@ -120,7 +107,7 @@ class Game(Options):
         self.server = server.Server(net_mode="local")
 
     def init(self, **kwargs) -> bool:
-        self.logger = logging.getLogger("main")
+        self.logger = config.get_logger("main")
         self.load_file()
         self.setup()
         self.log_env()

Difficult_Rocket/mod/__init__.py

@@ -3,4 +3,3 @@
 #  Copyright © 2020-2023 by shenjackyuanjie 3695888@qq.com
 #  All rights reserved
 #  -------------------------------
-

Difficult_Rocket/mod/loader/__init__.py

@@ -6,7 +6,6 @@
 
 import sys
 import time
-import logging
 import traceback
 import importlib
 from pathlib import Path
@@ -16,9 +15,11 @@ from Difficult_Rocket.mod.api import ModInfo
 from Difficult_Rocket.utils.translate import tr
 from Difficult_Rocket.api.types import Options
 
+from lib_not_dr.loggers import config
+
 Game = TypeVar("Game")
 
-logger = logging.getLogger("mod_manager")
+logger = config.get_logger_from_old("mod_manager", "client")
 ONE_FILE_SUFFIX = (".py", ".pyc", ".pyd")
 PACKAGE_SUFFIX = (".pyz", ".zip", ".dr_mod")
 
@@ -73,14 +74,14 @@ class ModManager(Options):
         :return:
         """
         if not mod_path.exists():
-            logger.error(tr().mod.load.faild.not_exist().format(mod_path))
+            logger.error(tr().mod.load.faild.not_exist().format(mod_path), tag="load")
             return None
         _add_path_to_sys([mod_path.parent])
         try:
             if mod_path.name == "__pycache__":
                 # 忽略 __pycache__ 文件夹 (Python 编译文件)
                 return None
-            logger.info(tr().mod.load.loading().format(mod_path))
+            logger.info(tr().mod.load.loading().format(mod_path), tag="load")
             if (
                     mod_path.is_dir()
                     or mod_path.suffix in PACKAGE_SUFFIX
@@ -91,15 +92,18 @@ class ModManager(Options):
                 if not hasattr(loading_mod, "mod_class") or not issubclass(
                         loading_mod.mod_class, ModInfo
                 ):
-                    logger.warning(tr().mod.load.faild.no_mod_class().format(mod_path))
+                    logger.warn(
+                        tr().mod.load.faild.no_mod_class().format(mod_path), tag="load"
+                    )
                     return None
                 mod_class: type(ModInfo) = loading_mod.mod_class  # 获取 mod 类
                 if mod_class.mod_id not in self.find_mod_paths:
                     self.find_mod_paths[mod_class.mod_id] = mod_path
                 return mod_class
         except ImportError:
-            logger.warning(
+            logger.warn(
-                tr().mod.load.faild.error().format(mod_path, traceback.format_exc())
+                tr().mod.load.faild.error().format(mod_path, traceback.format_exc()),
+                tag="load",
             )
         return None
 
@@ -130,7 +134,9 @@ class ModManager(Options):
                 ):
                     # 文件夹 mod
                     mods_path.append(mod)
-        logger.info(tr().mod.finded().format(len(mods_path), time.time() - start_time))
+        logger.info(
+            tr().mod.finded().format(len(mods_path), time.time() - start_time), tag="find"
+        )
         return mods_path
 
     def load_mods(
@@ -148,7 +154,7 @@ class ModManager(Options):
         _add_path_to_sys(find_path)
         mods = []
         start_time = time.time()
-        logger.info(tr().mod.load.start().format(find_path))
+        logger.info(tr().mod.load.start().format(find_path), tag="load")
         for path in find_path:
             if not path.exists():
                 path.mkdir(parents=True)
@@ -160,7 +166,7 @@ class ModManager(Options):
             for path in extra_mod_path:
                 if (cache := self.load_mod(path)) is not None:
                     mods.append(cache)
-        logger.info(tr().mod.load.use_time().format(time.time() - start_time))
+        logger.info(tr().mod.load.use_time().format(time.time() - start_time), tag="load")
         return mods
 
     def init_mods(self, mods: List[type(ModInfo)]):
@@ -174,13 +180,16 @@ class ModManager(Options):
             try:
                 init_mod = mod_class()
                 self.loaded_mod_modules[init_mod.mod_id] = init_mod
-                logger.info(tr().mod.init.success().format(init_mod, init_mod.version))
+                logger.info(
+                    tr().mod.init.success().format(init_mod, init_mod.version), tag="init"
+                )
             except Exception as e:
                 logger.error(
-                    tr().mod.init.faild().format(mod_class, e, traceback.format_exc())
+                    tr().mod.init.faild().format(mod_class, e, traceback.format_exc()),
+                    tag="init",
                 )
                 continue
-        logger.info(tr().mod.init.use_time().format(time.time() - start_time))
+        logger.info(tr().mod.init.use_time().format(time.time() - start_time), tag="init")
 
     def unload_mod(self, mod_id: str, game: Game) -> Optional[ModInfo]:
         """
@@ -193,16 +202,17 @@ class ModManager(Options):
                 not (mod_class := self.loaded_mod_modules.get(mod_id))
                 and (mod_class := self.get_mod_module(mod_id)) is None
         ):
-            logger.warning(tr().mod.unload.faild.not_find().format(mod_id))
+            logger.warn(tr().mod.unload.faild.not_find().format(mod_id), tag="unload")
             return None
         try:
             mod_class.on_unload(game=game)
             self.loaded_mod_modules.pop(mod_class.mod_id)
-            logger.info(tr().mod.unload.success().format(mod_id))
+            logger.info(tr().mod.unload.success().format(mod_id), tag="unload")
             return mod_class
         except Exception as e:
             logger.error(
-                tr().mod.unload.faild.error().format(mod_id, e, traceback.format_exc())
+                tr().mod.unload.faild.error().format(mod_id, e, traceback.format_exc()),
+                tag="unload",
             )
         return None
 
@@ -218,7 +228,9 @@ class ModManager(Options):
             return
         mod_class: Optional[ModInfo] = None
         if unload.mod_id not in self.find_mod_paths:
-            logger.warning(tr().mod.reload.faild.not_find().format(unload.mod_id))
+            logger.warn(
+                tr().mod.reload.faild.not_find().format(unload.mod_id), tag="reload"
+            )
             paths = self.find_mods_in_path()
             for path in paths:
                 mod_class = self.load_mod(path)
@@ -231,4 +243,4 @@ class ModManager(Options):
                 self.init_mods([mod_class])
         if mod_id in self.loaded_mod_modules and mod_class is not None:
             self.loaded_mod_modules[mod_id].on_load(game=game, old_self=mod_class)
-            logger.info(tr().mod.reload.success().format(mod_id))
+            logger.info(tr().mod.reload.success().format(mod_id), tag="reload")

Difficult_Rocket/runtime.py

@@ -14,7 +14,6 @@ from typing import Optional, List, Tuple
 
 from Difficult_Rocket.api.types import Options, Version
 
-
 __all__ = ["DR_runtime"]
 
 

Difficult_Rocket/server/__init__.py

@@ -13,13 +13,12 @@ gitee:  @shenjackyuanjie
 
 import os
 import time
-import logging
 # import multiprocessing
 
 from Difficult_Rocket.utils import tools
 from Difficult_Rocket.utils.translate import tr
-# from Difficult_Rocket.api.delivery import Delivery
+
-# from Difficult_Rocket.utils.new_thread import new_thread
+from lib_not_dr import loggers
 
 
 # TODO 改变服务端启动逻辑 0.6.0(划掉 0.8.0)会写完的（
@@ -29,7 +28,7 @@ class Server:
     def __init__(self, net_mode="local"):
         start_time = time.time()
         # logging
-        self.logger = logging.getLogger("server")
+        self.logger = loggers.config.get_logger("server")
         self.logger.info(tr().server.setup.start())
         # value
         self.process_id = os.getpid()

Difficult_Rocket/utils/tools.py

@@ -17,7 +17,6 @@ import time
 import math
 import json
 import rtoml
-import logging
 import configparser
 
 from pathlib import Path
@@ -27,8 +26,10 @@ from defusedxml.ElementTree import parse
 
 from Difficult_Rocket.exception.unsupport import NoMoreJson5
 
+from lib_not_dr import loggers
+
 # logger
-tools_logger = logging.getLogger("tools")
+tools_logger = loggers.config.get_logger("tools")
 """
 file config
 """
@@ -48,7 +49,7 @@ def load_file(
 ) -> Union[dict, ElementTree.ElementTree]:
     if isinstance(file_name, Path):
         file_name = str(file_name)
-    f_type = file_name[file_name.rfind(".") + 1 :]  # 从最后一个.到末尾 (截取文件格式)
+    f_type = file_name[file_name.rfind(".") + 1:]  # 从最后一个.到末尾 (截取文件格式)
     get_file = NotImplementedError("解析失败，请检查文件类型/文件内容/文件是否存在！")
     try:
         if f_type == "xml":
@@ -95,7 +96,7 @@ def load_file(
 
 
 def save_dict_file(file_name: str, data: dict, encoding: str = "utf-8") -> bool:
-    f_type = file_name[file_name.rfind(".") + 1 :]  # 从最后一个.到末尾 (截取文件格式)
+    f_type = file_name[file_name.rfind(".") + 1:]  # 从最后一个.到末尾 (截取文件格式)
     try:
         if (f_type == "config") or (f_type == "conf") or (f_type == "ini"):
             return False
@@ -201,36 +202,6 @@ def format_bool(thing) -> bool:
         raise TypeError("Need a 'like bool' not a {}".format(thing))
 
 
-level_ = [
-    "DEBUG",
-    "INFO",
-    "WARNING",
-    "ERROR",
-    "CRITICAL",
-    logging.DEBUG,
-    logging.INFO,
-    logging.WARNING,
-    logging.ERROR,
-    logging.CRITICAL,
-]
-
-
-def log_level(level):
-    if level in level_:
-        if (level == "DEBUG") or (level == logging.DEBUG):
-            return logging.DEBUG
-        if (level == "INFO") or (level == logging.INFO):
-            return logging.INFO
-        if (level == "WARNING") or (level == logging.WARNING):
-            return logging.WARNING
-        if (level == "ERROR") or (level == logging.ERROR):
-            return logging.ERROR
-        if (level == "CRITICAL") or (level == logging.CRITICAL):
-            return logging.CRITICAL
-    else:
-        raise ValueError("Need a like logging.level thing not anything else")
-
-
 # linear_algebra
 
 

config/lndl-logger.toml

@@ -34,18 +34,25 @@ config_version = 1
     # 格式化器参数
     time_format = "%Y-%m-%d %H:%M:%S"
     msec_time_format = "{}-{:03d}"
-    use_absolut_path = false
+    use_absolute_path = false
 
     [Formatter.std_formatter]
-    formatter_class = "StdFormatter"
+    class = "StdFormatter"
+    enable_color = true
     sub_formatter = ["main_formatter"]
-    default_template = "[{log_time}][{level}]|{logger_name}:{logger_tag}|{messages}"
+    default_template = "[${log_time}][${level}]|${logger_name}:${logger_tag}|${messages}"
+
+    [Formatter.file_std_formatter]
+    class = "StdFormatter"
+    enable_color = false
+    sub_formatter = ["main_formatter"]
+    default_template = "[${log_time}][${level}]|${logger_name}:${logger_tag}|${messages}"
 
 [Outstream]
 
     [Outstream.std_out]
     # 输出流名称
-    class = "StdOutputStream"
+    class = "StdioOutputStream"
     # 输出流参数
     formatter = "std_formatter"
     use_stderr = false
@@ -60,11 +67,11 @@ config_version = 1
     level = 10
     # or level_name = 'DEBUG'
     # or level_name = 'debug'
-    formatter = "std_formatter"
+    formatter = "file_std_formatter"
     flush_count_limit = 10
     # 5 条日志刷新一次
     flush_time_limit = 5
     # 5 秒刷新一次
     # or flush_time_limit = 0.5
     file_path = "./logs"
-    file_name = "%s-dr.log"
+    file_name = "dr-{time}.log"

config/local_logger.toml

@@ -1,123 +0,0 @@
-logger_version = '1.0.0'
-
-[Loggers]
-
-    [Loggers.root]
-    level = 'DEBUG'
-    color = 'main_color'
-    file = 'main_log_file'
-    handlers = ['main_std_handler']
-
-    [Loggers.client]
-    level = 'TRACE'
-    color = 'main_color'
-    file = 'main_log_file'
-    handlers = ['main_std_handler']
-
-    [Loggers.server]
-    level = 'TRACE'
-    color = 'DiGua_color'
-    file = 'main_log_file'
-    handlers = ['main_std_handler']
-
-[Files]
-    
-    [Files.main_log_file]
-    name = './logs/{long_time}_logs.md'
-    level = 'TRACE'
-    cache_len = 20
-    cache_time = 1
-    mode = 'a'
-    encoding = 'utf-8'
-
-[Handler]
-
-    [Handler.main_std_handler]
-    class = 'str handler'
-    format = 'format.main_format'
-
-    [Handler.main_file_hander]
-    class = 'cached file handler'
-    format = 'format.main_format'
-
-[Formatter]
-
-main_format = '[{long_time}] [{logger_name}] {level} | {file_name}:{code_line} | {marker} | {message}'
-file_name = 'no frame'
-code_line = 'no frame'
-short_time = '%Y-%m-%d %H-%M-%S'
-long_time = '%Y-%m-%d %H-%M-%S:%%S'
-
-[Colors]
-
-    [Colors.main_color]
-    # 翻了三个月的颜色啊
-    long_time = '\u001b[38;2;201;222;56m'
-    short_time = '\u001b[38;2;201;222;56m'
-    code_line = '\u001b[38;2;0;255;180m'
-    file_name = '\u001b[38;2;0;255;180m'
-    info      = '\u001b[0m'
-    message   = '\u001b[0m'
-    logger    = '\u001b[0m'
-    marker    = '\u001b[0m'
-    # level colors
-        TRACE.info =   '\u001b[38;2;138;173;244m'
-        FINE.info =    '\u001b[35;48;2;44;44;54m'
-        DEBUG.info =   '\u001b[38;2;133;138;149m'
-        INFO.info =    '\u001b[0m'
-        WARNING.info = '\u001b[33m'
-        ERROR.info =   '\u001b[31m'
-        FATAL.info =   '\u001b[38;2;255;255;0;48;2;120;10;10m'
-        FATAL.logger = '\u001b[38;2;245;189;230m'
-    
-    [Colors.fancy_main_color]
-    long_time = '\u001b[38;2;201;222;56m'
-    short_time = '\u001b[38;2;201;222;56m'
-    file_name = '\u001b[38;2;0;255;180m'
-    code_line = '\u001b[38;2;0;255;180m'
-    info      = '\u001b[0m'
-    message   = '\u001b[0m'
-    logger    = '\u001b[0m'
-    marker    = '\u001b[0m'
-    # level colors
-        TRACE.info =      '\u001b[38;2;138;173;244m'
-        TRACE.message =   '\u001b[38;2;138;173;244m'
-        FINE.info =       '\u001b[35;48;2;44;44;54m'
-        FINE.message =    '\u001b[35m'
-        DEBUG.info =      '\u001b[38;2;133;138;149m'
-        DEBUG.message =   '\u001b[38;2;133;138;149m'
-        INFO.info =       '\u001b[0m'
-        INFO.message =    '\u001b[0m'
-        WARNING.info =    '\u001b[33m'
-        WARNING.message = '\u001b[33m'
-        ERROR.info =      '\u001b[31m'
-        ERROR.message =   '\u001b[31m'
-        FATAL.info =      '\u001b[38;2;255;255;0;48;2;120;10;10m'
-        FATAL.message =   '\u001b[38;2;255;255;0;48;2;120;10;10m'
-        FATAL.logger =    '\u001b[38;2;245;189;230m'
-
-    [Colors.DiGua_color]
-    # catppuccin Macchiato
-    long_time = '\u001b[38;2;202;211;245m'
-    short_time = '\u001b[38;2;202;211;245m'
-    file_name = '\u001b[38;2;139;213;202m'
-    code_line = '\u001b[38;2;166;218;149m'
-    info      = '\u001b[0m'
-    logger    = '\u001b[0m'
-    message   = '\u001b[0m'
-    marker    = '\u001b[0m'
-    # level colors
-        TRACE.info  =     '\u001b[38;2;138;173;244m'
-        TRACE.message =   '\u001b[38;2;138;173;244m'
-        FINE.info =       '\u001b[38;2;198;160;246m'
-        FINE.message =    '\u001b[38;2;198;160;246m'
-        DEBUG.info =      '\u001b[38;2;133;138;149m'
-        DEBUG.message =   '\u001b[38;2;133;138;149m'
-        ERROR.info =      '\u001b[38;2;237;135;150m'
-        ERROR.message =   '\u001b[38;2;237;135;150m'
-        WARNING.info =    '\u001b[38;2;245;169;127m'
-        WARNING.message = '\u001b[38;2;245;169;127m'
-        FATAL.info =      '\u001b[38;2;255;255;0;48;2;120;10;10m'
-        FATAL.message =   '\u001b[38;2;255;255;0;48;2;120;10;10m'
-        FATAL.loggger =   '\u001b[38;2;245;189;230m'
-

docs/src/change_log/dr_sdk.md

@@ -9,6 +9,16 @@
 ### Rename
 
 - `Api_version` -> `api_version`
+- `_DR_Status` -> `_DRStatus`
+  - `name` = `DR Option` -> `DR Status`
+  - 这毛病属实是没想到, 之前一直没发现
+
+### Rework
+
+- 将 `logging` 的依赖改为 `lib_not_dr.loggers`
+  - 以后都用 `lib_not_dr` 的 logger 了
+  - Change the dependency of `logging` to `lib_not_dr.loggers`
+  - Use `lib_not_dr` logger in the future
 
 ### Add
 

libs/lib_not_dr

@@ -1 +1 @@
-Subproject commit 9ade71b07532881dfef77780c4832d33697a32a0
+Subproject commit f0eb5480b5a973a458cdfd3e7e91ef695de064d4

libs/pyglet

@@ -1 +1 @@
-Subproject commit db94ffdc2eecaf50a608b1623d6517c993c221f6
+Subproject commit 7df9ee869242f482579f1aa0ed5c61e39c4a444f

mods/dr_game/__init__.py

@@ -4,7 +4,6 @@
 #  All rights reserved
 #  -------------------------------
 
-import logging
 import warnings
 import traceback
 
@@ -16,9 +15,11 @@ from Difficult_Rocket.api.mod import ModInfo
 from Difficult_Rocket.client import ClientWindow
 from Difficult_Rocket.api.types import Options, Version
 
+from lib_not_dr import loggers
+
 DR_rust_version = Version("0.2.23.0")  # DR_mod 的 Rust 编写部分的兼容版本
 
-logger = logging.getLogger("client.dr_game")
+logger = loggers.config.get_logger_from_old("client.dr_game", "client")
 
 
 class _DR_mod_runtime(Options):  # NOQA

pyproject.toml

@@ -1,10 +1,5 @@
-[build-system]
-requires = ["setuptools>=42", "wheel", "nuitka", "toml"]
-build-backend = "nuitka.distutils.Build"
-
 [project]
 name = "difficult-rocket"
-version = "0.8.7.3"
 description = "A rocket game"
 authors = [{ name = "shenjackyuanjie", email = "3695888@qq.com" }]
 dependencies = [
@@ -18,11 +13,13 @@ dependencies = [
 requires-python = ">=3.8"
 license = { text = "CC-BY-NA-SA 4.0" }
 readme = "README.md"
-gui-scripts = { DR = "Difficult_Rocket.DR:main" }
+dynamic = ["version"]
 
 [tool.setuptools]
 packages = []
 
+[tool.setuptools.dynamic]
+version = { attr = "Difficult_Rocket.__version__" }
 
 [project.optional-dependencies]
 build = [

scripts/lndl-config.py

@@ -13,12 +13,8 @@ from lib_not_dr.nuitka import nuitka_config_type, raw_config_type
 
 def gen_pyglet_no_follow_import() -> list:
     no_follow_import = []
-    no_follow_import += [
+    no_follow_import += [f"pyglet.app.{x}" for x in ["win32", "xlib", "cocoa"]]
-        f"pyglet.app.{x}" for x in ["win32", "xlib", "cocoa"]
+    no_follow_import += [f"pyglet.input.{x}" for x in ["win32", "linux", "macos"]]
-    ]
-    no_follow_import += [
-        f"pyglet.input.{x}" for x in ["win32", "linux", "macos"]
-    ]
     no_follow_import += [
         f"pyglet.libs.{x}"
         for x in ["win32", "x11", "wayland", "darwin", "egl", "headless"]
@@ -36,9 +32,7 @@ def gen_pyglet_no_follow_import() -> list:
             "headless",
         )
     ]
-    no_follow_import += [
+    no_follow_import += [f"pyglet.gl.{x}" for x in ["win32", "xlib", "cocoa", "headless"]]
-        f"pyglet.gl.{x}" for x in ["win32", "xlib", "cocoa", "headless"]
-    ]
 
     mult_plat_libs = ["app", "input", "libs", "window", "canvas", "gl"]
     if platform.system() == "Windows":
@@ -59,15 +53,15 @@ def gen_pyglet_no_follow_import() -> list:
 
 
 def main(config: raw_config_type) -> nuitka_config_type:
-    print('debug', config)
+    print("debug", config)
-    config = config['cli']
+    config = config["cli"]
 
-    config['file-version'] = str(build_version)
+    config["file-version"] = str(build_version)
-    config['product-version'] = str(sdk_version)
+    config["product-version"] = str(sdk_version)
-    config['macos-app-version'] = str(sdk_version)
+    config["macos-app-version"] = str(sdk_version)
 
-    config['nofollow-import-to'] += gen_pyglet_no_follow_import()
+    config["nofollow-import-to"] += gen_pyglet_no_follow_import()
-    config['output-dir'] = './build/nuitka-' + platform.system().lower()
+    config["output-dir"] = "./build/nuitka-" + platform.system().lower()
 
-    print('done', config)
+    print("done", config)
     return config