From 1d5a11e38ebcc26d19d972a0a7ac86c97470f147 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Mon, 12 Jun 2023 18:54:10 +0800 Subject: [PATCH] fix --- app/modules/themoviedb/__init__.py | 24 ++++++++++++++++-------- app/modules/themoviedb/tmdb.py | 19 +++---------------- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/app/modules/themoviedb/__init__.py b/app/modules/themoviedb/__init__.py index 4af55822..e553e479 100644 --- a/app/modules/themoviedb/__init__.py +++ b/app/modules/themoviedb/__init__.py @@ -60,8 +60,9 @@ class TheMovieDb(_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: - info = self.tmdb.search_multi(meta.get_name()) + info = self.tmdb.match_multi(meta.get_name()) else: if meta.type == MediaType.TV: # 确定是电视 @@ -86,12 +87,12 @@ class TheMovieDb(_ModuleBase): mtype=MediaType.TV) if not info: # 非严格模式下去掉年份和类型再查一次 - info = self.tmdb.search_multi(name=meta.get_name()) + info = self.tmdb.match_multi(name=meta.get_name()) if not info: # 从网站查询 - info = self.tmdb.search_web(name=meta.get_name(), - mtype=meta.type) + info = self.tmdb.match_web(name=meta.get_name(), + mtype=meta.type) # 补充全量信息 if info and not info.get("genres"): info = self.tmdb.get_info(mtype=info.get("media_type"), @@ -101,10 +102,11 @@ class TheMovieDb(_ModuleBase): else: # 使用缓存信息 if cache_info.get("title"): - logger.info(f"使用识别缓存：{cache_info.get('title')}") + logger.info(f"{meta.get_name()} 使用识别缓存：{cache_info.get('title')}") info = self.tmdb.get_info(mtype=cache_info.get("type"), tmdbid=cache_info.get("id")) else: + logger.info(f"{meta.get_name()} 使用识别缓存：无法识别") info = None if info: @@ -116,7 +118,12 @@ class TheMovieDb(_ModuleBase): # 赋值TMDB信息并返回 mediainfo = MediaInfo(tmdb_info=info) mediainfo.set_category(cat) + logger.info(f"{meta.get_name()} 识别结果：{mediainfo.type.value} " + f"{mediainfo.get_title_string()} " + f"{mediainfo.tmdb_id}") return mediainfo + else: + logger.info(f"{meta.get_name()} 未匹配到媒体信息") return None @@ -246,7 +253,7 @@ class TheMovieDb(_ModuleBase): and attr_value.startswith("http"): image_name = attr_name.replace("_path", "").replace("season", - f"{str(meta.begin_season).rjust(2, '0')}-")\ + f"{str(meta.begin_season).rjust(2, '0')}-") \ + Path(attr_value).suffix self.__save_image(url=attr_value, file_path=file_path.parent.with_name(image_name)) @@ -261,8 +268,9 @@ class TheMovieDb(_ModuleBase): file_path=file_path) # 集的图片 if episodeinfo.get('still_path'): - self.__save_image(f"https://{settings.TMDB_IMAGE_DOMAIN}/t/p/original{episodeinfo.get('still_path')}", - file_path.with_suffix(Path(episodeinfo.get('still_path')).suffix)) + self.__save_image( + f"https://{settings.TMDB_IMAGE_DOMAIN}/t/p/original{episodeinfo.get('still_path')}", + file_path.with_suffix(Path(episodeinfo.get('still_path')).suffix)) except Exception as e: logger.error(f"{file_path} 刮削失败：{e}") diff --git a/app/modules/themoviedb/tmdb.py b/app/modules/themoviedb/tmdb.py index d9a55687..318c9687 100644 --- a/app/modules/themoviedb/tmdb.py +++ b/app/modules/themoviedb/tmdb.py @@ -180,11 +180,6 @@ class TmdbHelper: info = self.__search_movie_by_name(name, year) if info: info['media_type'] = MediaType.MOVIE - logger.info("%s 识别到 电影：TMDBID=%s, 名称=%s, 上映日期=%s" % ( - name, - info.get('id'), - info.get('title'), - info.get('release_date'))) break else: # 有当前季和当前季集年份，使用精确匹配 @@ -201,15 +196,7 @@ class TmdbHelper: year) if info: info['media_type'] = MediaType.TV - logger.info("%s 识别到 电视剧：TMDBID=%s, 名称=%s, 首播日期=%s" % ( - name, - info.get('id'), - info.get('name'), - info.get('first_air_date'))) # 返回 - if not info: - logger.info("%s 以年份 %s 在TMDB中未找到%s信息!" % ( - name, year, mtype.value if mtype else "")) return info def __search_movie_by_name(self, name: str, year: str) -> Optional[dict]: @@ -419,7 +406,7 @@ class TmdbHelper: ret_seasons[season_info.get("season_number")] = season_info return ret_seasons - def search_multi(self, name: str) -> Optional[dict]: + def match_multi(self, name: str) -> Optional[dict]: """ 根据名称同时查询电影和电视剧，不带年份 :param name: 识别的文件名或种子名 @@ -463,7 +450,7 @@ class TmdbHelper: return {} @lru_cache(maxsize=128) - def search_web(self, name: str, mtype: MediaType) -> Optional[dict]: + def match_web(self, name: str, mtype: MediaType) -> Optional[dict]: """ 搜索TMDB网站，直接抓取结果，结果只有一条时才返回 :param name: 名称 @@ -517,7 +504,7 @@ class TmdbHelper: else: logger.info("%s TMDB网站未查询到媒体信息！" % name) except Exception as err: - print(str(err)) + logger.error(f"从TheDbMovie网站查询出错：{err}") return None return None