From 9439d02351f3ef365049bb6e1a1f01405676cea2 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sat, 11 Nov 2023 10:37:33 +0800 Subject: [PATCH] =?UTF-8?q?fix=20TMDB=E7=BC=93=E5=AD=98None=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/themoviedb/tmdbv3api/tmdb.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/modules/themoviedb/tmdbv3api/tmdb.py b/app/modules/themoviedb/tmdbv3api/tmdb.py index 6a63a157..78adc659 100644 --- a/app/modules/themoviedb/tmdbv3api/tmdb.py +++ b/app/modules/themoviedb/tmdbv3api/tmdb.py @@ -143,17 +143,16 @@ class TMDb(object): """ 缓存请求，时间默认1天，None不缓存 """ - req = self.request(method, url, data, json) - if req is None: - # 禁止缓存None - raise TMDbException("无法连接TheMovieDb，请检查网络连接！") - return req + return self.request(method, url, data, json) def request(self, method, url, data, json): if method == "GET": - return self._req.get_res(url, params=data, json=json) + req = self._req.get_res(url, params=data, json=json) else: - return self._req.post_res(url, data=data, json=json) + req = self._req.post_res(url, data=data, json=json) + if req is None: + raise TMDbException("无法连接TheMovieDb，请检查网络连接！") + return req def cache_clear(self): return self.cached_request.cache_clear() @@ -161,7 +160,7 @@ class TMDb(object): def _request_obj(self, action, params="", call_cached=True, method="GET", data=None, json=None, key=None): if self.api_key is None or self.api_key == "": - raise TMDbException("No API key found.") + raise TMDbException("TheMovieDb API Key 未设置！") url = "https://%s/3%s?api_key=%s&%s&language=%s" % ( self.domain, @@ -177,7 +176,7 @@ class TMDb(object): req = self.request(method, url, data, json) if req is None: - raise TMDbException("无法连接TheMovieDb，请检查网络连接！") + return None headers = req.headers