display info in github action

.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}")

Difficult_Rocket/__init__.py

@@ -13,7 +13,6 @@ build_version = Version("2.2.0.0")  # 编译文件版本(与游戏本体无关)
 api_version = Version("0.1.1.0")  # API 版本
 __version__ = sdk_version
 
-
 __all__ = [
     # __init__
     "DR_status",
@@ -86,6 +85,7 @@ def load_logger():
     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):
@@ -94,29 +94,31 @@ def load_logger():
         logger_config = rtoml.loads(log_config.default_config)
     else:
         # 读取配置文件
-        with open(log_config_path, encoding='utf-8') as f:
+        with open(log_config_path, encoding="utf-8") as f:
             logger_config = rtoml.load(f)
     # 输入 lndl 进行配置
     from lib_not_dr.loggers.config import read_config, get_logger
+
     read_config(logger_config)
     logger = get_logger("main")
-    logger.info("Logger config loaded", tag='DR-init')
+    logger.info("Logger config loaded", tag="DR-init")
-    logger.info(f"DR status:\n{DR_status.as_markdown()}", 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')
+        logger.warn("Failed to load log config file, use default config", tag="DR-init")
 
 
 # 读取日志配置
 # 也保证可以直接运行，不带日志 ( 因为有默认配置 )
 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

@@ -44,7 +44,6 @@ from Difficult_Rocket.exception.language import LanguageNotFound
 
 from lib_not_dr import loggers
 
-
 logger = loggers.config.get_logger("client")
 
 
@@ -129,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), tag='font')
+    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)
@@ -137,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)), tag='font'
+                    tr().client.load.font.file().format(str(dir_path / file_name)),
+                    tag="font",
                 )
                 try:
                     pyglet.font.add_file(str(dir_path / file_name))
@@ -149,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), tag='font')
+    logger.info(
+        tr().client.load.font.use_time().format(use_time / 1000000000), tag="font"
+    )
 
 
 def _call_back(call_back: Callable) -> Callable:
@@ -308,10 +310,13 @@ class ClientWindow(Window):
             # TODO: wait for pyglet 2.1
             pyglet.app.run(float(self.SPF))
         except KeyboardInterrupt:
-            self.logger.warn("==========client stop. KeyboardInterrupt info==========", tag="starter")
+            self.logger.warn(
+                "==========client stop. KeyboardInterrupt info==========", tag="starter"
+            )
             traceback.print_exc()
             self.logger.warn(
-                "==========client stop. KeyboardInterrupt info end==========", tag="starter"
+                "==========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/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/mod/__init__.py

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

Difficult_Rocket/mod/loader/__init__.py

@@ -74,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
@@ -92,7 +92,9 @@ class ModManager(Options):
                 if not hasattr(loading_mod, "mod_class") or not issubclass(
                         loading_mod.mod_class, ModInfo
                 ):
-                    logger.warn(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:
@@ -100,7 +102,8 @@ class ModManager(Options):
                 return mod_class
         except ImportError:
             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
 
@@ -131,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(
@@ -149,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)
@@ -161,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)]):
@@ -175,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]:
         """
@@ -194,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.warn(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
 
@@ -219,7 +228,9 @@ class ModManager(Options):
             return
         mod_class: Optional[ModInfo] = None
         if unload.mod_id not in self.find_mod_paths:
-            logger.warn(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)
@@ -232,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"]
 
 

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'
-

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