thsrite/archived-MoviePilot-Plugins
1
0
Fork 0
mirror of https://github.com/thsrite/MoviePilot-Plugins.git synced 2026-03-27 10:05:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(autobackup): root用户不使用 exec_run, 优化字符串引号风格

Browse Source
This commit is contained in:
Attente
2025-11-30 18:49:30 +08:00
parent 1cf9ed50f5
commit e51ff44679
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.v2.json
View File

@@ -419,7 +419,7 @@
"name": "自动备份",
"description": "自动备份数据和配置文件。",
"labels": "系统设置",
"version": "2.1.1",
"version": "2.1.2",
"icon": "Time_machine_B.png",
"author": "thsrite",
"level": 1,

33
plugins.v2/autobackup/__init__.py
View File

@@ -33,7 +33,7 @@ class AutoBackup(_PluginBase):
# 插件图标
plugin_icon = "Time_machine_B.png"
# 插件版本
plugin_version = "2.1.1"
plugin_version = "2.1.2"
# 插件作者
plugin_author = "thsrite"
# 作者主页
@@ -202,8 +202,8 @@ class AutoBackup(_PluginBase):
# 执行安装 PostgreSQL 客户端的命令
try:
AutoBackup.install_postgresql_client(pg_version)
logger.info("PostgreSQL 17 客户端安装成功。")
except (docker.errors.ContainerError, subprocess.CalledProcessError) as e:
logger.info(f"PostgreSQL {pg_version} 客户端安装成功。")
except (docker.errors.APIError, docker.errors.ContainerError, subprocess.CalledProcessError) as e:
logger.error(f"安装 PostgreSQL {pg_version} 客户端失败: {e.stderr.strip() if e.stderr else str(e)}")
logger.error("请手动执行安装命令。")
logger.error(f'apt-get update && apt-get install -y wget gnupg lsb-release && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/postgresql.gpg && echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && apt-get update && apt-get install -y postgresql-client-{pg_version}')
@@ -279,30 +279,31 @@ class AutoBackup(_PluginBase):
# 设置代理
exec_env = {}
if proxy_url and proxy_url.startswith(('http://', 'https://')):
exec_env['http_proxy'] = proxy_url
exec_env['https_proxy'] = proxy_url
exec_env.update(dict.fromkeys(['HTTP_PROXY', 'HTTPS_PROXY', 'http_proxy', 'https_proxy'], proxy_url))
# 构建安装脚本
install_script = (
"apt-get update && "
"apt-get install -y wget gnupg lsb-release && "
"wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | "
"gpg --dearmor > /etc/apt/trusted.gpg.d/postgresql.gpg && "
"echo 'deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main' "
"> /etc/apt/sources.list.d/pgdg.list && "
"apt-get update && "
"apt-get install -y postgresql-%s" % pg_version
'apt-get update && '
'apt-get install -y wget gnupg lsb-release && '
'wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | '
'gpg --dearmor > /etc/apt/trusted.gpg.d/postgresql.gpg && '
'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" '
'> /etc/apt/sources.list.d/pgdg.list && '
'apt-get update && '
'apt-get install -y postgresql-%s' % pg_version
)
if SystemUtils.is_docker() and (container_id := SystemHelper._get_container_id()):
# 非root用户且是docker环境
if os.geteuid() != 0 and SystemUtils.is_docker() and (container_id := SystemHelper._get_container_id()):
# 创建 Docker 客户端
client = docker.DockerClient(base_url=settings.DOCKER_CLIENT_API)
# 获取容器对象
container = client.containers.get(container_id)
# 执行命令
container.exec_run(
exit_code, output = container.exec_run(
cmd=['sh', '-c', install_script],
environment=exec_env
)
if exit_code != 0:
raise docker.errors.ContainerError(exit_status=exit_code, command=install_script, stderr=output)
else:
subprocess.run(