Просмотр исходного кода

perf(log): Try to optimize the log display, but this is too difficult in current software frame

runhey 3 лет назад
Родитель
Сommit
a249f4f179
5 измененных файлов с 57 добавлено и 41 удалено
  1. 2 1
      module/config/config.py
  2. 26 26
      module/gui/context/process_manager.py
  3. 21 8
      module/logger.py
  4. 2 2
      script.py
  5. 6 4
      tasks/GameUi/game_ui.py

+ 2 - 1
module/config/config.py

@@ -115,7 +115,8 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
         try:
             return getattr(self.model, name)
         except AttributeError:
-            logger.error(f'can not ask this variable {name}')
+            # 这个导致 大量的无用log
+            # logger.error(f'can not ask this variable {name}')
             return None  # 或者抛出异常,或者返回其他默认值
 
     def gui_args(self, task: str) -> str:

+ 26 - 26
module/gui/context/process_manager.py

@@ -40,10 +40,10 @@ def is_port_in_use(ip, port) -> bool:
     try:
         s.connect((ip, port))
         s.shutdown(2)
-        logger.info(f'port {port} is in use')
+        logger.info(f'Port {port} is in use')
         return True
     except:
-        logger.info(f'port {port} is not in use')
+        logger.info(f'Port {port} is not in use')
         return False
 
 
@@ -110,17 +110,17 @@ class ProcessManager(QObject):
             self.log_thread[config].start()
 
             # 下面是启动 zerorpc 客户端
-            logger.info(f'create script {config} on port {port}')
+            logger.info(f'Create script {config} on port {port}')
             try:
                 self.clients[config] = zerorpc.Client()
                 self.clients[config].connect(f'tcp://127.0.0.1:{self.ports[config]}')
             except:
-                logger.exception(f'connect to script {config} error')
+                logger.exception(f'Connect to script {config} error')
                 raise
             self.processes[config].start()
-            logger.info(f'add script {config}')
+            logger.info(f'Add script {config}')
         else:
-            logger.info(f'script {config} is already running')
+            logger.info(f'Script {config} is already running')
 
     def remove(self, config: str) -> None:
         """
@@ -133,10 +133,10 @@ class ProcessManager(QObject):
             del self.processes[config]
             del self.ports[config]
             del self.clients[config]
-            logger.info(f'remove script {config}')
-            logger.info(f'port {config} is released')
+            logger.info(f'Remove script {config}')
+            logger.info(f'Port {config} is released')
         else:
-            logger.info(f'script {config} is not running')
+            logger.info(f'Script {config} is not running')
 
     @Slot(str)
     def restart(self, config: str) -> None:
@@ -166,9 +166,9 @@ class ProcessManager(QObject):
                                                    log_queue=self.log_queue[config],
                                                    update_queue=self.update_queue)
             self.processes[config].start()
-            logger.info(f'restart script {config}')
+            logger.info(f'Restart script {config}')
         else:
-            logger.info(f'script {config} is not running')
+            logger.info(f'Script {config} is not running')
 
     def stop_all(self) -> None:
         """
@@ -177,7 +177,7 @@ class ProcessManager(QObject):
         """
         for config in self.processes:
             self.processes[config].stop()
-        logger.info(f'stop all script')
+        logger.info(f'Stop all script')
 
     def restart_all(self) -> None:
         """
@@ -186,7 +186,7 @@ class ProcessManager(QObject):
         """
         for config in self.processes:
             self.processes[config].restart()
-        logger.info(f'restart all script')
+        logger.info(f'Restart all script')
 
     def get_client(self, config: str) -> zerorpc.Client:
         """
@@ -197,7 +197,7 @@ class ProcessManager(QObject):
         if config in self.clients:
             return self.clients[config]
         else:
-            logger.info(f'script {config} is not running')
+            logger.info(f'Script {config} is not running')
             return None
 
     @Slot(result="QString")
@@ -234,10 +234,10 @@ class ProcessManager(QObject):
         :return:
         """
         if config in self.clients:
-            logger.info(f'gui get args of {config} {task}')
+            logger.info(f'Gui get args of {config} {task}')
             return self.check_script(config).gui_args(task)
         else:
-            logger.info(f'script {config} is not running')
+            logger.info(f'Script {config} is not running')
             return None
 
     @Slot(str, str, result="QString")
@@ -249,10 +249,10 @@ class ProcessManager(QObject):
         :return:
         """
         if config in self.clients:
-            logger.info(f'gui get value of {config} {task}')
+            logger.info(f'Gui get value of {config} {task}')
             return self.check_script(config).gui_task(task)
         else:
-            logger.info(f'script {config} is not running')
+            logger.info(f'Script {config} is not running')
             return None
 
     @Slot(str, str, str, str, str, result="bool")
@@ -267,13 +267,13 @@ class ProcessManager(QObject):
         :return:
         """
         if config in self.clients:
-            logger.info(f'gui set value of {config} {task}')
+            logger.info(f'Gui set value of {config} {task}')
             if self.check_script(config).gui_set_task(task, group, arg, value):
                 return True
             else:
                 return False
         else:
-            logger.info(f'script {config} is not running')
+            logger.info(f'Script {config} is not running')
             return False
 
     @Slot(str, str, str, str, bool, result="bool")
@@ -288,13 +288,13 @@ class ProcessManager(QObject):
         :return:
         """
         if config in self.clients:
-            logger.info(f'gui set value of {config} {task}')
+            logger.info(f'Gui set value of {config} {task}')
             if self.check_script(config).gui_set_task(task, group, arg, value):
                 return True
             else:
                 return False
         else:
-            logger.info(f'script {config} is not running')
+            logger.info(f'Script {config} is not running')
             return False
 
     @Slot(str, str, str, str, float, result="bool")
@@ -309,13 +309,13 @@ class ProcessManager(QObject):
         :return:
         """
         if config in self.clients:
-            logger.info(f'gui set value of {config} {task}')
+            logger.info(f'Gui set value of {config} {task}')
             if self.check_script(config).gui_set_task(task, group, arg, value):
                 return True
             else:
                 return False
         else:
-            logger.info(f'script {config} is not running')
+            logger.info(f'Script {config} is not running')
             return False
 
     @Slot(str, result="QImage")
@@ -325,7 +325,7 @@ class ProcessManager(QObject):
         :return:
         """
         if config in self.clients:
-            logger.info(f'gui get mirror image of {config}')
+            logger.info(f'Gui get mirror image of {config}')
             # 接收流对象
             stream = self.clients[config].gui_mirror_image()
             # 创建 BytesIO 对象来存储图像数据
@@ -344,7 +344,7 @@ class ProcessManager(QObject):
 
 
         else:
-            logger.info(f'script {config} is not running')
+            logger.info(f'Script {config} is not running')
             return None
 
 

+ 21 - 8
module/logger.py

@@ -10,7 +10,7 @@ import traceback
 from io import TextIOBase
 from typing import Callable, List
 
-from rich.console import Console, ConsoleOptions, ConsoleRenderable, NewLine
+from rich.console import Console, ConsoleOptions, ConsoleRenderable, NewLine, RenderResult
 from rich.highlighter import RegexHighlighter, NullHighlighter
 from rich.logging import RichHandler
 from rich.text import Text
@@ -108,7 +108,7 @@ class RichRenderableHandler(RichHandler):
         # 这个message_renderable是一个Text对象
         # traceback是表示异常的对象
         # Directly put renderable into function
-        self._func(message_renderable)
+        self._func(log_renderable)
 
     def handle(self, record: logging.LogRecord) -> bool:
         if not self._func:
@@ -190,7 +190,7 @@ logger_debug = False
 logger = logging.getLogger('oas')
 logger.setLevel(logging.DEBUG if logger_debug else logging.INFO)
 file_formatter = logging.Formatter(
-    fmt='%(asctime)s.%(msecs)03d | %(levelname)s | %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
+    fmt='%(asctime)s.%(msecs)03d | %(levelname)8s | %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
 console_formatter = logging.Formatter(
     fmt='%(asctime)s.%(msecs)03d │ %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
 web_formatter = logging.Formatter(
@@ -203,6 +203,9 @@ web_formatter = logging.Formatter(
 # logger.addHandler(console)
 
 # Add rich console logger
+# ======================================================================================================================
+#            设置控制台的
+# ======================================================================================================================
 stdout_console = console = Console()
 console_hdlr = RichHandler(
     show_path=False,
@@ -252,7 +255,7 @@ def set_file_logger(name=pyw_name):
         file=file,
         no_color=True,
         highlight=False,
-        width=119,
+        width=120,
     )
 
     hdlr = RichFileHandler(
@@ -263,6 +266,7 @@ def set_file_logger(name=pyw_name):
         rich_tracebacks=True,
         tracebacks_show_locals=True,
         tracebacks_extra_lines=3,
+        tracebacks_width=80,
         highlighter=NullHighlighter(),
     )
     hdlr.setFormatter(file_formatter)
@@ -278,9 +282,11 @@ def set_func_logger(func):
     stream = LogStream(func=func)
     file_console = Console(
         file=stream,
+        force_terminal=False,
+        force_interactive=False,
         no_color=True,
         highlight=False,
-        width=160,
+        width=120,
     )
     hdlr = RichStreamHandler(
         console=file_console,
@@ -329,10 +335,16 @@ def print(*objects: ConsoleRenderable, **kwargs):
         elif isinstance(hdlr, RichHandler):
             hdlr.console.print(*objects)
 
+class GuiRule(Rule):
+    def __rich_console__(
+            self, console: Console, options: ConsoleOptions
+    ) -> RenderResult:
+        options.max_width = 80
+        return super().__rich_console__(console, options)
 
 def rule(title="", *, characters="─", style="rule.line", end="\n", align="center"):
-    rule = Rule(title=title, characters=characters,
-                style=style, end=end, align=align)
+    rule = GuiRule(title=title, characters=characters,
+                style=style, end=end)
     print(rule)
 
 
@@ -348,7 +360,7 @@ def hr(title, level=3):
         logger.info(f"[bold]<<< {title} >>>[/bold]", extra={"markup": True})
     if level == 0:
         logger.rule(characters='═')
-        logger.rule(title, characters=' ')
+        logger.rule(title, characters='-')
         logger.rule(characters='═')
 
 
@@ -404,3 +416,4 @@ logger.log_file: str
 logger.set_file_logger()
 logger.hr('Start', level=0)
 
+

+ 2 - 2
script.py

@@ -165,13 +165,13 @@ class Script:
         argument_object = getattr(group_object, argument, None)
 
         if argument_object is None:
-            logger.error(f'gui_set_task {task}.{group}.{argument}.{value} failed')
+            logger.error(f'Set arg {task}.{group}.{argument}.{value} failed')
             return False
 
         try:
             setattr(group_object, argument, value)
             argument_object = getattr(group_object, argument, None)
-            logger.info(f'gui_set_task {task}.{group}.{argument}.{argument_object}')
+            logger.info(f'Set arg {task}.{group}.{argument}.{argument_object}')
             self.config.save()  # 我是没有想到什么方法可以使得属性改变自动保存的
             return True
         except ValidationError as e:

+ 6 - 4
tasks/GameUi/game_ui.py

@@ -212,10 +212,10 @@ class GameUi(BaseTask, GameUiAssets):
                     for button in page.additional:
                         if isinstance(button, RuleImage) and self.appear_then_click(button, interval=1):
                             sleep(0.4)
-                            logger.info(f'Page {page} additional button {button} clicked')
+                            logger.info(f'Page {page} AB {button} clicked')
                         if isinstance(button, RuleOcr) and self.ocr_appear_click(button, interval=1):
                             sleep(0.4)
-                            logger.info(f'Page {page} additional button {button} clicked')
+                            logger.info(f'Page {page} AB {button} clicked')
 
                 # 获取当前页面的要点击的按钮
                 if self.appear(page.check_button, interval=4):
@@ -245,5 +245,7 @@ if __name__ == '__main__':
     c = Config('oas1')
     d = Device(c)
     game = GameUi(config=c, device=d)
-    game.ui_get_current_page(skip_first_screenshot=True)
-    game.ui_goto(page_shikigami_records)
+
+    game.screenshot()
+    print(game.appear(game.I_CHECK_AREA_BOSS))
+    print(game.appear(game.I_RECORDS_CLOSE))