From 91b3fe5b1d4ae457fa72de0d3ba6e8463b091658 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Wed, 23 Aug 2023 19:51:22 +0800 Subject: [PATCH] fix bug --- app/log.py | 2 +- app/modules/themoviedb/__init__.py | 8 +++----- app/modules/themoviedb/tmdbapi.py | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/log.py b/app/log.py index 789e83d3..d4fa0cf9 100644 --- a/app/log.py +++ b/app/log.py @@ -26,7 +26,7 @@ file_handler.setLevel(logging.INFO) level_name_colors = { 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.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.CRITICAL: lambda level_name: click.style( str(level_name), fg="bright_red" diff --git a/app/modules/themoviedb/__init__.py b/app/modules/themoviedb/__init__.py index 7c7bac7c..ab444067 100644 --- a/app/modules/themoviedb/__init__.py +++ b/app/modules/themoviedb/__init__.py @@ -163,10 +163,8 @@ class TheMovieDbModule(_ModuleBase): results = self.tmdb.search_multiis(meta.name) else: if meta.type == MediaType.UNKNOWN: - results = list( - set(self.tmdb.search_movies(meta.name, meta.year)) - .union(set(self.tmdb.search_tv_tmdbinfos(meta.name, meta.year))) - ) + results = self.tmdb.search_movies(meta.name, meta.year) + results.extend(self.tmdb.search_tvs(meta.name, meta.year)) # 组合结果的情况下要排序 results = sorted( results, @@ -176,7 +174,7 @@ class TheMovieDbModule(_ModuleBase): elif meta.type == MediaType.MOVIE: results = self.tmdb.search_movies(meta.name, meta.year) 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] diff --git a/app/modules/themoviedb/tmdbapi.py b/app/modules/themoviedb/tmdbapi.py index 71d44a2e..db3412fd 100644 --- a/app/modules/themoviedb/tmdbapi.py +++ b/app/modules/themoviedb/tmdbapi.py @@ -78,7 +78,7 @@ class TmdbHelper: ret_infos.append(movie) 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信息 """