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

fix #1122

Browse Source
This commit is contained in:
jxxghp
2023-11-14 17:35:31 +08:00
parent 7921dcd86b
commit 42966c2537
4 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/api/endpoints/system.py
View File

@ -163,12 +163,7 @@ def latest_version(_: schemas.TokenPayload = Depends(verify_token)):
""" """
查询Github所有Release版本 查询Github所有Release版本
""" """
headers = {} version_res = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS).get_res(
if settings.GITHUB_TOKEN:
headers = {
"Authorization": f"Bearer {settings.GITHUB_TOKEN}"
}
version_res = RequestUtils(proxies=settings.PROXY, headers=headers).get_res(
f"https://api.github.com/repos/jxxghp/MoviePilot/releases") f"https://api.github.com/repos/jxxghp/MoviePilot/releases")
if version_res: if version_res:
ver_json = version_res.json() ver_json = version_res.json()

7
app/chain/system.py
View File

@ -87,12 +87,7 @@ class SystemChain(ChainBase, metaclass=Singleton):
""" """
获取最新版本 获取最新版本
""" """
headers = {} version_res = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS).get_res(
if settings.GITHUB_TOKEN:
headers = {
"Authorization": f"Bearer {settings.GITHUB_TOKEN}"
}
version_res = RequestUtils(proxies=settings.PROXY, headers=headers).get_res(
"https://api.github.com/repos/jxxghp/MoviePilot/releases/latest") "https://api.github.com/repos/jxxghp/MoviePilot/releases/latest")
if version_res: if version_res:
ver_json = version_res.json() ver_json = version_res.json()

11
app/core/config.py
View File

@ -323,6 +323,17 @@ class Settings(BaseSettings):
return Path(self.DOWNLOAD_ANIME_PATH) return Path(self.DOWNLOAD_ANIME_PATH)
return self.SAVE_TV_PATH return self.SAVE_TV_PATH
@property
def GITHUB_HEADERS(self):
"""
Github请求头
"""
if self.GITHUB_TOKEN:
return {
"Authorization": f"Bearer {self.GITHUB_TOKEN}"
}
return {}
def __init__(self, **kwargs): def __init__(self, **kwargs):
super().__init__(**kwargs) super().__init__(**kwargs)
with self.CONFIG_PATH as p: with self.CONFIG_PATH as p:

7
app/helper/plugin.py
View File

@ -49,12 +49,7 @@ class PluginHelper(metaclass=Singleton):
获取插件的文件列表 获取插件的文件列表
""" """
file_api = f"https://api.github.com/repos/{user}/{repo}/contents/plugins/{_p.lower()}" file_api = f"https://api.github.com/repos/{user}/{repo}/contents/plugins/{_p.lower()}"
headers = {} r = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS).get_res(file_api)
if settings.GITHUB_TOKEN:
headers = {
"Authorization": f"Bearer {settings.GITHUB_TOKEN}"
}
r = RequestUtils(proxies=settings.PROXY, headers=headers).get_res(file_api)
if not r or r.status_code != 200: if not r or r.status_code != 200:
return None, f"连接仓库失败：{r.status_code} - {r.reason}" return None, f"连接仓库失败：{r.status_code} - {r.reason}"
ret = r.json() ret = r.json()