Merge pull request #92 from shinonomeow/shino_aio

add time limit for torrent monitor, fix dmhy hash parser

Author: shinonomeow

backend/src/module/core/renamer_service.py

@@ -1,5 +1,6 @@
 import logging
 from typing import Any
+import asyncio
 
 from module.conf import settings
 from module.core.services import BaseService
@@ -26,7 +27,6 @@ async def initialize(self) -> None:
         await super().initialize()
         self.enable = settings.bangumi_manage.enable
 
-
     def get_task_config(self) -> dict[str, Any]:
         """获取重命名任务配置"""
         return {
@@ -89,7 +89,9 @@ async def _publish_download_completed_event(self, torrent) -> None:
                 },
             )
 
-            await event_bus.publish(event)
+            asyncio.create_task(
+                event_bus.publish(event)  # 异步执行事件发布
+            )  # 异步执行重命名
             logger.debug(f"[RenamerService] 已发布重命名事件: {torrent.name}")
 
         except Exception as e:

backend/src/module/downloader/client/qbittorrent/qbittorrent.py

@@ -6,6 +6,7 @@
 from module.conf import get_plugin_config
 from module.models import TorrentDownloadInfo
 from module.network import RequestContent
+from module.utils import get_hash, base32_to_hex
 
 from ....conf import settings
 from ..base_downloader import BaseDownloader
@@ -230,14 +231,30 @@ async def add(self, torrent_url, save_path, category) -> str | None:
                     )
                     torrent_hashes = await req.get_torrent_hash(torrent_url)
                     # 优先使用v2 hash，如果没有则使用v1 hash
-                    torrent_link = torrent_hashes.get("v2", torrent_hashes.get("v1", ""))
+                    torrent_link = torrent_hashes.get(
+                        "v2", torrent_hashes.get("v1", "")
+                    )
                     logger.debug(f"[QbDownloader] Got torrent hashes: {torrent_hashes}")
                     logger.debug(f"[QbDownloader] Using hash: {torrent_link}")
                     file = {"torrents": torrent_file}
                 else:
                     logger.warning(
                         f"[QbDownloader] Failed to get torrent content from {torrent_url}"
                     )
+        else:
+            # 如果是 magnet 链接，直接使用
+            torrent_link = get_hash(torrent_url)
+            if torrent_link:
+                # 判断是否为32字符的Base32格式（DMHY等站点使用）
+                if len(torrent_link) == 32:
+                    # 转换Base32格式为40字符小写十六进制
+                    hex_hash = base32_to_hex(torrent_link)
+                    if hex_hash:
+                        torrent_link = hex_hash
+                        logger.debug(
+                            f"[QbDownloader] 转换Base32 hash为十六进制: {torrent_link}"
+                        )
+            logger.debug(f"[QbDownloader] Using magnet link: {torrent_url}")
         try:
             resp = await self._client.post(
                 url=QB_API_URL["add"],

backend/src/module/downloader/download_monitor.py

@@ -1,5 +1,6 @@
 import asyncio
 import logging
+from datetime import datetime, timedelta
 
 from module.database import Database
 from module.downloader.download_client import Client as download_client
@@ -108,13 +109,37 @@ async def monitor_torrent(self, bangumi: Bangumi, torrent: Torrent) -> None:
         """
         try:
             torrent_hash = torrent.download_uid
-            logger.debug(f"[DownloadMonitor] 开始监控种子: {torrent.name} ({torrent_hash})")
+            logger.debug(
+                f"[DownloadMonitor] 开始监控种子: {torrent.name} ({torrent_hash})"
+            )
             if not torrent_hash:
                 logger.warning(f"[DownloadMonitor] 种子 {torrent.name} 没有下载UID")
                 return
 
             retry_count = 0
+            start_time = datetime.now()
+            timeout_limit = timedelta(hours=4)
+
             while not self._shutdown:
+                # 检查是否超过4小时超时限制
+                current_time = datetime.now()
+                if current_time - start_time > timeout_limit:
+                    logger.warning(
+                        f"[DownloadMonitor] 种子 {torrent.name} 超过4小时未完成下载，标记为已下载和已重命名"
+                    )
+                    try:
+                        with Database() as db:
+                            if torrent_item := db.torrent.search_by_duid(torrent_hash):
+                                torrent_item.downloaded = True
+                                torrent_item.renamed = True
+                                db.torrent.add(torrent_item)
+                                logger.info(
+                                    f"[DownloadMonitor] 已将超时种子标记为完成: {torrent.name}"
+                                )
+                    except Exception as e:
+                        logger.error(f"[DownloadMonitor] 更新超时种子状态失败: {e}")
+                    break
+
                 # 获取种子信息
                 info = await download_client.get_torrent_info(torrent_hash)
                 logger.debug(

backend/src/module/utils/__init__.py

@@ -1,8 +1,7 @@
-from .bangumi_data import get_hash
 from .cache_image import gen_poster_path, str_to_url, url_to_str
 from .events import Event, EventBus, EventType, event_bus
 from .path_parser import check_file, gen_save_path, get_path_basename, path_to_bangumi
-from .torrent import torrent_to_link, get_torrent_hashes
+from .torrent import torrent_to_link, get_torrent_hashes, normalize_hash, base32_to_hex, hex_to_base32, get_hash
 
 __all__ = [
     "check_file",
@@ -11,6 +10,9 @@
     "url_to_str",
     "torrent_to_link",
     "get_torrent_hashes",
+    "normalize_hash",
+    "base32_to_hex", 
+    "hex_to_base32",
     "str_to_url",
     "path_to_bangumi",
     "get_hash",

backend/src/module/utils/bangumi_data.py

@@ -2,6 +2,7 @@
 import hashlib
 from urllib.parse import quote
 import logging
+import re
 
 import bencodepy
 
@@ -119,3 +120,103 @@ async def get_torrent_hashes(torrent_file):
     except Exception as e:
         logger.error(f"get_torrent_hashes: Error processing torrent file: {e}")
         return {"v1": ""}
+
+
+def base32_to_hex(base32_hash: str) -> str:
+    """将Base32格式的hash转换为十六进制
+    
+    Args:
+        base32_hash: 32字符的Base32编码hash
+        
+    Returns:
+        40字符的小写十六进制hash，转换失败返回空字符串
+    """
+    try:
+        # Base32解码
+        decoded = base64.b32decode(base32_hash)
+        return decoded.hex().lower()
+    except Exception as e:
+        logger.warning(f"Base32转换失败: {base32_hash}, error: {e}")
+        return ""
+
+
+def hex_to_base32(hex_hash: str) -> str:
+    """将十六进制hash转换为Base32格式
+    
+    Args:
+        hex_hash: 40字符的十六进制hash
+        
+    Returns:
+        32字符的Base32编码hash，转换失败返回空字符串
+    """
+    try:
+        # 十六进制转字节
+        hex_bytes = bytes.fromhex(hex_hash)
+        # 编码为Base32，去掉填充符
+        return base64.b32encode(hex_bytes).decode().rstrip('=')
+    except Exception as e:
+        logger.warning(f"十六进制转Base32失败: {hex_hash}, error: {e}")
+        return ""
+
+
+def normalize_hash(hash_value: str) -> str:
+    """标准化hash格式，统一转换为40字符小写十六进制
+    
+    Args:
+        hash_value: 输入的hash值，可能是40字符十六进制或32字符Base32
+        
+    Returns:
+        标准化的40字符小写十六进制hash
+    """
+    if not hash_value:
+        return ""
+    
+    hash_value = hash_value.strip()
+    
+    # 40字符十六进制格式
+    if len(hash_value) == 40 and re.match(r'^[a-fA-F0-9]{40}$', hash_value):
+        return hash_value.lower()
+    
+    # 32字符Base32格式 (DMHY等站点常用)
+    if len(hash_value) == 32 and re.match(r'^[A-Z0-9]{32}$', hash_value):
+        hex_hash = base32_to_hex(hash_value)
+        if hex_hash:
+            logger.debug(f"将Base32 hash {hash_value} 转换为十六进制: {hex_hash}")
+            return hex_hash
+    
+    # 其他情况，尝试转小写
+    normalized = hash_value.lower()
+    logger.debug(f"hash标准化: {hash_value} -> {normalized}")
+    return normalized
+
+
+def get_hash(torrent_url: str) -> str | None:
+    """从torrent URL或magnet链接中提取hash
+    
+    Args:
+        torrent_url: torrent文件URL或magnet链接
+        
+    Returns:
+        提取的hash值，提取失败返回空字符串
+    """
+    hash_pattern_dict = {
+        "magnet_hash_pattern": re.compile(r"\b([a-fA-F0-9]{40})\b"),
+        "torrent_hash_pattern": re.compile(r"/([a-fA-F0-9]{7,40})\.torrent"),
+        "dmhy_hash_pattern": re.compile(r"urn:btih:([A-Z0-9]{32})"),
+    }
+    
+    for pattern_name, hash_pattern in hash_pattern_dict.items():
+        ans = re.search(hash_pattern, torrent_url)
+        if ans:
+            extracted_hash = ans[1]
+            logger.debug(f"使用{pattern_name}提取hash: {extracted_hash}")
+            
+            # 使用normalize_hash标准化hash格式
+            normalized_hash = normalize_hash(extracted_hash)
+            if normalized_hash != extracted_hash:
+                logger.debug(f"hash已标准化: {extracted_hash} -> {normalized_hash}")
+            
+            return normalized_hash
+    
+    logger.warning(f"[Utils] Cannot find hash in {torrent_url}")
+    return ""