Skip to content

armgit / peach

Public Imported from GitHub
0

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

fix(scraping): 安装包缺 amane 桥文件时卡片说明原因

longmeidaob5807a5b9db5
diff --git a/frontend/src/react/scraping/scraping-page.tsx b/frontend/src/react/scraping/scraping-page.tsx
index 29d7b5fd8..bc166ed98 100644
--- a/frontend/src/react/scraping/scraping-page.tsx
+++ b/frontend/src/react/scraping/scraping-page.tsx
@@ -322,10 +322,12 @@ function AmaneBridgeCard({ toast }: ScrapingProps) {
<p className="text-body-2-regular text-text-secondary">{data.sites.map((site) => site.label).join('、')}</p>
</Disclosure>
: null}
- <Help>
- 已安装版本:{data.installed_version || '未安装'}。amane({data.license})提供这些内置站点的解析能力。
- 重新安装会使用 Peach 内置的 {data.version} 版本,不随上游自动升级。
- </Help>
+ {data.problem
+ ? <Note tone="error">{data.problem}</Note>
+ : <Help>
+ 已安装版本:{data.installed_version || '未安装'}。amane({data.license})提供这些内置站点的解析能力。
+ 重新安装会使用 Peach 内置的 {data.version} 版本,不随上游自动升级。
+ </Help>}
{running ? <LoadingDots label="正在重建运行环境" /> : null}
{problem ? <Note tone="error">{problem}</Note> : null}
{outcome?.status === 'complete' ? <Note tone="success">{outcome.result || 'amane 桥已重建'}</Note> : null}
@@ -334,7 +336,8 @@ function AmaneBridgeCard({ toast }: ScrapingProps) {
<Button variant="secondary" onClick={() => { if (!busy) check.mutate() }} {...busyProps(check.isPending)}>
检查上游版本
</Button>
- <Button onClick={() => { if (!busy) rebuild.mutate() }} {...busyProps(running || rebuild.isPending)}>
+ <Button disabled={Boolean(data.problem)} onClick={() => { if (!busy) rebuild.mutate() }}
+ {...busyProps(running || rebuild.isPending)}>
{data.installed ? '重新安装' : '安装'}
</Button>
</Footer>
diff --git a/frontend/src/react/scraping/scraping.ts b/frontend/src/react/scraping/scraping.ts
index 21d23da5d..deb686834 100644
--- a/frontend/src/react/scraping/scraping.ts
+++ b/frontend/src/react/scraping/scraping.ts
@@ -64,10 +64,13 @@ export interface CoverJob {
/** amane 桥那张卡(ADR-0043)。`revision` 是清单里钉的 amane sha,`version` 是锁里那一条的
* 版本号;`installed` 是 venv 里有没有解释器;`sites` 是经桥开放给来源链的站。`job` 是重建
- * 任务的快照,`status` 同 `CoverJob`。 */
+ * 任务的快照,`status` 同 `CoverJob`。安装包缺桥的清单或脚本时 `bundled` 为假,
+ * `problem` 写原因,`revision` 与 `version` 为空。 */
export interface AmaneBridge {
repository: string;
license: string;
+ bundled: boolean;
+ problem: string;
revision: string;
version: string;
installed: boolean;
diff --git a/frontend/test/react/scraping.test.tsx b/frontend/test/react/scraping.test.tsx
index 746f10526..3e3f61487 100644
--- a/frontend/test/react/scraping.test.tsx
+++ b/frontend/test/react/scraping.test.tsx
@@ -80,7 +80,7 @@ async function open(handlers: Record<string, (body: never) => Reply | Promise<Re
/** amane 桥那张卡的事实:已装好、没有在跑的重建。 */
const BRIDGE: AmaneBridge = {
- repository: 'https://github.com/sqzw-x/amane', license: 'GPL-3.0',
+ repository: 'https://github.com/sqzw-x/amane', license: 'GPL-3.0', bundled: true, problem: '',
revision: '79ecfa763cc786318e1964a3d7f4e244a7d5c96d', version: '0.16.1', installed: true,
installed_version: '0.16.1',
python: 'T:/tools/amane-bridge/.venv/Scripts/python.exe',
@@ -323,6 +323,20 @@ it('amane 桥:检查上游只填「上游最新版本」那一行,重建跟
expect(toast).toHaveBeenCalledWith('amane 桥已按 79ecfa763cc7 重建');
});
+it('amane 桥:安装包缺桥文件时卡片写出原因,安装键停用', async () => {
+ const problem = '安装包里缺少 amane 桥的文件:C:/Peach/_internal/tools/amane-bridge/pyproject.toml;重新安装 Peach 后可用';
+ const { host } = await open({
+ ...quiet(),
+ 'GET /api/scraping/amane-bridge': () => ({ body: {
+ ...BRIDGE, bundled: false, problem, revision: '', version: '', installed: false, installed_version: '',
+ } }),
+ });
+ const bridge = section(host, 'amane')!;
+ expect(bridge.textContent).toContain(problem);
+ expect(bridge.textContent).not.toContain('Peach 内置的');
+ expect(buttonNamed('安装', bridge)?.disabled).toBe(true);
+});
+
it('登录外链只写主机名;数据库里认不出的连接方式原样列成一项,下拉框不落到空占位', () => {
expect(linkHost('https://www.javbus.com/login?next=%2F')).toBe('www.javbus.com');
expect(linkHost('不是地址')).toBe('不是地址');
diff --git a/src/peach/metadata_amane.py b/src/peach/metadata_amane.py
index a69ba278a..9e0d20fad 100644
--- a/src/peach/metadata_amane.py
+++ b/src/peach/metadata_amane.py
@@ -168,9 +168,27 @@ def rebuild_command(tools_root: Path, *, uv: Path, root: Path = BRIDGE_ROOT) ->
return command, env
+def bundle_problem(root: Path = BRIDGE_ROOT) -> str:
+ """桥的清单与脚本读不全时给人看的原因;齐全返回空串。
+
+ 打包产物漏带 `tools/amane-bridge` 时三个文件都不在,设置页那张卡和重建都靠这句话说明,
+ 不把 `FileNotFoundError` 抛成读接口的 500。
+ """
+ missing = [path for path in (root / "pyproject.toml", root / "bridge.py") if not path.is_file()]
+ if missing:
+ return f"安装包里缺少 amane 桥的文件:{missing[0]};重新安装 Peach 后可用"
+ try:
+ pinned_revision(root)
+ except (OSError, ValueError, KeyError, TypeError) as exc:
+ return f"amane 桥的清单读不出来:{exc}"
+ return ""
+
+
def rebuild(tools_root: Path, *, runner: Runner = subprocess.run, timeout: int = 900,
root: Path = BRIDGE_ROOT) -> dict:
"""重建桥 venv,返回给设置页的回执。首次要下载约 98 MB,之后只校验。"""
+ if problem := bundle_problem(root):
+ return {"ok": False, "error": problem}
uv = find_uv()
if uv is None:
return {"ok": False, "error": "未找到 uv,请先安装 uv 再重建 amane 桥"}
@@ -191,13 +209,19 @@ def rebuild(tools_root: Path, *, runner: Runner = subprocess.run, timeout: int =
def describe(tools_root: Path, *, root: Path = BRIDGE_ROOT) -> dict:
- """设置页那张卡要的事实:钉的 sha、锁里的版本、venv 建没建、桥开了哪几站。"""
+ """设置页那张卡要的事实:钉的 sha、锁里的版本、venv 建没建、桥开了哪几站。
+
+ 清单读不全时 `bundled` 为假、`problem` 写原因,sha 与锁版本留空,卡片据此停用安装。
+ """
python = bridge_python(tools_root)
+ problem = bundle_problem(root)
return {
"repository": AMANE_REPOSITORY,
"license": AMANE_LICENSE,
- "revision": pinned_revision(root),
- "version": locked_version(root),
+ "bundled": not problem,
+ "problem": problem,
+ "revision": "" if problem else pinned_revision(root),
+ "version": "" if problem else locked_version(root),
"installed": python.is_file(),
"installed_version": installed_version(tools_root),
"python": str(python),
diff --git a/tests/test_metadata_amane.py b/tests/test_metadata_amane.py
index 570cabe54..40c265be4 100644
--- a/tests/test_metadata_amane.py
+++ b/tests/test_metadata_amane.py
@@ -153,11 +153,51 @@ class RebuildTests(unittest.TestCase):
def test_describe_lists_the_facts_the_settings_card_shows(self):
with tempfile.TemporaryDirectory() as tmp:
facts = metadata_amane.describe(Path(tmp))
- self.assertEqual(set(facts), {"repository", "license", "revision", "version", "installed", "installed_version", "python", "sites"})
+ self.assertEqual(set(facts), {"repository", "license", "bundled", "problem", "revision", "version",
+ "installed", "installed_version", "python", "sites"})
+ self.assertTrue(facts["bundled"])
+ self.assertEqual(facts["problem"], "")
self.assertFalse(facts["installed"])
self.assertEqual(facts["installed_version"], "")
self.assertEqual([site["source"] for site in facts["sites"]], list(metadata_amane.SITES))
+ def test_a_package_without_the_bridge_files_is_reported_not_raised(self):
+ """打包产物漏带 `tools/amane-bridge` 时,卡片拿到原因,重建不起 uv。"""
+ with tempfile.TemporaryDirectory() as tmp:
+ empty, tools = Path(tmp) / "_internal" / "tools" / "amane-bridge", Path(tmp) / "tools"
+ facts = metadata_amane.describe(tools, root=empty)
+ self.assertFalse(facts["bundled"])
+ self.assertIn(str(empty / "pyproject.toml"), facts["problem"])
+ self.assertEqual((facts["revision"], facts["version"]), ("", ""))
+ self.assertEqual(len(facts["sites"]), len(metadata_amane.SITES))
+ calls = []
+ with patch.object(metadata_amane, "find_uv", return_value=Path("uv.exe")):
+ rebuilt = metadata_amane.rebuild(tools, runner=lambda *a, **k: calls.append(a) or completed(""), root=empty)
+ self.assertEqual(rebuilt, {"ok": False, "error": facts["problem"]})
+ self.assertEqual(calls, [])
+
+ def test_an_unreadable_or_unpinned_manifest_is_a_problem_too(self):
+ with tempfile.TemporaryDirectory() as tmp:
+ root = Path(tmp)
+ (root / "bridge.py").write_text("", encoding="utf-8")
+ for manifest in ("[project", '[project]\ndependencies = ["amane @ git+https://x/amane@main"]\n'):
+ with self.subTest(manifest=manifest):
+ (root / "pyproject.toml").write_text(manifest, encoding="utf-8")
+ facts = metadata_amane.describe(root / "tools", root=root)
+ self.assertFalse(facts["bundled"])
+ self.assertTrue(facts["problem"].startswith("amane 桥的清单读不出来"))
+
+ def test_the_settings_route_answers_with_the_problem_instead_of_failing(self):
+ from types import SimpleNamespace
+ from peach.web_scraping import q_scraping_amane_bridge
+ with tempfile.TemporaryDirectory() as tmp:
+ contract = SimpleNamespace(tools_root=Path(tmp) / "tools",
+ amane_bridge_job=SimpleNamespace(snapshot=lambda: None))
+ with patch.dict(metadata_amane.describe.__kwdefaults__, {"root": Path(tmp) / "missing"}):
+ card = q_scraping_amane_bridge(contract, {})
+ self.assertFalse(card["bundled"])
+ self.assertEqual(card["job"], {"status": "idle"})
+
def test_installed_version_reads_the_isolated_package_metadata(self):
with tempfile.TemporaryDirectory() as tmp:
tools = Path(tmp)
@@ -428,6 +468,14 @@ class ProviderStageTests(unittest.TestCase):
self.addCleanup(patcher.stop)
return provider
+ def test_a_missing_bridge_script_leaves_this_tier_unavailable(self):
+ provider = LibraryMetadataProvider(self.secrets, tools_root=self.tools)
+ self.addCleanup(provider.transport.close)
+ missing = Path(self.temporary.name) / "missing" / "bridge.py"
+ with patch.object(metadata_amane, "BRIDGE_SCRIPT", missing), self.assertRaises(Unavailable) as caught:
+ provider.amane("FC2-PPV-1234567", route=("fc2club",))
+ self.assertIn("amane 桥脚本缺失", str(caught.exception))
+
def test_a_hit_comes_back_as_source_payload_pairs_and_is_cached(self):
provider = self.provider(report(fc2club=FOUND, avsox={"status": "not_found", "reason": "not_found"}))
found = provider.amane("FC2-PPV-1234567", route=("fc2club", "avsox"))
diff --git a/web/dist/peach-app.js b/web/dist/peach-app.js
index 438ca4fa2..e12eafbd7 100644
--- a/web/dist/peach-app.js
+++ b/web/dist/peach-app.js
@@ -2,7 +2,7 @@
(function() {
try {
var e = typeof window < "u" ? window : typeof global < "u" ? global : typeof globalThis < "u" ? globalThis : typeof self < "u" ? self : {}, t = new e.Error().stack;
- t && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[t] = "bc580cd5-ef33-42c5-b955-c8e1e665cbf1", e._sentryDebugIdIdentifier = "sentry-dbid-bc580cd5-ef33-42c5-b955-c8e1e665cbf1");
+ t && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[t] = "8b8e4b93-9e10-4378-8219-d6d04862732b", e._sentryDebugIdIdentifier = "sentry-dbid-8b8e4b93-9e10-4378-8219-d6d04862732b");
} catch {}
})();
var e = Object.create, t = Object.defineProperty, n = Object.getOwnPropertyDescriptor, r = Object.getOwnPropertyNames, i = Object.getPrototypeOf, a = Object.prototype.hasOwnProperty, o = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t.exports), s = (e, n) => {
@@ -74747,7 +74747,10 @@ function bIe({ toast: e }) {
children: o.sites.map((e) => e.label).join("、")
})
}) : null,
- /* @__PURE__ */ (0, D.jsxs)(dA, { children: [
+ o.problem ? /* @__PURE__ */ (0, D.jsx)(J, {
+ tone: "error",
+ children: o.problem
+ }) : /* @__PURE__ */ (0, D.jsxs)(dA, { children: [
"已安装版本:",
o.installed_version || "未安装",
"。amane(",
@@ -74775,6 +74778,7 @@ function bIe({ toast: e }) {
...Y(a.isPending),
children: "检查上游版本"
}), /* @__PURE__ */ (0, D.jsx)(q, {
+ disabled: !!o.problem,
onClick: () => {
s || i.mutate();
},
@@ -115619,4 +115623,4 @@ nxt(rxt);
//#endregion
export { HT as applyTheme, yk as peachHistory, Go as popCount, Agt as showToast };
-//# debugId=bc580cd5-ef33-42c5-b955-c8e1e665cbf1
\ No newline at end of file
+//# debugId=8b8e4b93-9e10-4378-8219-d6d04862732b
\ No newline at end of file