Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

fix(amane): uv sync 失败的报错保留首行并按整行截取末尾

longmeidao9140db22fe1d
diff --git a/src/peach/metadata_amane.py b/src/peach/metadata_amane.py
index fb1649eb0..0ea415d4e 100644
--- a/src/peach/metadata_amane.py
+++ b/src/peach/metadata_amane.py
@@ -295,6 +295,21 @@ def rebuild(tools_root: Path, *, runner: Runner = run_task_process, timeout: int
return {"ok": False, "error": f"amane 安装目录无法读写:{redact(str(error))}"}
+def _uv_failure(output: str, limit: int = 800) -> str:
+ """uv 报错的首行说哪一步失败,末尾是 git 或构建的原始输出。太长时保留首行和末尾若干整行:
+ 任务卡用首行当摘要,按字符截会让它从半个词读起。"""
+ lines = output.strip().splitlines()
+ if len(output.strip()) <= limit or len(lines) < 2:
+ return output.strip()[-limit:]
+ tail, size = [], 0
+ for line in reversed(lines[1:]):
+ size += len(line) + 1
+ if size > limit:
+ break
+ tail.append(line)
+ return "\n".join([lines[0], "…", *reversed(tail)])
+
+
def _rebuild(tools_root, *, runner, timeout, root, proxy_options):
from .error_reporting import redact
if problem := bundle_problem(root):
@@ -317,7 +332,7 @@ def _rebuild(tools_root, *, runner, timeout, root, proxy_options):
except OSError as exc:
return {"ok": False, "error": f"无法启动 uv:{redact(str(exc))}"}
if completed.returncode:
- detail = (completed.stderr or completed.stdout or "").strip()[-800:]
+ detail = _uv_failure(completed.stderr or completed.stdout or "")
return {"ok": False, "error": f"uv sync 失败(exit {completed.returncode}):{redact(detail)}"}
if not bridge_python(tools_root).is_file() or installed_version(tools_root) != locked_version(root):
return {"ok": False, "error": "amane 安装未完成:运行环境中没有可用的包元数据"}
diff --git a/tests/test_metadata_amane.py b/tests/test_metadata_amane.py
index 31d385bab..100d2d1d2 100644
--- a/tests/test_metadata_amane.py
+++ b/tests/test_metadata_amane.py
@@ -139,6 +139,11 @@ class RebuildTests(unittest.TestCase):
failed = metadata_amane.rebuild(tools, runner=lambda *a, **k: completed("", 2, "boom"))
self.assertFalse(failed["ok"])
self.assertIn("boom", failed["error"])
+ # 长输出保留首行,末尾从整行截起,摘要不会从半个词开始。
+ stderr = "× Failed to fetch amane\n" + "".join(f" line {index:03d} detail detail\n" for index in range(80))
+ long = metadata_amane.rebuild(tools, runner=lambda *a, **k: completed("", 1, stderr))["error"]
+ self.assertTrue(long.startswith("uv sync 失败(exit 1):× Failed to fetch amane\n…\n line "), long[:80])
+ self.assertTrue(long.endswith("line 079 detail detail"))
python = metadata_amane.bridge_python(tools)
def build(*args, **kwargs):