Merge pull request #93 from shinonomeow/shino_aio

refactor: restructure core services and monitors architecture

Author: shinonomeow

backend/src/module/core/aiocore.py

@@ -5,7 +5,8 @@
 
 from module.utils.events import event_bus
 
-from .task_manager import TaskManager 
+from .task_manager import TaskManager
+
 logger = logging.getLogger(__name__)
 
 
@@ -22,6 +23,7 @@ def __init__(self):
         self._download_monitor = None
         self._rename_monitor = None
         self._notification_monitor = None
+        self.monitors:list = []
         self._running: bool = False
         self._initialized: bool = False
 
@@ -31,8 +33,7 @@ async def initialize(self) -> None:
 
         try:
             # 创建服务实例
-            from .renamer_service import RenamerService
-            from .services import DownloadService, RSSService
+            from .services import DownloadService, RenamerService, RSSService
 
             self.services = [
                 DownloadService(),
@@ -76,11 +77,17 @@ async def _register_tasks(self) -> None:
     async def _register_event_handlers(self) -> None:
         """注册事件处理器"""
         try:
-            from module.downloader.download_monitor import download_monitor
-            from module.manager.rename_monitor import RenameMonitor
-            from module.notification.notification_monitor import NotificationMonitor
+            # from module.downloader.download_monitor import download_monitor
+            # from module.manager.rename_monitor import RenameMonitor
+            # from module.notification import NotificationMonitor
             from module.utils.events import EventType
 
+            from .monitors import (
+                NotificationMonitor,
+                RenameMonitor,
+                download_monitor,
+            )
+
             # 使用全局 DownloadMonitor 实例
             self._download_monitor = download_monitor
             self._download_monitor.initialize()
@@ -169,31 +176,6 @@ async def _cleanup_services(self) -> None:
             except Exception as e:
                 logger.error(f"[AsyncCore] 服务 {service.name} 清理失败: {e}")
 
-    def get_status(self) -> dict[str, Any]:
-        """获取应用状态"""
-        status = {
-            "running": self._running,
-            "initialized": self._initialized,
-            "tasks": self.task_manager.get_status(),
-            "services": [
-                {"name": s.name, "initialized": getattr(s, "_initialized", False)}
-                for s in self.services
-            ],
-            "event_bus": self.event_bus.get_subscribers_count(),
-        }
-
-        # 添加监控器状态
-        if self._download_monitor:
-            status["download_monitor"] = self._download_monitor.get_monitoring_status()
-
-        status["monitors"] = {
-            "download_monitor": bool(self._download_monitor),
-            "rename_monitor": bool(self._rename_monitor),
-            "notification_monitor": bool(self._notification_monitor),
-        }
-
-        return status
-
     @asynccontextmanager
     async def lifespan(self):
         """生命周期管理器"""

backend/src/module/core/monitors/__init__.py

@@ -0,0 +1,10 @@
+from .download_monitor import DownloadMonitor,download_monitor
+from .notification_monitor import NotificationMonitor
+from .rename_monitor import RenameMonitor
+
+__all__ = [
+    "DownloadMonitor",
+    "download_monitor",
+    "NotificationMonitor",
+    "RenameMonitor",
+]

…rc/module/downloader/download_monitor.py …module/core/monitors/download_monitor.pybackend/src/module/downloader/download_monitor.py renamed to backend/src/module/core/monitors/download_monitor.py backend/src/module/downloader/download_monitor.py renamed to backend/src/module/core/monitors/download_monitor.py

@@ -27,6 +27,7 @@ async def initialize(self):
         if not self.enable:
             logger.warning("[NotificationMonitor] 通知功能未启用")
             return
+        self._notification_sender.initialize()
         self._running = True
         self._event_bus.subscribe(
             EventType.NOTIFICATION_REQUEST,

…ule/notification/notification_monitor.py …le/core/monitors/notification_monitor.pybackend/src/module/notification/notification_monitor.py renamed to backend/src/module/core/monitors/notification_monitor.py backend/src/module/notification/notification_monitor.py renamed to backend/src/module/core/monitors/notification_monitor.py

@@ -2,7 +2,6 @@
 import logging
 
 from module.conf import settings
-from module.database import Database
 from module.manager import Renamer
 from module.models import Bangumi, Torrent
 from module.utils import event_bus

…end/src/module/manager/rename_monitor.py …c/module/core/monitors/rename_monitor.pybackend/src/module/manager/rename_monitor.py renamed to backend/src/module/core/monitors/rename_monitor.py backend/src/module/manager/rename_monitor.py renamed to backend/src/module/core/monitors/rename_monitor.py

@@ -0,0 +1,6 @@
+from .base_services import BaseService
+from .download_service import DownloadService
+from .renamer_service import RenamerService
+from .rss_service import RSSService
+
+__all__ = ["BaseService", "DownloadService", "RenamerService", "RSSService"]

backend/src/module/core/services.py

@@ -0,0 +1,59 @@
+import asyncio
+import logging
+from abc import ABC, abstractmethod
+from typing import TYPE_CHECKING, Any
+
+from typing_extensions import override
+
+from module.conf import settings
+from module.utils.events import ServiceException
+
+if TYPE_CHECKING:
+    from module.rss import RSSEngine
+
+logger = logging.getLogger(__name__)
+
+
+class BaseService(ABC):
+    """服务基类"""
+
+    def __init__(self, name: str | None = None):
+        # 如果没有指定名称，使用类名自动生成
+        if name is None:
+            name = self.__class__.__name__.lower().replace("service", "")
+        self.name = name
+        self._initialized = False
+
+    async def initialize(self) -> None:
+        """初始化服务"""
+        if not self._initialized:
+            try:
+                await self._setup()
+                self._initialized = True
+                logger.info(f"[{self.name}Service] 初始化完成")
+            except Exception as e:
+                logger.error(f"[{self.name}Service] 初始化失败: {e}")
+                raise ServiceException(self.name, f"初始化失败: {e}")
+
+    @abstractmethod
+    async def _setup(self) -> None:
+        """子类实现具体初始化逻辑"""
+        pass
+
+    @abstractmethod
+    async def execute(self) -> None:
+        """执行服务逻辑"""
+        pass
+
+    @abstractmethod
+    def get_task_config(self) -> dict[str, Any]:
+        """获取任务配置"""
+        pass
+
+    async def cleanup(self) -> None:
+        """清理资源"""
+        pass
+
+    def is_initialized(self) -> bool:
+        """检查是否已初始化"""
+        return self._initialized