mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2025-12-14 21:52:56 +08:00
1e2aa99207
* 🐛 修复数据库超时问题 * 🔧 移除帮助图片清理功能. * ✨ 更新插件商店功能，允许在添加插件时指定源类型为 None。优化插件 ID 查找逻辑，增强代码可读性。新增 zhenxun/ui 模块导入。 * 🔧 优化数据访问和数据库上下文逻辑，移除不必要的全局变量和日志信息，调整日志级别为调试，提升代码可读性和性能。 * ✨ 增强插件商店功能，支持在下载文件时指定稀疏检出路径和目标目录。优化二进制文件处理逻辑，提升文件下载的准确性和效率。 * ✨ 增强阿里云和GitHub的文件管理功能，新增Git不可用异常处理，优化稀疏检出逻辑，提升代码可读性和稳定性。 * ✨ 增强插件下载功能，新增对下载结果的异常处理，确保在Git不可用时抛出相应异常信息。优化错误提示，提升用户体验。 * ✨ 增强插件商店功能，优化添加插件时的提示信息，明确区分插件模块和名称。新增 Windows 下删除只读文件的处理逻辑，提升插件管理的稳定性和用户体验。 * ✨ 优化文件内容获取逻辑，新增对非二进制文件的UTF-8解码处理，提升文件读取的稳定性和准确性。
255 lines
7.7 KiB
Python
255 lines
7.7 KiB
Python
"""
|
||
仓库管理工具的工具函数
|
||
"""
|
||
|
||
import asyncio
|
||
import base64
|
||
from pathlib import Path
|
||
import re
|
||
import shutil
|
||
|
||
from zhenxun.services.log import logger
|
||
|
||
from .config import LOG_COMMAND, RepoConfig
|
||
from .exceptions import GitUnavailableError
|
||
|
||
|
||
async def check_git() -> bool:
|
||
"""
|
||
检查环境变量中是否存在 git
|
||
|
||
返回:
|
||
bool: 是否存在git命令
|
||
"""
|
||
try:
|
||
process = await asyncio.create_subprocess_shell(
|
||
"git --version",
|
||
stdout=asyncio.subprocess.PIPE,
|
||
stderr=asyncio.subprocess.PIPE,
|
||
)
|
||
stdout, _ = await process.communicate()
|
||
return bool(stdout)
|
||
except Exception as e:
|
||
logger.error("检查git命令失败", LOG_COMMAND, e=e)
|
||
return False
|
||
|
||
|
||
async def clean_git(cwd: Path):
|
||
"""
|
||
清理git仓库
|
||
|
||
参数:
|
||
cwd: 工作目录
|
||
"""
|
||
await run_git_command("reset --hard", cwd)
|
||
await run_git_command("clean -xdf", cwd)
|
||
|
||
|
||
async def run_git_command(
|
||
command: str, cwd: Path | None = None
|
||
) -> tuple[bool, str, str]:
|
||
"""
|
||
运行git命令
|
||
|
||
参数:
|
||
command: 命令
|
||
cwd: 工作目录
|
||
|
||
返回:
|
||
tuple[bool, str, str]: (是否成功, 标准输出, 标准错误)
|
||
"""
|
||
try:
|
||
full_command = f"git {command}"
|
||
# 将Path对象转换为字符串
|
||
cwd_str = str(cwd) if cwd else None
|
||
process = await asyncio.create_subprocess_shell(
|
||
full_command,
|
||
stdout=asyncio.subprocess.PIPE,
|
||
stderr=asyncio.subprocess.PIPE,
|
||
cwd=cwd_str,
|
||
)
|
||
stdout_bytes, stderr_bytes = await process.communicate()
|
||
|
||
stdout = stdout_bytes.decode("utf-8").strip()
|
||
stderr = stderr_bytes.decode("utf-8").strip()
|
||
|
||
return process.returncode == 0, stdout, stderr
|
||
except Exception as e:
|
||
logger.error(f"运行git命令失败: {command}, 错误: {e}")
|
||
return False, "", str(e)
|
||
|
||
|
||
def glob_to_regex(pattern: str) -> str:
|
||
"""
|
||
将glob模式转换为正则表达式
|
||
|
||
参数:
|
||
pattern: glob模式，如 "*.py"
|
||
|
||
返回:
|
||
str: 正则表达式
|
||
"""
|
||
# 转义特殊字符
|
||
regex = re.escape(pattern)
|
||
|
||
# 替换glob通配符
|
||
regex = regex.replace(r"\*\*", ".*") # ** -> .*
|
||
regex = regex.replace(r"\*", "[^/]*") # * -> [^/]*
|
||
regex = regex.replace(r"\?", "[^/]") # ? -> [^/]
|
||
|
||
# 添加开始和结束标记
|
||
regex = f"^{regex}$"
|
||
|
||
return regex
|
||
|
||
|
||
def filter_files(
|
||
files: list[str],
|
||
include_patterns: list[str] | None = None,
|
||
exclude_patterns: list[str] | None = None,
|
||
) -> list[str]:
|
||
"""
|
||
过滤文件列表
|
||
|
||
参数:
|
||
files: 文件列表
|
||
include_patterns: 包含的文件模式列表，如 ["*.py", "docs/*.md"]
|
||
exclude_patterns: 排除的文件模式列表，如 ["__pycache__/*", "*.pyc"]
|
||
|
||
返回:
|
||
list[str]: 过滤后的文件列表
|
||
"""
|
||
result = files.copy()
|
||
|
||
# 应用包含模式
|
||
if include_patterns:
|
||
included = []
|
||
for pattern in include_patterns:
|
||
regex_pattern = glob_to_regex(pattern)
|
||
included.extend(file for file in result if re.match(regex_pattern, file))
|
||
result = included
|
||
|
||
# 应用排除模式
|
||
if exclude_patterns:
|
||
for pattern in exclude_patterns:
|
||
regex_pattern = glob_to_regex(pattern)
|
||
result = [file for file in result if not re.match(regex_pattern, file)]
|
||
|
||
return result
|
||
|
||
|
||
async def sparse_checkout_clone(
|
||
repo_url: str,
|
||
branch: str,
|
||
sparse_path: str,
|
||
target_dir: Path,
|
||
) -> None:
|
||
"""
|
||
使用 git 稀疏检出克隆指定路径到目标目录（完全独立于主项目 git）。
|
||
|
||
关键保障:
|
||
- 在 target_dir 下检测/初始化 .git，所有 git 操作均以 cwd=target_dir 执行
|
||
- 强制拉取与工作区覆盖: fetch --force、checkout -B、reset --hard、clean -xdf
|
||
- 反复设置 sparse-checkout 路径，确保路径更新生效
|
||
"""
|
||
target_dir.mkdir(parents=True, exist_ok=True)
|
||
|
||
if not await check_git():
|
||
raise GitUnavailableError()
|
||
|
||
git_dir = target_dir / ".git"
|
||
if not git_dir.exists():
|
||
success, out, err = await run_git_command("init", target_dir)
|
||
if not success:
|
||
raise RuntimeError(f"git init 失败: {err or out}")
|
||
success, out, err = await run_git_command(
|
||
f"remote add origin {repo_url}", target_dir
|
||
)
|
||
if not success:
|
||
raise RuntimeError(f"添加远程失败: {err or out}")
|
||
else:
|
||
success, out, err = await run_git_command(
|
||
f"remote set-url origin {repo_url}", target_dir
|
||
)
|
||
if not success:
|
||
# 兜底尝试添加
|
||
await run_git_command(f"remote add origin {repo_url}", target_dir)
|
||
|
||
# 启用稀疏检出（使用 --no-cone 模式以获得更精确的控制）
|
||
await run_git_command("config core.sparseCheckout true", target_dir)
|
||
await run_git_command("sparse-checkout init --no-cone", target_dir)
|
||
|
||
# 设置需要检出的路径（每次都覆盖配置）
|
||
if not sparse_path:
|
||
raise RuntimeError("sparse-checkout 路径不能为空")
|
||
|
||
# 使用 --no-cone 模式，直接指定要检出的具体路径
|
||
# 例如：sparse_path="plugins/mahiro" -> 只检出 plugins/mahiro/ 下的内容
|
||
success, out, err = await run_git_command(
|
||
f"sparse-checkout set {sparse_path}/", target_dir
|
||
)
|
||
if not success:
|
||
raise RuntimeError(f"配置稀疏路径失败: {err or out}")
|
||
|
||
# 强制拉取并同步到远端
|
||
success, out, err = await run_git_command(
|
||
f"fetch --force --depth 1 origin {branch}", target_dir
|
||
)
|
||
if not success:
|
||
raise RuntimeError(f"fetch 失败: {err or out}")
|
||
|
||
# 使用远端强制更新本地分支并覆盖工作区
|
||
success, out, err = await run_git_command(
|
||
f"checkout -B {branch} origin/{branch}", target_dir
|
||
)
|
||
if not success:
|
||
# 回退方案
|
||
success2, out2, err2 = await run_git_command(f"checkout {branch}", target_dir)
|
||
if not success2:
|
||
raise RuntimeError(f"checkout 失败: {(err or out) or (err2 or out2)}")
|
||
|
||
# 强制对齐工作区
|
||
await run_git_command(f"reset --hard origin/{branch}", target_dir)
|
||
await run_git_command("clean -xdf", target_dir)
|
||
|
||
dir_path = target_dir / Path(sparse_path)
|
||
for f in dir_path.iterdir():
|
||
shutil.move(f, target_dir / f.name)
|
||
dir_name = sparse_path.split("/")[0]
|
||
rm_path = target_dir / dir_name
|
||
if rm_path.exists():
|
||
shutil.rmtree(rm_path)
|
||
|
||
|
||
def prepare_aliyun_url(repo_url: str) -> str:
|
||
"""解析阿里云CodeUp的仓库URL
|
||
|
||
参数:
|
||
repo_url: 仓库URL
|
||
|
||
返回:
|
||
str: 解析后的仓库URL
|
||
"""
|
||
config = RepoConfig.get_instance()
|
||
|
||
repo_name = repo_url.split("/tree/")[0].split("/")[-1].replace(".git", "")
|
||
# 构建仓库URL
|
||
# 阿里云CodeUp的仓库URL格式通常为：
|
||
# https://codeup.aliyun.com/{organization_id}/{organization_name}/{repo_name}.git
|
||
url = f"https://codeup.aliyun.com/{config.aliyun_codeup.organization_id}/{config.aliyun_codeup.organization_name}/{repo_name}.git"
|
||
|
||
# 添加访问令牌 - 使用base64解码后的令牌
|
||
if config.aliyun_codeup.rdc_access_token_encrypted:
|
||
try:
|
||
# 解码RDC访问令牌
|
||
token = base64.b64decode(
|
||
config.aliyun_codeup.rdc_access_token_encrypted.encode()
|
||
).decode()
|
||
# 阿里云CodeUp使用oauth2:token的格式进行身份验证
|
||
url = url.replace("https://", f"https://oauth2:{token}@")
|
||
logger.debug(f"使用RDC令牌构建阿里云URL: {url.split('@')[0]}@***")
|
||
except Exception as e:
|
||
logger.error(f"解码RDC令牌失败: {e}")
|
||
|
||
return url
|