feat:tvdb模块重写，更换tvdbv4 api,增加搜索能力

sonarr /series/lookup接口重写，直接用标题在tvdb查询剧集

Author: TimoYoung

app/api/servarr.py

@@ -5,6 +5,7 @@
 
 from app import schemas
 from app.chain.media import MediaChain
+from app.chain.tvdb import TvdbChain
 from app.chain.subscribe import SubscribeChain
 from app.core.metainfo import MetaInfo
 from app.core.security import verify_apikey
@@ -520,87 +521,87 @@ def arr_series_lookup(term: str, _: Annotated[str, Depends(verify_apikey)], db:
     """
     # 季信息
     seas: List[int] = []
-
+    # tvdbid 列表
+    tvdbids: List[int] = []
     # 获取TVDBID
     if not term.startswith("tvdb:"):
-        mediainfo = MediaChain().recognize_media(meta=MetaInfo(term),
-                                                 mtype=MediaType.TV)
-        if not mediainfo:
-            return [SonarrSeries()]
-
-        # 季信息
-        if mediainfo.seasons:
-            seas = list(mediainfo.seasons)
+        title = term.replace("+", " ")
+        tvdbids = TvdbChain().get_tvdbid_by_name(title=title)
     else:
         tvdbid = int(term.replace("tvdb:", ""))
+        tvdbids.append(tvdbid)
 
+    sonarr_series_list = []
+    for tvdbid in tvdbids:
         # 查询TVDB信息
         tvdbinfo = MediaChain().tvdb_info(tvdbid=tvdbid)
         if not tvdbinfo:
-            return [SonarrSeries()]
+            continue
 
-        # 季信息
-        sea_num = tvdbinfo.get('season')
+        # 季信息(只取默认季类型，排除特别季)
+        sea_num = len([season for season in tvdbinfo.get('seasons') if
+                       season['type']['id'] == tvdbinfo.get('defaultSeasonType') and season['number'] > 0])
         if sea_num:
             seas = list(range(1, int(sea_num) + 1))
 
         # 根据TVDB查询媒体信息
-        mediainfo = MediaChain().recognize_media(meta=MetaInfo(tvdbinfo.get('seriesName')),
+        mediainfo = MediaChain().recognize_media(meta=MetaInfo(tvdbinfo.get('name')),
                                                  mtype=MediaType.TV)
-
-    # 查询是否存在
-    exists = MediaChain().media_exists(mediainfo)
-    if exists:
-        hasfile = True
-    else:
-        hasfile = False
-
-    # 查询订阅信息
-    seasons: List[dict] = []
-    subscribes = Subscribe.get_by_tmdbid(db, mediainfo.tmdb_id)
-    if subscribes:
-        # 已监控
-        monitored = True
-        # 已监控季
-        sub_seas = [sub.season for sub in subscribes]
-        for sea in seas:
-            if sea in sub_seas:
-                seasons.append({
-                    "seasonNumber": sea,
-                    "monitored": True,
-                })
-            else:
+        if not mediainfo:
+            continue
+        # 查询是否存在
+        exists = MediaChain().media_exists(mediainfo)
+        if exists:
+            hasfile = True
+        else:
+            hasfile = False
+
+        # 查询订阅信息
+        seasons: List[dict] = []
+        subscribes = Subscribe.get_by_tmdbid(db, mediainfo.tmdb_id)
+        if subscribes:
+            # 已监控
+            monitored = True
+            # 已监控季
+            sub_seas = [sub.season for sub in subscribes]
+            for sea in seas:
+                if sea in sub_seas:
+                    seasons.append({
+                        "seasonNumber": sea,
+                        "monitored": True,
+                    })
+                else:
+                    seasons.append({
+                        "seasonNumber": sea,
+                        "monitored": False,
+                    })
+            subid = subscribes[-1].id
+        else:
+            subid = None
+            monitored = False
+            for sea in seas:
                 seasons.append({
                     "seasonNumber": sea,
                     "monitored": False,
                 })
-        subid = subscribes[-1].id
-    else:
-        subid = None
-        monitored = False
-        for sea in seas:
-            seasons.append({
-                "seasonNumber": sea,
-                "monitored": False,
-            })
+        sonarr_series = SonarrSeries(
+            id=subid,
+            title=mediainfo.title,
+            seasonCount=len(seasons),
+            seasons=seasons,
+            remotePoster=mediainfo.get_poster_image(),
+            year=mediainfo.year,
+            tmdbId=mediainfo.tmdb_id,
+            tvdbId=tvdbid,
+            imdbId=mediainfo.imdb_id,
+            profileId=1,
+            languageProfileId=1,
+            monitored=monitored,
+            hasFile=hasfile,
+        )
+        sonarr_series_list.append(sonarr_series)
 
-    return [SonarrSeries(
-        id=subid,
-        title=mediainfo.title,
-        seasonCount=len(seasons),
-        seasons=seasons,
-        remotePoster=mediainfo.get_poster_image(),
-        year=mediainfo.year,
-        tmdbId=mediainfo.tmdb_id,
-        tvdbId=mediainfo.tvdb_id,
-        imdbId=mediainfo.imdb_id,
-        profileId=1,
-        languageProfileId=1,
-        qualityProfileId=1,
-        isAvailable=True,
-        monitored=monitored,
-        hasFile=hasfile
-    )]
+    return sonarr_series_list if sonarr_series_list else [SonarrSeries()]
 
 
 @arr_router.get("/series/{tid}", summary="剧集详情")

app/chain/tvdb.py

@@ -0,0 +1,13 @@
+from typing import List
+from app.chain import ChainBase
+from app.utils.singleton import Singleton
+
+
+class TvdbChain(ChainBase, metaclass=Singleton):
+    """
+    Tvdb处理链，单例运行
+    """
+
+    def get_tvdbid_by_name(self, title: str) -> List[int]:
+        tvdb_info_list = self.run_module("search_tvdb", title=title)
+        return [int(item["tvdb_id"]) for item in tvdb_info_list]

app/core/config.py

@@ -111,7 +111,8 @@ class Config:
     # TMDB API Key
     TMDB_API_KEY: str = "db55323b8d3e4154498498a75642b381"
     # TVDB API Key
-    TVDB_API_KEY: str = "6b481081-10aa-440c-99f2-21d17717ee02"
+    TVDB_V4_API_KEY: str = "ed2aa66b-7899-4677-92a7-67bc9ce3d93a"
+    TVDB_V4_API_PIN:  str = ""
     # Fanart开关
     FANART_ENABLE: bool = True
     # Fanart API Key

app/modules/thetvdb/__init__.py

@@ -3,19 +3,42 @@
 from app.core.config import settings
 from app.log import logger
 from app.modules import _ModuleBase
-from app.modules.thetvdb import tvdbapi
+from app.modules.thetvdb import tvdb_v4_official
 from app.schemas.types import ModuleType, MediaRecognizeType
-from app.utils.http import RequestUtils
 
 
 class TheTvDbModule(_ModuleBase):
-    tvdb: tvdbapi.Tvdb = None
+    tvdb: tvdb_v4_official.TVDB = None
 
     def init_module(self) -> None:
-        self.tvdb = tvdbapi.Tvdb(apikey=settings.TVDB_API_KEY,
-                                 cache=False,
-                                 select_first=True,
-                                 proxies=settings.PROXY)
+        self._initialize_tvdb_session()
+
+    def _initialize_tvdb_session(self) -> None:
+        """
+        创建或刷新 TVDB 登录会话
+        """
+        try:
+            self.tvdb = tvdb_v4_official.TVDB(apikey=settings.TVDB_V4_API_KEY, pin=settings.TVDB_V4_API_PIN)
+        except Exception as e:
+            logger.error(f"TVDB 登录失败: {str(e)}")
+
+    def _handle_tvdb_call(self, func, *args, **kwargs):
+        """
+        包裹 TVDB 调用，处理 token 失效情况并尝试重新初始化
+        """
+        try:
+            return func(*args, **kwargs)
+        except ValueError as e:
+            # 检查错误信息中是否包含 token 失效相关描述
+            if "failed to get" in str(e) or "Unauthorized" in str(e) or "NOT_MODIFIED" in str(e):
+                logger.warning("TVDB Token 可能已失效，正在尝试重新登录...")
+                self._initialize_tvdb_session()
+                return func(*args, **kwargs)
+            else:
+                raise
+        except Exception as e:
+            logger.error(f"TVDB 调用出错: {str(e)}")
+            raise
 
     @staticmethod
     def get_name() -> str:
@@ -43,18 +66,17 @@ def get_priority() -> int:
         return 4
 
     def stop(self):
-        self.tvdb.close()
+        pass
 
     def test(self) -> Tuple[bool, str]:
         """
         测试模块连接性
         """
-        ret = RequestUtils(proxies=settings.PROXY).get_res("https://api.thetvdb.com/series/81189")
-        if ret and ret.status_code == 200:
+        try:
+            self._handle_tvdb_call(self.tvdb.get_series, 81189)
             return True, ""
-        elif ret:
-            return False, f"无法连接 api.thetvdb.com，错误码：{ret.status_code}"
-        return False, "api.thetvdb.com 网络连接失败"
+        except Exception as e:
+            return False, str(e)
 
     def init_setting(self) -> Tuple[str, Union[str, bool]]:
         pass
@@ -67,6 +89,20 @@ def tvdb_info(self, tvdbid: int) -> Optional[dict]:
         """
         try:
             logger.info(f"开始获取TVDB信息: {tvdbid} ...")
-            return self.tvdb[tvdbid].data
+            return self._handle_tvdb_call(self.tvdb.get_series_extended, tvdbid)
         except Exception as err:
             logger.error(f"获取TVDB信息失败: {str(err)}")
+            return None
+
+    def search_tvdb(self, title: str) -> list:
+        """
+        用标题搜索TVDB
+        :param title: 标题
+        :return: TVDB信息
+        """
+        try:
+            logger.info(f"开始用标题搜索TVDB: {title} ...")
+            return self._handle_tvdb_call(self.tvdb.search, title)
+        except Exception as err:
+            logger.error(f"用标题搜索TVDB失败: {str(err)}")
+            return []