nas/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-04-09 21:58:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2604 from Aqr-K/dev

Browse Source 
增加``PIP_PROXY``变量，支持用镜像站下载与更新依赖
This commit is contained in:
jxxghp
2024-07-25 17:51:40 +08:00
committed by GitHub
parent 6bbdc574b6 7adae64955
commit 4f4c7a5748
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/core/config.py
View File

@@ -146,6 +146,8 @@ class Settings(BaseSettings):
GITHUB_TOKEN: Optional[str] = None
# Github代理服务器，格式：https://mirror.ghproxy.com/
GITHUB_PROXY: Optional[str] = ''
# pip镜像站点，格式：https://pypi.tuna.tsinghua.edu.cn/simple
PIP_PROXY: Optional[str] = ''
# 大内存模式
BIG_MEMORY_MODE: bool = False

3
app/helper/plugin.py
View File

@@ -222,7 +222,8 @@ class PluginHelper(metaclass=Singleton):
# 插件目录下如有requirements.txt则安装依赖
requirements_file = plugin_dir / "requirements.txt"
if requirements_file.exists():
SystemUtils.execute(f"pip install -r {requirements_file} > /dev/null 2>&1")
PIP_PROXY = f" -i {settings.PIP_PROXY} " if settings.PIP_PROXY else ""
SystemUtils.execute(f"pip install -r {requirements_file} {PIP_PROXY} > /dev/null 2>&1")
# 安装成功后统计
self.install_reg(pid)

18
update
View File

@@ -117,14 +117,26 @@ function install_backend_and_download_resources() {
}
if [[ "${MOVIEPILOT_AUTO_UPDATE}" = "true" ]] || [[ "${MOVIEPILOT_AUTO_UPDATE}" = "release" ]] || [[ "${MOVIEPILOT_AUTO_UPDATE}" = "dev" ]]; then
if [ -n "${PROXY_HOST}" ]; then
if [[ -n "${PIP_PROXY}" ]] || [[ -n "${GITHUB_PROXY}" ]]; then
CURL_OPTIONS="-sL"
PIP_OPTIONS=${PIP_PROXY:+-i ${PIP_PROXY}}
GITHUB_PROXY=${GITHUB_PROXY:-""}
# 判断不同的代理组合
if [ -z "${PIP_OPTIONS}" ] && [ -n "${GITHUB_PROXY}" ]; then
INFO "不使用代理更新环境依赖，使用Github镜像代理更新程序"
elif [ -n "${PIP_OPTIONS}" ] && [ -z "${GITHUB_PROXY}" ]; then
INFO "使用Pip镜像代理更新环境依赖，不使用代理更新程序"
else
INFO "使用Pip镜像代理更新环境依赖，使用Github镜像代理更新程序"
fi
elif [ -n "${PROXY_HOST}" ]; then
CURL_OPTIONS="-sL -x ${PROXY_HOST}"
PIP_OPTIONS="--proxy=${PROXY_HOST}"
GITHUB_PROXY=""
INFO "使用代理更新程序"
INFO "使用全局代理更新程序与环境依赖"
else
CURL_OPTIONS="-sL"
INFO "不使用代理更新程序"
INFO "不使用任何代理更新程序与环境依赖"
fi
if [ -n "${GITHUB_TOKEN}" ]; then
CURL_HEADERS="--oauth2-bearer ${GITHUB_TOKEN}"