fix

app/modules/fanart/__init__.py

@@ -63,7 +63,7 @@ class FanartModule(_ModuleBase):
 
     @classmethod
     @lru_cache(maxsize=256)
-    def __request_fanart(cls, media_type: MediaType, queryid: str) -> Optional[dict]:
+    def __request_fanart(cls, media_type: MediaType, queryid: Union[str, int]) -> Optional[dict]:
         if media_type == MediaType.MOVIE:
             image_url = cls._movie_url % queryid
         else:

app/modules/filetransfer/__init__.py

@@ -344,8 +344,8 @@ class FileTransferModule(_ModuleBase):
         target_dir = target_dir / meidainfo.type.value / meidainfo.category
 
         # 重命名格式
-        rename_format = settings.MOVIE_RENAME_FORMAT \
-            if meidainfo.type == MediaType.MOVIE else settings.TV_RENAME_FORMAT
+        rename_format = settings.TV_RENAME_FORMAT \
+            if meidainfo.type == MediaType.TV else settings.MOVIE_RENAME_FORMAT
 
         # 判断是否为蓝光原盘
         bluray_flag = self.__is_bluray_dir(in_path)

app/modules/indexer/spider.py

@@ -167,10 +167,10 @@ class TorrentSpider:
                     })
                 # 分类条件
                 if self.category:
-                    if self.mtype == MediaType.MOVIE:
-                        cats = self.category.get("movie") or []
-                    elif self.mtype:
+                    if self.mtype == MediaType.TV:
                         cats = self.category.get("tv") or []
+                    elif self.mtype == MediaType.MOVIE:
+                        cats = self.category.get("movie") or []
                     else:
                         cats = (self.category.get("movie") or []) + (self.category.get("tv") or [])
                     for cat in cats:

app/modules/themoviedb/__init__.py

@@ -61,7 +61,7 @@ class TheMovieDbModule(_ModuleBase):
                 info = self.tmdb.get_info(mtype=mtype, tmdbid=tmdbid)
             else:
                 logger.info(f"正在识别 {meta.get_name()} ...")
-                if meta.type != MediaType.TV and not meta.year:
+                if meta.type == MediaType.UNKNOWN and not meta.year:
                     info = self.tmdb.match_multi(meta.get_name())
                 else:
                     if meta.type == MediaType.TV:
@@ -111,10 +111,10 @@ class TheMovieDbModule(_ModuleBase):
 
         if info:
             # 确定二级分类
-            if info.get('media_type') == MediaType.MOVIE:
-                cat = self.category.get_movie_category(info)
-            else:
+            if info.get('media_type') == MediaType.TV:
                 cat = self.category.get_tv_category(info)
+            else:
+                cat = self.category.get_movie_category(info)
             # 赋值TMDB信息并返回
             mediainfo = MediaInfo(tmdb_info=info)
             mediainfo.set_category(cat)
@@ -139,10 +139,10 @@ class TheMovieDbModule(_ModuleBase):
 
         if not meta.get_name():
             return []
-        if not meta.type and not meta.year:
+        if meta.type == MediaType.UNKNOWN and not meta.year:
             results = self.tmdb.search_multiis(meta.get_name())
         else:
-            if not meta.type:
+            if meta.type == MediaType.UNKNOWN:
                 results = list(
                     set(self.tmdb.search_movies(meta.get_name(), meta.year))
                     .union(set(self.tmdb.search_tv_tmdbinfos(meta.get_name(), meta.year)))