Skip to content

armgit / peach

Public Imported from GitHub
0

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

feat(jav-browser): 区分失败原因、支持换磁力并按出演者匹配人物

longmeidaobae8c2bdffdc
diff --git a/docs/JAV_BROWSER.md b/docs/JAV_BROWSER.md
index cad6c7b0c..704c975fc 100644
--- a/docs/JAV_BROWSER.md
+++ b/docs/JAV_BROWSER.md
@@ -34,7 +34,7 @@ Peach 配置页通过同源桥接页检测脚本版本和是否已为当前地
2. 脚本用整体进度显示排队、搜索、下载、入库与整理五个阶段,完成阶段打勾、当前阶段高亮,并显示提交网盘、文件可访问等具体状态。网盘百分比仅属于下载阶段,其他阶段按真实状态推进。馆藏已有的影片显示「馆藏已有该番号影片」,按钮显示「已有该影片」。同一番号的进行中任务会复用。
3. 云下载提交后,在 Peach 任务中心查看下载与入库后整理进度。
-搜索期间可以关闭源站页面,队列由 Peach 保存;Peach 重启后继续尚未完成的搜索。未找到资源和失败的添加,需要在原站点击「重试加入 Peach 馆藏」。网络超时只提供状态查询,确认服务器结果后再决定是否重试。
+搜索期间可以关闭源站页面,队列由 Peach 保存;Peach 重启后继续尚未完成的搜索。提交后脚本自动刷新状态,最长一小时。失败时区分原因:磁力问题(网盘拒绝、链接无效、没有下载源、内容不符)可点击「换一个磁力」,Peach 跳过已失败的磁力,取搜索结果里的下一个;网盘问题(配置或登录、额度、网络、文件未落地)需要先在 Peach 检查网盘,再点击「重试加入 Peach 馆藏」,重试仍使用原来的磁力。没有可换的磁力时显示未找到资源。网络超时只提供状态查询,确认服务器结果后再决定是否重试。
浮卡标题栏可折叠详情,也可收起为右下角的 Peach 标志小球。点击小球展开并查询现有任务,不会再次添加。设置面板打开时隐藏浮卡,关闭后恢复;开关过渡遵循系统的减少动效偏好。
diff --git a/docs/REUSE.md b/docs/REUSE.md
index 05fb87396..4e24eb826 100644
--- a/docs/REUSE.md
+++ b/docs/REUSE.md
@@ -12,7 +12,7 @@ YuNet 与 SFace 沿用既有模型哈希校验,Python 读取模型字节后交
## 浏览器添加的本地人物资料
-`/api/jav-browser/people` 复用现有专用令牌与浏览器权限检查、规范实体关联和男优排除判据。人物名只读本地账本与发现资料快照,头像通过既有 `PreviewService.entity_image` 查找已安装文件;已有 Pillow 将其在内存缩为 64px JPEG,不落新头像、不抓外站。未初始化发现资料服务时直接读取快照,避免初始化恢复外站任务。缺头像省略图片字段,缺人物信息返回空数组,接口失败与正常缺失分别反馈。用户脚本显示灰底首字母,不显示作品封面,无新增依赖。
+`/api/jav-browser/people` 复用现有专用令牌与浏览器权限检查、规范实体关联和男优排除判据。人物名只读本地账本与发现资料快照;查询单个番号时还可带上详情页的出演者名字,按既有 `resolve_entity` 先规范名后唯一别名匹配,括号里的别名一并尝试,未匹配的只返回名字。头像通过既有 `PreviewService.entity_image` 查找已安装文件;已有 Pillow 将其在内存缩为 64px JPEG,不落新头像、不抓外站。未初始化发现资料服务时直接读取快照,避免初始化恢复外站任务。缺头像省略图片字段,缺人物信息返回空数组,接口失败与正常缺失分别反馈。用户脚本显示灰底首字母,不显示作品封面,无新增依赖。
## README Star 图
@@ -297,7 +297,7 @@ Windows 复用 FFmpeg 的 D3D11VA 解码与 `h264_amf`、`h264_qsv` 编码,沿
用户脚本由 [peach-mitao/peach-userscript](https://github.com/peach-mitao/peach-userscript)(AGPL-3.0-or-later)独立维护,使用 [Tampermonkey 官方 GM API](https://www.tampermonkey.net/documentation.php) 的本机存储、菜单与 `GM_xmlhttpRequest`;SPA 通知依据 `window.onurlchange` 契约。上游使用 Node.js 24 LTS 内置模块确定性构建,运行时零依赖。Peach 的 `web/integrations/` 消费同一发布的完整安装脚本与站点快照,固定版本、上游提交与 SHA256 见 `jav-userscript-release.json`。安装端点直接返回制品,后端独立校验已登记域名与作品参数;上游导出工具在隔离工作树同步这两份制品和来源记录。Sleazy 热门脚本只提供显式域名与镜像发现证据,不复制其实现或执行第三方代码。宿主扩展由用户安装,兼容性以实际浏览器及脚本管理器授权为准;模拟 GM API 的真实 Chromium 页面完成回归,DMM 与 MGS 实页通过隔离只读 GM 适配核验番号、页面浮层与设置窗口。真实扩展、Peach 与网盘联合下载验收未取得。
-Peach 保留页面粗提取与身份冲突提示,服务端复用 `catalog_rules` 的唯一番号规则、`feeds.scan_code`、`web_resource_search.q_resource_search` 的来源顺序与质量排序、`submit_offline_download` 的 infohash 幂等、现有云下载落地与后处理。浏览器添加在共享提交锁内按番号接管已有任务,覆盖其他入口同时提交不同磁力的情况。专用令牌经 `CredentialStore` 仅保存 SHA-256 摘要,不声明跨机同步字段。队列用已有 `atomic_write_text` 保存本机运行状态,关闭功能会撤销令牌并停止尚未提交的添加。
+Peach 保留页面粗提取与身份冲突提示,服务端复用 `catalog_rules` 的唯一番号规则、`feeds.scan_code`、`web_resource_search.q_resource_search` 的来源顺序与质量排序、`submit_offline_download` 的 infohash 幂等、现有云下载落地与后处理。浏览器添加在共享提交锁内按番号接管已有任务,覆盖其他入口同时提交不同磁力的情况。失败原因直接复用下载任务的 `FAILURE_KINDS` 分为磁力与网盘两类;换磁力把失败任务的 infohash 记入该番号的跳过名单,候选挑选沿用同一份搜索结果与番号判据。专用令牌经 `CredentialStore` 仅保存 SHA-256 摘要,不声明跨机同步字段。队列用已有 `atomic_write_text` 保存本机运行状态,关闭功能会撤销令牌并停止尚未提交的添加。
DMM / MGS 的只读商品号识别复用 `sources.dmm` 的 CID 结构与 `catalog_rules.release_code_from_product`。浏览器提交净化后的详情地址及可选厂家番号;DMM 的目录数字头按来源解释,MGS 保留三位发行前缀,尾字母和日期分隔符保留为身份。`release_code_from_text` 继续处理普通文件名的字幕与画质标记,不用文件名噪声规则改写明确商品身份。资源名称的完整商品号匹配复用同一编目模式,元数据身份校验与 DMM 搜索核对尾字母。运行时不新增 HTTP 请求或依赖;已有 DMM/OpenAver 取证与来源协议足以覆盖转换,不引入第二套外部番号库。完整脚本连接临时账本的真实识别接口,联合验证 DMM/MGS 桌面与手机场景;保留基于模拟响应的跨站交互回归。
diff --git a/src/peach/jav_browser.py b/src/peach/jav_browser.py
index dc9a2f3fb..15e3f0d22 100644
--- a/src/peach/jav_browser.py
+++ b/src/peach/jav_browser.py
@@ -32,6 +32,10 @@ MESSAGES = {
"submitted": "云下载进行中", "ingested": "已加入 Peach 馆藏", "owned": "馆藏已有该番号影片",
"failed": "添加失败,可重试", "no_match": "未找到可自动下载的磁力,可重试",
}
+#: 下载失败按原因分给用户脚本:磁力本身的问题换一个磁力,网盘一侧的问题修好后重试同一个磁力。
+MAGNET_FAILURES = frozenset({"rejected", "invalid_link", "no_source", "mismatch"})
+CLOUD_FAILURES = frozenset({"config", "quota", "network", "not_landed", "duplicate"})
+NO_OTHER_MAGNET = "没有其他可用磁力,可在 Peach 手动选择资源"
@lru_cache(maxsize=1)
@@ -110,7 +114,8 @@ def identify_source(value: object, hint: str = "") -> str:
return code
-def _download_candidate(items, code):
+def _download_candidate(items, code, skip=frozenset()):
+ """搜索结果里第一个番号相符的正片磁力;`skip` 是换磁力时排除的 infohash。"""
for item in items:
name = str(item.get("name") or "")
matches = (same_release_code(scan_code(name), code)
@@ -118,9 +123,11 @@ def _download_candidate(items, code):
if not matches or re.search(r"(?i)\b(?:sample|trailer|preview)\b|予告|预告|預告", name):
continue
try:
- parse_magnet(str(item.get("uri") or ""))
+ magnet = parse_magnet(str(item.get("uri") or ""))
except ValueError:
continue
+ if magnet.info_hash in skip:
+ continue
return item
return None
@@ -251,6 +258,10 @@ class JavBrowser:
state = "ingested" if task.state == INGESTED else (
"failed" if task.state in RESUBMITTABLE_STATES or task.blocked_at else "submitted")
row.update(state=state, message=task.failure_detail or MESSAGES[state])
+ if state == "failed":
+ detail["failure"] = task.failure or ""
+ detail["cause"] = ("magnet" if task.blocked_at or task.failure in MAGNET_FAILURES
+ else "cloud" if task.failure in CLOUD_FAILURES else "")
if task.asset_id:
row["asset_id"] = task.asset_id
progress = task.progress
@@ -282,13 +293,23 @@ class JavBrowser:
status = self.status(code)
if status["state"] in ACTIVE | {"owned", "submitted", "ingested"}:
return status
+ if body.get("switch") not in (None, False, True):
+ raise ValueError("换磁力参数无效")
+ # 换磁力:把上一次提交的磁力记入跳过名单,重新搜索时取下一个。
+ previous = self.rows.get(code, {})
+ skip = list(previous.get("skip", ()))
+ if body.get("switch") is True and previous.get("task_id"):
+ task = self.downloads.store.get(previous["task_id"])
+ if task is not None and task.info_hash and task.info_hash not in skip:
+ skip.append(task.info_hash)
self._ready(config.get("provider", ""), remote=False)
if code not in self.rows and len(self.rows) >= 200:
completed = next((key for key, row in self.rows.items() if row["state"] not in ACTIVE), None)
if completed is None:
raise ValueError("添加队列已满,请等待当前任务结束")
del self.rows[completed]
- self.rows[code] = {"state": "queued", "provider": config["provider"], "source_url": page}
+ self.rows[code] = {"state": "queued", "provider": config["provider"], "source_url": page,
+ **({"skip": skip[-20:]} if skip else {})}
self._save()
self._wake.set()
return self.status(code)
@@ -312,7 +333,7 @@ class JavBrowser:
try:
self._ready(provider)
result = self.search(self.contract, {"code": code, "goal": "quality"})
- candidate = _download_candidate(result.get("items", ()), code)
+ candidate = _download_candidate(result.get("items", ()), code, frozenset(row.get("skip", ())))
should_submit = False
with self._lock:
if row["state"] != "searching" or not self._config().get("token_hash"):
@@ -324,7 +345,8 @@ class JavBrowser:
elif candidate is None:
failed = result.get("state") in {"error", "unavailable"} or bool(result.get("error"))
row.update(state="failed" if failed else "no_match", message=(
- "资源搜索暂不可用,请在 Peach 检查来源后重试" if failed else MESSAGES["no_match"]))
+ "资源搜索暂不可用,请在 Peach 检查来源后重试" if failed
+ else NO_OTHER_MAGNET if row.get("skip") else MESSAGES["no_match"]))
else:
self._submitting.add(code)
should_submit = True
diff --git a/src/peach/routes_jav_browser.py b/src/peach/routes_jav_browser.py
index e432948f9..7cc0a8a81 100644
--- a/src/peach/routes_jav_browser.py
+++ b/src/peach/routes_jav_browser.py
@@ -1,7 +1,7 @@
"""JAV 用户脚本的专用权限端点与本机配对设置。"""
import json
-from fastapi import APIRouter, Body, Depends, HTTPException, Request
+from fastapi import APIRouter, Body, Depends, HTTPException, Query, Request
from fastapi.responses import HTMLResponse, JSONResponse, Response
from .config import PROJECT_ROOT
@@ -52,10 +52,10 @@ def updates(request: Request, service=Depends(browser_client)):
return JSONResponse(snapshot(request.app.state.automatic_updates), headers={'Cache-Control': 'no-store'})
-def people(request: Request, codes: str, service=Depends(browser_client)):
+def people(request: Request, codes: str, performers: list[str] = Query(default=[]), service=Depends(browser_client)):
from .web_jav_browser_people import cached_people
try:
- result = cached_people(service.contract, request.app.state.preview_service, codes)
+ result = cached_people(service.contract, request.app.state.preview_service, codes, performers)
return JSONResponse(result, headers={'Cache-Control': 'no-store'})
except ValueError as error:
raise HTTPException(400, str(error)) from None
diff --git a/src/peach/web_jav_browser_people.py b/src/peach/web_jav_browser_people.py
index 966a4c57b..891053e9f 100644
--- a/src/peach/web_jav_browser_people.py
+++ b/src/peach/web_jav_browser_people.py
@@ -1,9 +1,10 @@
-"""用户脚本的人物补充:只读馆藏、元数据快照与已安装头像。"""
+"""用户脚本的人物补充:只读馆藏、元数据快照、详情页出演者与已安装头像。"""
from __future__ import annotations
import base64
import io
import json
+import re
from PIL import Image, ImageOps
@@ -32,11 +33,32 @@ def _snapshots(contract, codes):
raise ValueError('本地人物快照未取得') from error
-def cached_people(contract, preview, value: str) -> dict:
+def _page_names(performers) -> list[str]:
+ """详情页出演者原文:去掉 ♀ 标记,男演员(♂)不参与;只在查询单个番号时使用。"""
+ names = [str(name).strip() for name in performers or ()]
+ if len(names) > 10 or any(not name or len(name) > 60 for name in names):
+ raise ValueError('出演者最多 10 位,每位不超过 60 个字符')
+ return [name.replace('♀', '').strip() for name in names if '♂' not in name]
+
+
+def _page_person(connection, name: str) -> dict:
+ """「河北彩花(河北彩伽)」先按括号外的名字,再按括号里的别名匹配本地人物;都未匹配时只留名字。"""
+ base = re.sub(r'[((][^))]*[))]', '', name).strip() or name
+ for candidate in (base, *re.findall(r'[((]([^()()]+)[))]', name)):
+ found = entities.resolve_entity(connection, 'performer', candidate.strip())
+ if found:
+ return {'id': found['id'], 'name': found['canonical_name']}
+ return {'id': None, 'name': base}
+
+
+def cached_people(contract, preview, value: str, performers=()) -> dict:
raw = value.split(',')
if not 1 <= len(raw) <= 50:
raise ValueError('每次最多查询 50 个番号')
codes = list(dict.fromkeys(code_key(code) for code in raw))
+ page_names = _page_names(performers)
+ if page_names and len(codes) != 1:
+ raise ValueError('出演者只能随单个番号查询')
items, avatars = {}, {}
snapshots = _snapshots(contract, codes)
with contract.database.read_connection() as connection:
@@ -58,6 +80,11 @@ def cached_people(contract, preview, value: str) -> dict:
if key and key not in people:
found = entities.resolve_entity(connection, 'performer', name)
people[key] = {'id': found['id'] if found else None, 'name': name}
+ for name in page_names:
+ person = _page_person(connection, name)
+ key = entities.normalize_entity_name(person['name'])
+ if key and key not in people and person['id'] not in excluded:
+ people[key] = person
for person in people.values():
entity_id = person['id']
if entity_id is None or not contract.has_entity_image('performer', entity_id):
diff --git a/tests/test_downloads_jav_browser.py b/tests/test_downloads_jav_browser.py
index 5c5bb0303..79f1cb740 100644
--- a/tests/test_downloads_jav_browser.py
+++ b/tests/test_downloads_jav_browser.py
@@ -125,6 +125,34 @@ class BrowserTests(unittest.TestCase):
self.assertEqual(self.service.rows, {})
self.service.search.assert_not_called()
+ def test_people_matches_detail_page_performers_for_a_title_outside_the_library(self):
+ from PIL import Image
+ from peach.entities import upsert_asset_entity
+ contract = self.app.state.web_contract
+ contract.avatar_root = self.root / 'avatars'
+ contract.cover_root = self.root / 'covers'
+ self.app.state.preview_service.avatar_root = contract.avatar_root
+ with contract.database.write_transaction() as connection:
+ asset_id = connection.execute(
+ 'INSERT INTO asset(path,name,location,medium,code) VALUES(?,?,?,?,?)',
+ ('R:\\Media\\ABC-123.mp4', 'ABC-123.mp4', 'local', 'video', 'ABC-123')).lastrowid
+ person = upsert_asset_entity(connection, asset_id=asset_id, kind='performer', name='河北彩花',
+ role='performer', source='user:test')
+ contract.avatar_root.mkdir(parents=True, exist_ok=True)
+ Image.new('RGB', (80, 80), 'gray').save(contract.avatar_root / f'performer-{person}.img', format='JPEG')
+ response = self.client.get('/api/jav-browser/people', headers=self.script_headers, params={
+ 'codes': 'XYZ-999', 'performers': ['河北彩花(河北彩伽)', '未登记女优♀', '男优♂']})
+ self.assertEqual(response.status_code, 200, response.text)
+ people = response.json()['items']['XYZ-999']
+ self.assertEqual([(row['id'], row['name']) for row in people], [(person, '河北彩花'), (None, '未登记女优')])
+ self.assertTrue(people[0]['avatar'].startswith('data:image/jpeg;base64,'))
+ for params in ({'codes': 'ABC-123,XYZ-999', 'performers': ['河北彩花']},
+ {'codes': 'XYZ-999', 'performers': ['女优'] * 11},
+ {'codes': 'XYZ-999', 'performers': ['长' * 61]}):
+ self.assertEqual(self.client.get('/api/jav-browser/people', params=params,
+ headers=self.script_headers).status_code, 400)
+ self.assertEqual(self.service.rows, {})
+
def test_people_rejects_unpaired_or_invalid_queries_and_leaves_missing_avatar_empty(self):
self.assertEqual(self.client.get('/api/jav-browser/people', params={'codes':'ABC-123'}).status_code, 401)
for codes in ('bad code', ','.join(['ABC-123']*51)):
@@ -197,12 +225,39 @@ class BrowserTests(unittest.TestCase):
self.service.process_one()
self.assertEqual(self.service.search.call_count, 2)
+ def test_magnet_failure_can_switch_to_the_next_magnet_until_none_are_left(self):
+ other_hash = "b" * 40
+ other = f"magnet:?xt=urn:btih:{other_hash}&dn=ABC-123"
+ self.service.search.return_value = {"items": [{"name": "ABC-123 1080p", "uri": MAGNET},
+ {"name": "ABC-123 720p", "uri": other}]}
+ self.remote.submit.side_effect = dl.DownloadError("no_source", "没有可用下载源")
+ self.add()
+ self.service.process_one()
+ failed = self.status().json()
+ self.assertEqual((failed["state"], failed["failure"], failed["cause"]), ("failed", "no_source", "magnet"))
+ self.assertEqual(self.add(switch="yes").status_code, 400)
+ self.remote.submit.side_effect = None
+ self.assertEqual(self.add(switch=True).json()["state"], "queued")
+ self.service.process_one()
+ switched = self.status().json()
+ self.assertEqual(switched["state"], "submitted")
+ self.assertNotEqual(switched["task_id"], failed["task_id"])
+ self.assertEqual(self.downloads.store.get(switched["task_id"]).info_hash, other_hash)
+ task = self.downloads.store.get(switched["task_id"])
+ task.state, task.failure = dl.FAILED, "invalid_link"
+ self.downloads.store.save(task)
+ self.assertEqual(self.add(switch=True).json()["state"], "queued")
+ self.service.process_one()
+ exhausted = self.status().json()
+ self.assertEqual((exhausted["state"], exhausted["message"]), ("no_match", "没有其他可用磁力,可在 Peach 手动选择资源"))
+
def test_cloud_failure_is_visible_and_a_manual_retry_uses_existing_task(self):
self.remote.submit.side_effect = dl.DownloadError("config", "请更新网盘账号")
self.add()
self.service.process_one()
failed = self.status().json()
self.assertEqual(failed["state"], "failed")
+ self.assertEqual((failed["failure"], failed["cause"]), ("config", "cloud"))
self.assertEqual(failed["message"], "请更新网盘账号")
self.remote.submit.side_effect = None
self.add()