GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-05 23:47:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: mtype为空且tmdbid在movie和tv中都存在时的识别错误问题

Browse Source
This commit is contained in:
yangyux
2025-02-19 17:27:38 +08:00
parent 351029a842
commit 9646745181
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/modules/themoviedb/__init__.py
+3 -2
View File
@@ -118,11 +118,12 @@ class TheMovieDbModule(_ModuleBase):
# 识别匹配 # 识别匹配
if not cache_info or not cache: if not cache_info or not cache:
info = None
# 缓存没有或者强制不使用缓存 # 缓存没有或者强制不使用缓存
if tmdbid: if tmdbid:
# 直接查询详情 # 直接查询详情
info = self.tmdb.get_info(mtype=mtype, tmdbid=tmdbid) info = self.tmdb.get_info(mtype=mtype, tmdbid=tmdbid)
elif meta: if not info and meta:
info = {} info = {}
# 简体名称 # 简体名称
zh_name = zhconv.convert(meta.cn_name, "zh-hans") if meta.cn_name else None zh_name = zhconv.convert(meta.cn_name, "zh-hans") if meta.cn_name else None
@@ -173,7 +174,7 @@ class TheMovieDbModule(_ModuleBase):
info = self.tmdb.get_info(mtype=info.get("media_type"), info = self.tmdb.get_info(mtype=info.get("media_type"),
tmdbid=info.get("id")) tmdbid=info.get("id"))
else: else:
logger.error("识别媒体信息时未提供元数据或tmdbid") logger.error("识别媒体信息时未提供元数据或唯一且有效的tmdbid")
return None return None
# 保存到缓存 # 保存到缓存
app/modules/themoviedb/tmdbapi.py
+13 -6
View File
@@ -578,7 +578,7 @@ class TmdbApi:
genre_ids.append(genre.get('id')) genre_ids.append(genre.get('id'))
return genre_ids return genre_ids
# 查询TMDB详ngeq # 查询TMDB详情
if mtype == MediaType.MOVIE: if mtype == MediaType.MOVIE:
tmdb_info = self.__get_movie_detail(tmdbid) tmdb_info = self.__get_movie_detail(tmdbid)
if tmdb_info: if tmdb_info:
@@ -588,13 +588,20 @@ class TmdbApi:
if tmdb_info: if tmdb_info:
tmdb_info['media_type'] = MediaType.TV tmdb_info['media_type'] = MediaType.TV
else: else:
tmdb_info = self.__get_tv_detail(tmdbid) tmdb_info_tv = self.__get_tv_detail(tmdbid)
if tmdb_info: tmdb_info_movie = self.__get_movie_detail(tmdbid)
if tmdb_info_tv and tmdb_info_movie:
tmdb_info = None
logger.warn(f"无法判断tmdb_id:{tmdbid} 是电影还是电视剧")
elif tmdb_info_tv:
tmdb_info = tmdb_info_tv
tmdb_info['media_type'] = MediaType.TV tmdb_info['media_type'] = MediaType.TV
elif tmdb_info_movie:
tmdb_info = tmdb_info_movie
tmdb_info['media_type'] = MediaType.MOVIE
else: else:
tmdb_info = self.__get_movie_detail(tmdbid) tmdb_info = None
if tmdb_info: logger.warn(f"tmdb_id:{tmdbid} 未查询到媒体信息")
tmdb_info['media_type'] = MediaType.MOVIE
if tmdb_info: if tmdb_info:
# 转换genreid # 转换genreid