From 8a109e34f8eab30db16ae65f6943464fa721a9e7 Mon Sep 17 00:00:00 2001
From: DLmaster361 <DLmaster_361@163.com>
Date: Sat, 19 Jul 2025 10:27:19 +0800
Subject: [PATCH] =?UTF-8?q?refactor(module):=20=E9=87=8D=E6=9E=84=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=AF=BB=E5=8F=96=E5=85=9C=E5=BA=95=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/MAA.py     | 35 +++++++++++++++--------------------
 app/models/general.py | 42 ++++++++++++++----------------------------
 2 files changed, 29 insertions(+), 48 deletions(-)

diff --git a/app/models/MAA.py b/app/models/MAA.py
index 60565e2..c08b20b 100644
--- a/app/models/MAA.py
+++ b/app/models/MAA.py
@@ -1181,12 +1181,16 @@ class MaaManager(QObject):
     def refresh_maa_log(self) -> None:
         """刷新MAA日志"""
 
-        logger.debug(
-            f"刷新MAA日志：{self.maa_log_path}", module=f"MAA调度器-{self.name}"
-        )
-
-        with self.maa_log_path.open(mode="r", encoding="utf-8") as f:
-            pass
+        if self.maa_log_path.exists():
+            with self.maa_log_path.open(mode="r", encoding="utf-8") as f:
+                logger.debug(
+                    f"刷新MAA日志：{self.maa_log_path}", module=f"MAA调度器-{self.name}"
+                )
+        else:
+            logger.warning(
+                f"MAA日志文件不存在：{self.maa_log_path}",
+                module=f"MAA调度器-{self.name}",
+            )
 
         # 一分钟内未执行日志变化检查，强制检查一次
         if datetime.now() - self.last_check_time > timedelta(minutes=1):
@@ -1199,10 +1203,9 @@ class MaaManager(QObject):
         self.last_check_time = datetime.now()
 
         # 获取日志
-        self.maa_logs = []
-        if_log_start = False
-
-        try:
+        if self.maa_log_path.exists():
+            self.maa_logs = []
+            if_log_start = False
             with self.maa_log_path.open(mode="r", encoding="utf-8") as f:
                 for entry in f:
                     if not if_log_start:
@@ -1217,19 +1220,11 @@ class MaaManager(QObject):
                             pass
                     else:
                         self.maa_logs.append(entry)
-        except FileNotFoundError:
-            logger.error(
+        else:
+            logger.warning(
                 f"MAA日志文件不存在：{self.maa_log_path}",
                 module=f"MAA调度器-{self.name}",
             )
-            self.update_log_text.emit("MAA日志文件不存在")
-            return None
-        except Exception as e:
-            logger.exception(
-                f"读取MAA日志文件时出现异常：{e}",
-                module=f"MAA调度器-{self.name}",
-            )
-            self.update_log_text.emit(f"读取MAA日志文件时出现异常：{e}")
             return None
 
         log = "".join(self.maa_logs)
diff --git a/app/models/general.py b/app/models/general.py
index c586e06..67cdc83 100644
--- a/app/models/general.py
+++ b/app/models/general.py
@@ -699,22 +699,17 @@ class GeneralManager(QObject):
     def refresh_log(self) -> None:
         """刷新脚本日志"""
 
-        logger.debug(
-            f"刷新通用脚本日志：{self.script_log_path}",
-            module=f"通用调度器-{self.name}",
-        )
-
-        try:
+        if self.script_log_path.exists():
             with self.script_log_path.open(mode="r", encoding="utf-8") as f:
-                pass
-
-        except FileNotFoundError:
-            logger.error(
-                f"脚本日志文件不存在：{self.script_log_path}",
+                logger.debug(
+                    f"刷新通用脚本日志：{self.script_log_path}",
+                    module=f"通用调度器-{self.name}",
+                )
+        else:
+            logger.warning(
+                f"通用脚本日志文件不存在：{self.script_log_path}",
                 module=f"通用调度器-{self.name}",
             )
-        except Exception as e:
-            logger.exception(f"刷新脚本日志失败：{e}", module=f"通用调度器-{self.name}")
 
         # 一分钟内未执行日志变化检查，强制检查一次
         if (datetime.now() - self.last_check_time).total_seconds() > 60:
@@ -755,10 +750,9 @@ class GeneralManager(QObject):
         self.last_check_time = datetime.now()
 
         # 获取日志
-        self.script_logs = []
-        if_log_start = False
-
-        try:
+        if self.script_log_path.exists():
+            self.script_logs = []
+            if_log_start = False
             with self.script_log_path.open(mode="r", encoding="utf-8") as f:
                 for entry in f:
                     if not if_log_start:
@@ -776,19 +770,11 @@ class GeneralManager(QObject):
                             pass
                     else:
                         self.script_logs.append(entry)
-
-        except FileNotFoundError:
-            logger.error(
-                f"脚本日志文件不存在：{self.script_log_path}",
+        else:
+            logger.warning(
+                f"通用脚本日志文件不存在：{self.script_log_path}",
                 module=f"通用调度器-{self.name}",
             )
-            self.update_log_text.emit("脚本日志文件不存在")
-            return None
-        except Exception as e:
-            logger.exception(
-                f"读取脚本日志文件失败：{e}", module=f"通用调度器-{self.name}"
-            )
-            self.update_log_text.emit(f"读取脚本日志文件失败：{e}")
             return None
 
         log = "".join(self.script_logs)