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

fix themoivedb timeout

Browse Source
This commit is contained in:
jxxghp 2023-09-28 19:08:34 +08:00
parent 107d496adb
commit b1ee80edee
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -51,6 +51,7 @@ docker pull jxxghp/moviepilot:latest
- **PGID**：运行程序用户的`gid`，默认`0` - **PGID**：运行程序用户的`gid`，默认`0`
- **UMASK**：掩码权限，默认`000`，可以考虑设置为`022` - **UMASK**：掩码权限，默认`000`，可以考虑设置为`022`
- **MOVIEPILOT_AUTO_UPDATE**：重启更新，`true`/`false`，默认`true` **注意：如果出现网络问题可以配置`PROXY_HOST`，具体看下方`PROXY_HOST`解释** - **MOVIEPILOT_AUTO_UPDATE**：重启更新，`true`/`false`，默认`true` **注意：如果出现网络问题可以配置`PROXY_HOST`，具体看下方`PROXY_HOST`解释**
- **MOVIEPILOT_AUTO_UPDATE_DEV**：重启时更新到未发布的开发版本代码，`true`/`false`，默认`false`
- **NGINX_PORT：** WEB服务端口，默认`3000`，可自行修改，不能与API服务端口冲突 - **NGINX_PORT：** WEB服务端口，默认`3000`，可自行修改，不能与API服务端口冲突
- **PORT：** API服务端口，默认`3001`，可自行修改，不能与WEB服务端口冲突 - **PORT：** API服务端口，默认`3001`，可自行修改，不能与WEB服务端口冲突
- **SUPERUSER：** 超级管理员用户名，默认`admin`，安装后使用该用户登录后台管理界面 - **SUPERUSER：** 超级管理员用户名，默认`admin`，安装后使用该用户登录后台管理界面

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

@ -30,6 +30,7 @@ class TMDb(object):
self.__class__._session = requests.Session() if session is None else session 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.obj_cached = obj_cached self.obj_cached = obj_cached
if os.environ.get(self.TMDB_LANGUAGE) is None: if os.environ.get(self.TMDB_LANGUAGE) is None:
os.environ[self.TMDB_LANGUAGE] = "en-US" os.environ[self.TMDB_LANGUAGE] = "en-US"
@ -131,12 +132,14 @@ 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, proxies=self.proxies) return requests.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()
def _request_obj(self, action, params="", call_cached=True, method="GET", data=None, json=None, key=None): 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 == "": if self.api_key is None or self.api_key == "":
raise TMDbException("No API key found.") raise TMDbException("No API key found.")
@ -151,7 +154,8 @@ 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, proxies=self.proxies) req = self.__class__._session.request(method, url, data=data, json=json,
timeout=self._timeout, proxies=self.proxies)
headers = req.headers headers = req.headers