Merge pull request #74 from shinonomeow/shino_aio

add renamer service and fix disable error on rename

Author: shinonomeow

backend/src/module/core/aiocore.py

@@ -4,6 +4,8 @@
 from typing import Any
 
 from module.utils.events import event_bus
+from module.conf import settings
+
 from .task_manager import TaskManager
 
 logger = logging.getLogger(__name__)
@@ -30,11 +32,13 @@ async def initialize(self) -> None:
 
         try:
             # 创建服务实例
-            from .services import RSSService, DownloadService
+            from .renamer_service import RenamerService
+            from .services import DownloadService, RSSService
 
             self.services = [
                 DownloadService(),
                 RSSService(),
+                RenamerService(),
             ]
 
             # 初始化所有服务
@@ -65,7 +69,6 @@ async def _register_tasks(self) -> None:
                     name=config["name"],
                     coro_func=service.execute,
                     interval=config["interval"],
-                    max_retries=config["max_retries"],
                 )
                 logger.debug(f"[AsyncCore] 注册任务: {config['name']}")
 
@@ -85,14 +88,18 @@ async def _register_event_handlers(self) -> None:
             )
             logger.info("[AsyncCore] 已注册 DownloadMonitor 事件处理器")
 
-            # 创建并注册 RenameMonitor
-            self._rename_monitor = RenameMonitor(event_bus=self.event_bus)
-            await self._rename_monitor.initialize()
-            self.event_bus.subscribe(
-                EventType.DOWNLOAD_COMPLETED,
-                self._rename_monitor.handle_download_completed,
-            )
-            logger.info("[AsyncCore] 已注册 RenameMonitor 事件处理器")
+            # 创建并注册 RenameMonitor (仅在启用重命名功能时)
+            if settings.bangumi_manage.enable:
+                self._rename_monitor = RenameMonitor(event_bus=self.event_bus)
+                await self._rename_monitor.initialize()
+                self.event_bus.subscribe(
+                    EventType.DOWNLOAD_COMPLETED,
+                    self._rename_monitor.handle_download_completed,
+                )
+                logger.info("[AsyncCore] 已注册 RenameMonitor 事件处理器")
+            else:
+                self._rename_monitor = None
+                logger.info("[AsyncCore] 重命名功能已禁用，跳过 RenameMonitor 注册")
 
             # 创建并注册 NotificationMonitor
             self._notification_monitor = NotificationMonitor(event_bus=self.event_bus)

backend/src/module/core/renamer_service.py

@@ -0,0 +1,88 @@
+import logging
+from typing import Any
+
+from module.conf import settings
+from module.core.services import BaseService
+from module.database import Database
+from module.manager.renamer import Renamer
+from module.utils.events import Event, EventType, event_bus
+
+logger = logging.getLogger(__name__)
+
+
+class RenamerService(BaseService):
+    """重命名服务 - 检查已下载但未重命名的种子并发布重命名事件"""
+
+    def __init__(self):
+        super().__init__()
+        self._renamer: Renamer | None = None
+
+    async def _setup(self) -> None:
+        """初始化重命名器"""
+        self._renamer = Renamer()
+
+    def get_task_config(self) -> dict[str, Any]:
+        """获取重命名任务配置"""
+        return {
+            "name": "renamer_check",
+            "interval": 600,  # 转换为秒
+            "enabled": settings.bangumi_manage.enable,
+        }
+
+    async def execute(self) -> None:
+        """执行重命名检查任务"""
+        if not self._renamer:
+            logger.error("[RenamerService] 重命名器未初始化")
+            return
+
+        try:
+            # 查询已下载但未重命名的种子
+            with Database() as db:
+                unrenamed_torrents = db.torrent.search_downloaded_unrenamed()
+
+            if not unrenamed_torrents:
+                logger.debug("[RenamerService] 没有需要重命名的种子")
+                return
+
+            logger.info(
+                f"[RenamerService] 发现 {len(unrenamed_torrents)} 个需要重命名的种子"
+            )
+
+            # 为每个种子发布下载完成事件，触发重命名流程
+            for torrent in unrenamed_torrents:
+                await self._publish_download_completed_event(torrent)
+
+        except Exception as e:
+            logger.error(f"[RenamerService] 执行失败: {e}")
+            raise
+
+    async def _publish_download_completed_event(self, torrent) -> None:
+        """发布下载完成事件
+
+        Args:
+            torrent: 种子信息
+        """
+        try:
+            # 获取对应的番剧信息
+            with Database() as db:
+                bangumi = db.torrent_to_bangumi(torrent)
+            
+            if not bangumi:
+                logger.warning(f"[RenamerService] 无法找到种子 {torrent.name} 对应的番剧信息")
+                return
+
+            event = Event(
+                type=EventType.DOWNLOAD_COMPLETED,
+                data={
+                    "torrent": torrent,
+                    "bangumi": bangumi,
+                    "download_uid": torrent.download_uid,
+                    "name": torrent.name,
+                },
+            )
+
+            await event_bus.publish(event)
+            logger.debug(f"[RenamerService] 已发布重命名事件: {torrent.name}")
+
+        except Exception as e:
+            logger.error(f"[RenamerService] 发布重命名事件失败: {e}")

backend/src/module/database/torrent.py

@@ -77,6 +77,16 @@ def search_all_downloaded(self) -> list[Torrent]:
         ).all()
         return list(torrents)
 
+    def search_downloaded_unrenamed(self) -> list[Torrent]:
+        """查询已下载但未重命名的种子"""
+        torrents = self.session.exec(
+            select(Torrent).where(
+                Torrent.downloaded == true(),
+                Torrent.renamed == false()
+            )
+        ).all()
+        return list(torrents)
+
     # def search_rss(self, rss_url: int) -> list[Torrent]:
     #     """根据RSS url查询所有种子"""
     #     torrents = self.session.exec(select(Torrent).where(Torrent.rss_link == rss_url)).all()

backend/src/module/downloader/download_monitor.py

@@ -181,7 +181,7 @@ async def _publish_download_completed(
                 data={"torrent": torrent, "bangumi": bangumi},
             )
 
-            await self._event_bus.publish(event)
+            asyncio.create_task(self._event_bus.publish(event))
             logger.debug(f"[DownloadMonitor] 已发布下载完成事件: {torrent.name}")
 
         except Exception as e:

backend/src/module/downloader/download_queue.py

@@ -49,9 +49,6 @@ async def download(self):
         for _ in range(min(queue.qsize(), 5)):
             torrent, bangumi = queue.get_nowait()
 
-            # torrent.bangumi_official_title = bangumi.official_title
-            # torrent.bangumi_season = bangumi.season
-            # torrent.rss_link = bangumi.rss_link
             queue.task_done()
             logging.debug(f"[Download Controller] start download {torrent.name}")
             torrents.append(torrent)
@@ -102,7 +99,7 @@ async def _publish_download_started(
                 data={"torrent": torrent, "bangumi": bangumi},
             )
 
-            await self._event_bus.publish(event)
+            asyncio.create_task( self._event_bus.publish(event))
             logger.debug(f"[Download Controller] 已发布下载开始事件: {torrent.name}")
 
         except Exception as e:

backend/src/module/manager/rename_monitor.py

@@ -1,6 +1,7 @@
 import asyncio
 import logging
 
+from module.conf import settings
 from module.utils.events import Event, EventType, EventBus
 from module.manager import Renamer
 from module.models import Bangumi, Torrent
@@ -122,7 +123,7 @@ async def _publish_rename_completed(
                 data={"torrent": torrent, "bangumi": bangumi},
             )
 
-            await self._event_bus.publish(event)
+            asyncio.create_task(self._event_bus.publish(event))
             logger.info(f"[RenameMonitor] 已发布重命名完成事件: {torrent.name}")
 
         except Exception as e:

backend/src/module/manager/renamer.py

@@ -200,7 +200,7 @@ async def _publish_notification_request(self, notify_info: Notification) -> None
                 data={"notify_info": notify_info},
             )
 
-            await self._event_bus.publish(event)
+            asyncio.create_task(self._event_bus.publish(event))
             logger.debug(f"[Download Controller] 已发布通知请求事件: {notify_info.title}")
 
         except Exception as e:

backend/src/module/parser/analyser/raw_parser.py

@@ -157,7 +157,7 @@ def parse_season(
             # 如果是非可信季度信息，返回第一个有效的季度
             else:
                 if len(season_info[0]) ==1 and season_list[0] > 1:
-                    re.sub(p.SEASON_PATTERN_UNTRUSTED,"/[]" , self.title)
+                    self.findall_sub_title(p.SEASON_PATTERN_UNTRUSTED)
                     return season_list[0], season_info[0]
 
         return 1, ""
@@ -408,9 +408,9 @@ def is_point_5(title: str) -> bool:
     # # #
     # title = "碧蓝之海 第二季.mp4"
     # title = "坂本日常 第2部分"
-    # title = "[ANi] Grand Blue Dreaming /  GRAND BLUE 碧蓝之海 2 - 04 [1080P][Baha][WEB-DL][AAC AVC][CHT][MP4]"
-    title =  "[Lilith-Raws] Boku no Kokoro no Yabai Yatsu - 01 [Baha][WEB-DL][1080p][AVC AAC][CHT].mp4"
-    title = "【极影字幕社】★4月新番 天国大魔境 Tengoku Daimakyou 第05话 GB 720P MP4（字幕社招人内详）"
+    title = "[ANi] Grand Blue Dreaming /  GRAND BLUE 碧蓝之海 2 - 04 [1080P][Baha][WEB-DL][AAC AVC][CHT][MP4]"
+    # title =  "[Lilith-Raws] Boku no Kokoro no Yabai Yatsu - 01 [Baha][WEB-DL][1080p][AVC AAC][CHT].mp4"
+    # title = "【极影字幕社】★4月新番 天国大魔境 Tengoku Daimakyou 第05话 GB 720P MP4（字幕社招人内详）"
     res = raw_parser(title)
     for k, v in res.__dict__.items():
         print(f"{k}: {v}")