laoxong/AstrBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: improve skills bundle extraction process to prevent overwriting existing files

Browse Source
This commit is contained in:
Soulter
2026-02-03 16:54:53 +08:00
parent c091053ea8
commit 93277ffac9
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
astrbot/core/computer/computer_client.py
+9 -8
View File
@@ -40,15 +40,16 @@ async def _sync_skills_to_sandbox(booter: ComputerBooter) -> None:
upload_result = await booter.upload_file(zip_path, str(remote_zip))
if not upload_result.get("success", False):
raise RuntimeError("Failed to upload skills bundle to sandbox.")
# Use -n flag to never overwrite existing files, fallback to Python if unzip unavailable
await booter.shell.exec(
" || ".join(
[
f"python3 -m zipfile -e {remote_zip} {SANDBOX_SKILLS_ROOT}",
f"python -m zipfile -e {remote_zip} {SANDBOX_SKILLS_ROOT}",
f"unzip -o {remote_zip} -d {SANDBOX_SKILLS_ROOT}",
]
)
+ f" && rm -f {remote_zip}"
f"unzip -n {remote_zip} -d {SANDBOX_SKILLS_ROOT} || "
f"python3 -c \"import zipfile, os, pathlib; z=zipfile.ZipFile('{remote_zip}'); "
f"[z.extract(m, '{SANDBOX_SKILLS_ROOT}') for m in z.namelist() "
f"if not os.path.exists(os.path.join('{SANDBOX_SKILLS_ROOT}', m))]\" || "
f"python -c \"import zipfile, os, pathlib; z=zipfile.ZipFile('{remote_zip}'); "
f"[z.extract(m, '{SANDBOX_SKILLS_ROOT}') for m in z.namelist() "
f"if not os.path.exists(os.path.join('{SANDBOX_SKILLS_ROOT}', m))]\"; "
f"rm -f {remote_zip}"
)
finally:
if os.path.exists(zip_path):