option logger update

Difficult_Rocket/__init__.py

@@ -11,7 +11,7 @@ github: @shenjackyuanjie
 gitee:  @shenjackyuanjie
 """
 
-from typing import Any, Dict, Callable, Union, Tuple, List, Type
+from typing import Any, Dict, Callable, Union, Tuple, List
 
 from libs.MCDR.version import Version
 
@@ -19,11 +19,23 @@ game_version = Version("0.6.3")
 __version__ = game_version
 
 
+class OptionNameNotDefined(Exception):
+    """向初始化的 option 里添加了一个不存在于选项里的选项"""
+
+
 class Options:
     """
     Difficult Rocket 的游戏配置的存储基类
     """
     __options: Dict[str, Union[Callable, object]] = {}
+    cached_options: Dict[str, Union[str, Any]] = {}
+
+    def __init__(self, **kwargs):
+        for option, value in kwargs.items():
+            if option not in self.option():
+                raise OptionNameNotDefined(f"option: {option} with value: {value} is not defined")
+            setattr(self, option, value)
+        self.flush_option()
 
     def option(self) -> Dict[str, Any]:
         """
@@ -44,8 +56,16 @@ class Options:
                 values[option] = getattr(self, option)
         return values
 
+    def flush_option(self) -> Dict[str, Any]:
+        """
+        刷新缓存 options 的内容
+        :return: 刷新过的 options
+        """
+        self.cached_options = self.option()
+        return self.cached_options
+
     def option_with_len(self) -> List[Union[List[Tuple[str, Any, Any]], int, Any]]:
-        options = self.option()
+        options = self.flush_option()
         max_len_key = 1
         max_len_value = 1
         max_len_value_t = 1
@@ -96,7 +116,8 @@ class _DR_runtime(Options):
     # game options
     _language = 'zh-CN'
 
-    def __init__(self):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
         self.__options = {'language': self.language}
 
     @property

libs/utils/logger.py

@@ -36,7 +36,6 @@ logger = logger.get_logger(name)
 直接获取一个配置好的logger
 """
 
-
 color_reset_suffix = "\033[0m"
 """ 只是用来重置颜色的后缀 """
 
@@ -625,6 +624,82 @@ class Logger:
         return self.make_log(*values, level=LoggingLevel.FATAL, marker=marker, sep=sep, end=end, flush=flush, frame=frame)
 
 
+_loggerClass = Logger
+
+
+class RootLogger(Logger):
+    """ 默认的 logger """
+    def __init__(self, level: int = LoggingLevel.WARNING, *args, **kwargs):
+        super().__init__(level=level, *args, **kwargs)
+
+
+
+root_logger = RootLogger()
+
+
+def trace(*values: object,
+          marker: Optional[str] = None,
+          sep: Optional[str] = ' ',
+          end: Optional[str] = '\n',
+          flush: Optional[bool] = False,
+          frame: Optional[FrameType] = None) -> Optional[str]:
+    ...
+
+
+def fine(*values: object,
+         marker: Optional[str] = None,
+         sep: Optional[str] = ' ',
+         end: Optional[str] = '\n',
+         flush: Optional[bool] = False,
+         frame: Optional[FrameType] = None) -> Optional[str]:
+    ...
+
+
+def debug(*values: object,
+          marker: Optional[str] = None,
+          sep: Optional[str] = ' ',
+          end: Optional[str] = '\n',
+          flush: Optional[bool] = False,
+          frame: Optional[FrameType] = None) -> Optional[str]:
+    ...
+
+
+def info(*values: object,
+         marker: Optional[str] = None,
+         sep: Optional[str] = ' ',
+         end: Optional[str] = '\n',
+         flush: Optional[bool] = False,
+         frame: Optional[FrameType] = None) -> Optional[str]:
+    ...
+
+
+def warning(*values: object,
+            marker: Optional[str] = None,
+            sep: Optional[str] = ' ',
+            end: Optional[str] = '\n',
+            flush: Optional[bool] = False,
+            frame: Optional[FrameType] = None) -> Optional[str]:
+    ...
+
+
+def error(*values: object,
+          marker: Optional[str] = None,
+          sep: Optional[str] = ' ',
+          end: Optional[str] = '\n',
+          flush: Optional[bool] = False,
+          frame: Optional[FrameType] = None) -> Optional[str]:
+    ...
+
+
+def fatal(*values: object,
+          marker: Optional[str] = None,
+          sep: Optional[str] = ' ',
+          end: Optional[str] = '\n',
+          flush: Optional[bool] = False,
+          frame: Optional[FrameType] = None) -> Optional[str]:
+    ...
+
+
 def get_key_from_dict(a_dict: Dict, key: Any, default: Any = None) -> Optional[Any]:
     if default is None:
         return a_dict[key]