feat：支持指定剧集组识别和刮削

app/modules/themoviedb/tmdbapi.py

@@ -1,3 +1,4 @@
+import re
 import traceback
 from typing import Optional, List
 from urllib.parse import quote
@@ -187,7 +188,8 @@ class TmdbApi:
               mtype: MediaType,
               year: Optional[str] = None,
               season_year: Optional[str] = None,
-              season_number: Optional[int] = None) -> Optional[dict]:
+              season_number: Optional[int] = None,
+              group_episodes: Optional[List[dict]] = None) -> Optional[dict]:
         """
         搜索tmdb中的媒体信息，匹配返回一条尽可能正确的信息
         :param name: 检索的名称
@@ -195,6 +197,7 @@ class TmdbApi:
         :param year: 年份，如要是季集需要是首播年份(first_air_date)
         :param season_year: 当前季集年份
         :param season_number: 季集，整数
+        :param group_episodes: 集数组信息
         :return: TMDB的INFO，同时会将mtype赋值到media_type中
         """
         if not self.search:
@@ -222,7 +225,8 @@ class TmdbApi:
                     f"正在识别{mtype.value}：{name}, 季集={season_number}, 季集年份={season_year} ...")
                 info = self.__search_tv_by_season(name,
                                                   season_year,
-                                                  season_number)
+                                                  season_number,
+                                                  group_episodes)
             if not info:
                 year_range = [year]
                 if year:
@@ -332,12 +336,14 @@ class TmdbApi:
                     return tv
         return {}
 
-    def __search_tv_by_season(self, name: str, season_year: str, season_number: int) -> Optional[dict]:
+    def __search_tv_by_season(self, name: str, season_year: str, season_number: int,
+                              group_episodes: Optional[List[dict]] = None) -> Optional[dict]:
         """
         根据电视剧的名称和季的年份及序号匹配TMDB
         :param name: 识别的文件名或者种子名
         :param season_year: 季的年份
         :param season_number: 季序号
+        :param group_episodes: 集数组信息
         :return: 匹配的媒体信息
         """
 
@@ -345,12 +351,25 @@ class TmdbApi:
             if not tv_info:
                 return False
             try:
-                seasons = self.__get_tv_seasons(tv_info)
-                for season, season_info in seasons.items():
-                    if season_info.get("air_date"):
-                        if season_info.get("air_date")[0:4] == str(_season_year) \
-                                and season == int(season_number):
-                            return True
+                if group_episodes:
+                    for group_episode in group_episodes:
+                        season = group_episode.get('order')
+                        if season != season_number:
+                            continue
+                        episodes = group_episode.get('episodes')
+                        if not episodes:
+                            continue
+                        first_date = episodes[0].get("air_date")
+                        if re.match(r"^\d{4}-\d{2}-\d{2}$", first_date):
+                            if str(_season_year) == str(first_date).split("-")[0]:
+                                return True
+                else:
+                    seasons = self.__get_tv_seasons(tv_info)
+                    for season, season_info in seasons.items():
+                        if season_info.get("air_date"):
+                            if season_info.get("air_date")[0:4] == str(_season_year) \
+                                    and season == int(season_number):
+                                return True
             except Exception as e1:
                 logger.error(f"连接TMDB出错：{e1}")
                 print(traceback.format_exc())
@@ -1317,6 +1336,19 @@ class TmdbApi:
             logger.error(str(e))
             return []
 
+    def get_tv_group_episodes(self, group_id: str) -> List[dict]:
+        """
+        获取电视剧剧集组集列表
+        """
+        if not self.tv:
+            return []
+        try:
+            logger.debug(f"正在获取剧集组：{group_id}...")
+            return self.tv.group_episodes(group_id) or []
+        except Exception as e:
+            logger.error(str(e))
+            return []
+
     def get_person_detail(self, person_id: int) -> dict:
         """
         获取人物详情
@@ -1377,37 +1409,6 @@ class TmdbApi:
         """
         self.tmdb.cache_clear()
 
-    def get_tv_episode_years(self, episode_groups: List[dict]) -> dict:
-        """
-        查询剧集组年份
-        """
-        try:
-            if not episode_groups:
-                return {}
-            episode_years = {}
-            for episode_group in episode_groups:
-                if episode_group.get('type') != 6:
-                    # 只处理剧集部分
-                    continue
-                logger.debug(f"正在获取剧集组年份：{episode_group.get('id')}...")
-                group_episodes = self.tv.group_episodes(episode_group.get('id'))
-                if not group_episodes:
-                    continue
-                for group_episode in group_episodes:
-                    order = group_episode.get('order')
-                    episodes = group_episode.get('episodes')
-                    if not episodes:
-                        continue
-                    # 当前季第一季时间
-                    first_date = episodes[0].get("air_date")
-                    if not first_date and str(first_date).split("-") != 3:
-                        continue
-                    episode_years[order] = str(first_date).split("-")[0]
-            return episode_years
-        except Exception as e:
-            logger.error(str(e))
-            return {}
-
     def close(self):
         """
         关闭连接