codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #690

Browse Source
This commit is contained in:
jxxghp 2023-10-01 21:23:41 +08:00
parent 8420b2ea85
commit 8001511484
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/modules/themoviedb/tmdbv3api/tmdb.py
View File

@ -14,7 +14,6 @@ logger = logging.getLogger(__name__)
class TMDb(object): class TMDb(object):
_session = None
TMDB_API_KEY = "TMDB_API_KEY" TMDB_API_KEY = "TMDB_API_KEY"
TMDB_LANGUAGE = "TMDB_LANGUAGE" TMDB_LANGUAGE = "TMDB_LANGUAGE"
TMDB_SESSION_ID = "TMDB_SESSION_ID" TMDB_SESSION_ID = "TMDB_SESSION_ID"
@ -25,9 +24,7 @@ class TMDb(object):
TMDB_DOMAIN = "TMDB_DOMAIN" TMDB_DOMAIN = "TMDB_DOMAIN"
REQUEST_CACHE_MAXSIZE = None REQUEST_CACHE_MAXSIZE = None
def __init__(self, obj_cached=True, session=None): def __init__(self, obj_cached=True):
if self.__class__._session is None or session is not None:
self.__class__._session = requests.Session() if session is None else session
self._remaining = 40 self._remaining = 40
self._reset = None self._reset = None
self._timeout = 15 self._timeout = 15
@ -132,8 +129,9 @@ class TMDb(object):
@lru_cache(maxsize=REQUEST_CACHE_MAXSIZE) @lru_cache(maxsize=REQUEST_CACHE_MAXSIZE)
def cached_request(self, method, url, data, json): def cached_request(self, method, url, data, json):
return requests.request(method, url, data=data, json=json, with requests.Session() as s:
timeout=self._timeout, proxies=self.proxies) return s.request(method, url, data=data, json=json,
timeout=self._timeout, proxies=self.proxies)
def cache_clear(self): def cache_clear(self):
return self.cached_request.cache_clear() return self.cached_request.cache_clear()
@ -154,8 +152,9 @@ class TMDb(object):
if self.cache and self.obj_cached and call_cached and method != "POST": if self.cache and self.obj_cached and call_cached and method != "POST":
req = self.cached_request(method, url, data, json) req = self.cached_request(method, url, data, json)
else: else:
req = self.__class__._session.request(method, url, data=data, json=json, with requests.Session() as s:
timeout=self._timeout, proxies=self.proxies) req = s.request(method, url, data=data, json=json,
timeout=self._timeout, proxies=self.proxies)
headers = req.headers headers = req.headers