Merge pull request #88 from shinonomeow/shino_aio

fix get info error when torrent is a hybird torrent

Author: shinonomeow

backend/src/main.py

@@ -29,6 +29,7 @@
 }
 
 
+
 def create_app() -> FastAPI:
     app = FastAPI(lifespan=lifespan)
 

backend/src/module/conf/__init__.py

@@ -6,7 +6,6 @@
 from .search_provider import SEARCH_CONFIG
 
 PLATFORM = sys.platform
-TMDB_API = "291237f90b24267380d6176c98f7619f"
 DATA_PATH = "sqlite:///data/data.db"
 LEGACY_DATA_PATH = Path("data/data.json")
 VERSION_PATH = Path("config/version.info")
@@ -15,7 +14,6 @@
 
 __all__ = [
     "VERSION",
-    "TMDB_API",
     "DATA_PATH",
     "LEGACY_DATA_PATH",
     "VERSION_PATH",

backend/src/module/conf/log.py

@@ -1,5 +1,5 @@
 import logging
-from logging import NullHandler
+from logging.handlers import RotatingFileHandler
 from pathlib import Path
 
 from .config import settings
@@ -38,7 +38,12 @@ def setup_logger(level: int = logging.INFO, reset: bool = False):
             datefmt=TIME_FORMAT,
             encoding="utf-8",
             handlers=[
-                logging.FileHandler(LOG_PATH, encoding="utf-8"),
+                RotatingFileHandler(
+                    LOG_PATH, 
+                    maxBytes=10*1024*1024,  # 10MB
+                    backupCount=5,
+                    encoding="utf-8"
+                ),
                 logging.StreamHandler(),
             ],
             force=reset,  # 强制重新配置如果是重置模式

backend/src/module/conf/tmdb.py

@@ -1,18 +1,28 @@
 """TMDB API configuration and constants."""
 
-from . import TMDB_API
+from .config import settings
+
 
 TMDB_URL = "https://api.themoviedb.org"
 TMDB_IMG_URL = "https://image.tmdb.org/t/p/w780"
 
+# Default TMDB API key, replace with your own key if needed
+# Note: Using a public key is not recommended for production use.
+# It is better to set your own key in the configuration.
+t = "291237f90b24267380d6176c98f7619f"
+
 LANGUAGE = {"zh": "zh-CN", "jp": "ja-JP", "en": "en-US"}
 
+def get_api_key():
+    """Get the TMDB API key from settings."""
+    return settings.rss_parser.tmdb_api_key or t
+
 
 def search_url(keyword: str) -> str:
     """Generate TMDB search URL for TV shows."""
-    return f"{TMDB_URL}/3/search/tv?api_key={TMDB_API}&page=1&query={keyword}&include_adult=false"
+    return f"{TMDB_URL}/3/search/tv?api_key={get_api_key()}&page=1&query={keyword}&include_adult=false"
 
 
 def info_url(show_id: str, language: str) -> str:
     """Generate TMDB info URL for a specific TV show."""
-    return f"{TMDB_URL}/3/tv/{show_id}?api_key={TMDB_API}&language={LANGUAGE[language]}"
+    return f"{TMDB_URL}/3/tv/{show_id}?api_key={get_api_key()}&language={LANGUAGE[language]}"

backend/src/module/conf/uvicorn_logging.py

@@ -3,7 +3,6 @@
 from contextlib import asynccontextmanager
 from typing import Any
 
-from module.conf import settings
 from module.utils.events import event_bus
 
 from .task_manager import TaskManager

backend/src/module/core/aiocore.py

@@ -1,6 +1,5 @@
 import logging
 
-from sqlalchemy.sql import func
 from sqlmodel import Session, and_, delete, false, or_, select
 
 from module.models import Bangumi, BangumiUpdate

backend/src/module/core/example_service.py

@@ -2,14 +2,15 @@
 
 from sqlmodel import Session, SQLModel, and_, delete, false, or_, select, text
 
-from module.database.bangumi import BangumiDatabase
-from module.database.database_version import VersionDatabase
-from module.database.engine import engine as e
-from module.database.rss import RSSDatabase
-from module.database.torrent import TorrentDatabase
-from module.database.user import UserDatabase
 from module.models import Bangumi, RSSItem, Torrent, User
 
+from .bangumi import BangumiDatabase
+from .database_version import VersionDatabase
+from .engine import engine as e
+from .rss import RSSDatabase
+from .torrent import TorrentDatabase
+from .user import UserDatabase
+
 logger = logging.getLogger(__name__)
 
 

backend/src/module/database/bangumi.py

@@ -7,10 +7,11 @@
 from pathlib import Path
 from typing import Callable
 
+from packaging import version
 from sqlmodel import Session, text
 
 from module.conf import DATA_PATH
-from module.database.engine import engine
+from .engine import engine
 from module.models import DatabaseVersion
 
 logger = logging.getLogger(__name__)
@@ -130,35 +131,34 @@ def _get_migration_path(self, from_version: str, to_version: str) -> list[str]:
                 migrations_needed.append(version)
 
         # 按版本号排序
-        migrations_needed.sort(key=lambda v: self._version_to_tuple(v))
+        migrations_needed.sort(key=lambda v: version.parse(v))
 
         return migrations_needed
 
     def _version_compare(self, version1: str, version2: str) -> int:
         """比较两个版本号
         返回值: 1 表示 version1 > version2, 0 表示相等, -1 表示 version1 < version2
         """
-        v1_tuple = self._version_to_tuple(version1)
-        v2_tuple = self._version_to_tuple(version2)
-
-        if v1_tuple > v2_tuple:
-            return 1
-        elif v1_tuple < v2_tuple:
-            return -1
-        else:
-            return 0
-
-    def _version_to_tuple(self, version: str) -> tuple:
-        """将版本字符串转换为可比较的元组"""
         try:
-            # 处理类似 "3.2.0" 或 "3.2.0-beta" 的版本号
-            # 先移除后缀 (如 -beta, -alpha, -dev 等)
-            base_version = version.split("-")[0]
-            parts = base_version.split(".")
-            return tuple(int(part) for part in parts)
-        except (ValueError, AttributeError):
-            # 如果解析失败，返回一个默认值
-            return (0, 0, 0)
+            v1 = version.parse(version1)
+            v2 = version.parse(version2)
+            
+            if v1 > v2:
+                return 1
+            elif v1 < v2:
+                return -1
+            else:
+                return 0
+        except Exception as e:
+            logger.warning(f"版本比较失败 {version1} vs {version2}: {e}")
+            # 降级到字符串比较
+            if version1 > version2:
+                return 1
+            elif version1 < version2:
+                return -1
+            else:
+                return 0
+
 
     def _migrate_to_3_2_0(self, session: Session):
         """迁移到版本 3.2.0"""