This commit is contained in:
jxxghp
2023-08-23 19:51:22 +08:00
parent 8bb4db227a
commit 91b3fe5b1d
3 changed files with 5 additions and 7 deletions

View File

@ -26,7 +26,7 @@ file_handler.setLevel(logging.INFO)
level_name_colors = { level_name_colors = {
logging.DEBUG: lambda level_name: click.style(str(level_name), fg="cyan"), logging.DEBUG: lambda level_name: click.style(str(level_name), fg="cyan"),
logging.INFO: lambda level_name: click.style(str(level_name), fg="green"), logging.INFO: lambda level_name: click.style(str(level_name), fg="green"),
logging.WARNING: lambda level_name: click.style(str(level_name), fg="orange"), logging.WARNING: lambda level_name: click.style(str(level_name), fg="yellow"),
logging.ERROR: lambda level_name: click.style(str(level_name), fg="red"), logging.ERROR: lambda level_name: click.style(str(level_name), fg="red"),
logging.CRITICAL: lambda level_name: click.style( logging.CRITICAL: lambda level_name: click.style(
str(level_name), fg="bright_red" str(level_name), fg="bright_red"

View File

@ -163,10 +163,8 @@ class TheMovieDbModule(_ModuleBase):
results = self.tmdb.search_multiis(meta.name) results = self.tmdb.search_multiis(meta.name)
else: else:
if meta.type == MediaType.UNKNOWN: if meta.type == MediaType.UNKNOWN:
results = list( results = self.tmdb.search_movies(meta.name, meta.year)
set(self.tmdb.search_movies(meta.name, meta.year)) results.extend(self.tmdb.search_tvs(meta.name, meta.year))
.union(set(self.tmdb.search_tv_tmdbinfos(meta.name, meta.year)))
)
# 组合结果的情况下要排序 # 组合结果的情况下要排序
results = sorted( results = sorted(
results, results,
@ -176,7 +174,7 @@ class TheMovieDbModule(_ModuleBase):
elif meta.type == MediaType.MOVIE: elif meta.type == MediaType.MOVIE:
results = self.tmdb.search_movies(meta.name, meta.year) results = self.tmdb.search_movies(meta.name, meta.year)
else: else:
results = self.tmdb.search_tv_tmdbinfos(meta.name, meta.year) results = self.tmdb.search_tvs(meta.name, meta.year)
return [MediaInfo(tmdb_info=info) for info in results] return [MediaInfo(tmdb_info=info) for info in results]

View File

@ -78,7 +78,7 @@ class TmdbHelper:
ret_infos.append(movie) ret_infos.append(movie)
return ret_infos return ret_infos
def search_tv_tmdbinfos(self, title: str, year: str) -> List[dict]: def search_tvs(self, title: str, year: str) -> List[dict]:
""" """
查询模糊匹配的所有电视剧TMDB信息 查询模糊匹配的所有电视剧TMDB信息
""" """