feat(core): 重构日志记录，载入更多日志记录项

app/core/network.py

@@ -25,7 +25,6 @@ v4.4
 作者：DLmaster_361
 """
 
-from loguru import logger
 from PySide6.QtCore import QObject, QThread, QEventLoop
 import re
 import time
@@ -33,6 +32,8 @@ import requests
 import truststore
 from pathlib import Path
 
+from .logger import logger
+
 
 class NetworkThread(QThread):
     """网络请求线程类"""
@@ -48,6 +49,8 @@ class NetworkThread(QThread):
             f"NetworkThread-{mode}-{re.sub(r'(&cdk=)[^&]+(&)', r'\1******\2', url)}"
         )
 
+        logger.info(f"创建网络请求线程: {self.objectName()}", module="网络请求子线程")
+
         self.mode = mode
         self.url = url
         self.path = path
@@ -65,7 +68,7 @@ class NetworkThread(QThread):
 
         self.loop = QEventLoop()
 
-        truststore.inject_into_ssl()
+        truststore.inject_into_ssl()  # 信任系统证书
 
     @logger.catch
     def run(self) -> None:
@@ -77,7 +80,13 @@ class NetworkThread(QThread):
             self.get_file(self.url, self.path)
 
     def get_json(self, url: str) -> None:
-        """通过get方法获取json数据"""
+        """
+        通过get方法获取json数据
+
+        :param url: 请求的URL
+        """
+
+        logger.info(f"子线程 {self.objectName()} 开始网络请求", module="网络请求子线程")
 
         response = None
 
@@ -92,12 +101,23 @@ class NetworkThread(QThread):
                 self.status_code = response.status_code if response else None
                 self.response_json = None
                 self.error_message = str(e)
+                logger.exception(
+                    f"子线程 {self.objectName()} 网络请求失败：{e}",
+                    module="网络请求子线程",
+                )
                 time.sleep(self.backoff_factor)
 
         self.loop.quit()
 
     def get_file(self, url: str, path: Path) -> None:
-        """通过get方法下载文件"""
+        """
+        通过get方法下载文件到指定路径
+
+        :param url: 请求的URL
+        :param path: 下载文件的保存路径
+        """
+
+        logger.info(f"子线程 {self.objectName()} 开始下载文件", module="网络请求子线程")
 
         response = None
 
@@ -114,12 +134,15 @@ class NetworkThread(QThread):
         except Exception as e:
             self.status_code = response.status_code if response else None
             self.error_message = str(e)
+            logger.exception(
+                f"子线程 {self.objectName()} 网络请求失败：{e}", module="网络请求子线程"
+            )
 
         self.loop.quit()
 
 
 class _Network(QObject):
-    """网络请求线程类"""
+    """网络请求线程管理类"""
 
     def __init__(self) -> None:
         super().__init__()
@@ -127,7 +150,16 @@ class _Network(QObject):
         self.task_queue = []
 
     def add_task(self, mode: str, url: str, path: Path = None) -> NetworkThread:
-        """添加网络请求任务"""
+        """
+        添加网络请求任务
+
+        :param mode: 请求模式，支持 "get", "get_file"
+        :param url: 请求的URL
+        :param path: 下载文件的保存路径，仅在 mode 为 "get_file" 时有效
+        :return: 返回创建的 NetworkThread 实例
+        """
+
+        logger.info(f"添加网络请求任务: {mode} {url} {path}", module="网络请求")
 
         network_thread = NetworkThread(mode, url, path)
 
@@ -138,7 +170,12 @@ class _Network(QObject):
         return network_thread
 
     def get_result(self, network_thread: NetworkThread) -> dict:
-        """获取网络请求结果"""
+        """
+        获取网络请求结果
+
+        :param network_thread: 网络请求线程实例
+        :return: 包含状态码、响应JSON和错误信息的字典
+        """
 
         result = {
             "status_code": network_thread.status_code,
@@ -155,6 +192,11 @@ class _Network(QObject):
         self.task_queue.remove(network_thread)
         network_thread.deleteLater()
 
+        logger.info(
+            f"网络请求结果: {result['status_code']}，请求子线程已结束",
+            module="网络请求",
+        )
+
         return result