From 5d30921d2f6761a89ec7280b58c5498ef6396bb3 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sat, 29 Jul 2023 13:27:22 +0800 Subject: [PATCH] fix tmdbapis --- app/chain/search.py | 6 +++++- app/modules/themoviedb/tmdbv3api/objs/trending.py | 3 ++- app/modules/themoviedb/tmdbv3api/tmdb.py | 9 +++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/chain/search.py b/app/chain/search.py index ae775f31..50d97236 100644 --- a/app/chain/search.py +++ b/app/chain/search.py @@ -62,7 +62,11 @@ class SearchChain(ChainBase): results = self.systemconfig.get(SystemConfigKey.SearchResults) if not results: return [] - return pickle.loads(results) + try: + return pickle.loads(results) + except Exception as e: + print(str(e)) + return [] def browse(self, domain: str, keyword: str = None) -> List[TorrentInfo]: """ diff --git a/app/modules/themoviedb/tmdbv3api/objs/trending.py b/app/modules/themoviedb/tmdbv3api/objs/trending.py index d3dd904b..c7ee5ec2 100644 --- a/app/modules/themoviedb/tmdbv3api/objs/trending.py +++ b/app/modules/themoviedb/tmdbv3api/objs/trending.py @@ -7,7 +7,8 @@ class Trending(TMDb): def _trending(self, media_type="all", time_window="day", page=1): return self._request_obj( self._urls["trending"] % (media_type, time_window), - params="page=%s" % page + params="page=%s" % page, + key="results", ) def all_day(self, page=1): diff --git a/app/modules/themoviedb/tmdbv3api/tmdb.py b/app/modules/themoviedb/tmdbv3api/tmdb.py index 87d21b52..dd46cb3c 100644 --- a/app/modules/themoviedb/tmdbv3api/tmdb.py +++ b/app/modules/themoviedb/tmdbv3api/tmdb.py @@ -23,6 +23,7 @@ class TMDb(object): TMDB_DEBUG_ENABLED = "TMDB_DEBUG_ENABLED" TMDB_CACHE_ENABLED = "TMDB_CACHE_ENABLED" TMDB_PROXIES = "TMDB_PROXIES" + TMDB_DOMAIN = "TMDB_DOMAIN" REQUEST_CACHE_MAXSIZE = None def __init__(self, obj_cached=True, session=None): @@ -50,6 +51,10 @@ class TMDb(object): @property def api_key(self): return os.environ.get(self.TMDB_API_KEY) + + @property + def domain(self): + return os.environ.get(self.TMDB_DOMAIN) @property def proxies(self): @@ -67,6 +72,10 @@ class TMDb(object): def api_key(self, api_key): os.environ[self.TMDB_API_KEY] = str(api_key) + @domain.setter + def domain(self, domain): + os.environ[self.TMDB_DOMAIN] = str(domain) + @property def language(self): return os.environ.get(self.TMDB_LANGUAGE)