Skip to content

armgit / peach

Public Imported from GitHub
0

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

feat(userscript): 支持手动番号与本地人物资料

longmeidao87b014e5c26d
diff --git a/docs/BOARD_UI.md b/docs/BOARD_UI.md
index 9a5006e25..47c61e939 100644
--- a/docs/BOARD_UI.md
+++ b/docs/BOARD_UI.md
@@ -1,5 +1,15 @@
# BoardUI 适配
+## 无图头像与浮卡子页
+
+2026-10-27 复核:无图头像的圆盘、首字母和默认人像按同一组件检查。背景使用主文字色 10% 混入承载面的中性色,不能直接取与行背景相同的 `background-primary-default` 或 `background-tertiary-default`;前景使用 `text-primary`,不套用禁用色、三级文字色或整体透明度。24px 头像复用 Avatar `sm` 的 12/16、600 字阶,默认人像图形为 16px;照片、首字母和缺省图标保持相同外框。此处取代下文历史参考中无图头像的「次文字色首字」采用项。
+
+正常、悬停和选中行中的无图头像都需检查深浅主题:首字母与头像底色至少 4.5:1,承载身份含义的人像图形至少 3:1;圆盘也应能从承载面辨认。规则依据 [WCAG 文字对比度](https://www.w3.org/WAI/WCAG22/Understanding/contrast-minimum.html) 与[非文字对比度](https://www.w3.org/WAI/WCAG22/Understanding/non-text-contrast.html)。尺寸相同、使用了语义 token 或背景有色差均不能代替前景对比度核对。复用源组件时须同时带入 Peach 的暗色适配,不只复制组件结构和上游默认值。
+
+表格默认采用 Body Medium 14/20、500,状态文字采用 Body Regular 14/20、400;单元格内边距为 10px 12px。只有明确选择紧凑档才使用完整的 Body 2 字阶 13/18,不能拼出 13/20 等混合档。小型浮卡的标题为 Title 2 Medium 20/26,正文 14/20,辅助说明 12/16;正文内边距 20px,分组间距 16px,图文和操作组间距 8px。字阶包含字号、行高和字重,不能只核字号。表头与「待加入」等正常状态均需可读,不能按禁用文字处理;用户脚本的表头使用主文字色,状态使用次文字色,历史取证中的三级文字色不直接套入暗色小浮卡。
+
+同一浮卡内的设置、批量选择属于子页:标题左侧返回,恢复进入前的主界面状态与焦点;关闭整个浮卡的 `×` 只留在主界面。返回设置不保存草稿,返回批量选择停止后续提交,已提交任务继续处理。原生 Escape 与返回保持相同语义。
+
## 设置分组与页签选中层
侧栏底部按明暗、配色、设置排列,展开时横排、收起时竖排,视觉顺序与键盘焦点顺序一致。
@@ -315,7 +325,7 @@ Radial Chart Card、Bar List Card、Heatmap 与 Sankey 的 Pro 源码**未取得
| 侧栏名单的展开键 | 无对应(上游侧栏不截断名单) | 取排名卡那枚展开药丸的身量;再按一下收的是整组,不是把名单退回另一个断点 |
| 侧栏收起键 | 36px、`rounded-2lg`、`foreground-icon-secondary`,收起时与品牌相隔 10px | 采用,图标沿用 Peach 的 `panel-left` |
| 详情页门挡 | 无对应 | 铺满播放器格不留黑;播放器格只圆左上角(右贴侧栏、下接「接着看」),窄屏与影院模式圆上面两角 |
-| 没有图的身份头像 | Avatar initials 盘 `avatar-neutral-background` 值未取得 | 主文字色 10% 混底、次文字色首字 |
+| 没有图的身份头像 | Avatar neutral 的暗色默认背景与 primary 面相同 | 采用范围与前景对比度见「无图头像与浮卡子页」,不能仅复用上游默认背景 |
| 首页女优与厂牌两排 | 无 Avatar Group;PillTab gray + Avatar sm(24px) | 见 2026-09-09 那一节:女优竖排人像格、厂牌 40px 灰 Pill |
| 管理页标题 | 无对应 | 只在 812px 窄列页面居中,别处与面包屑同一左边线 |
| 沉浸模式 | 无对应 | 随机流在入口筛掉脱盘来源的片子 |
diff --git a/docs/REUSE.md b/docs/REUSE.md
index 2ec2593b3..8b48711b8 100644
--- a/docs/REUSE.md
+++ b/docs/REUSE.md
@@ -1,5 +1,9 @@
# 复用清单
+## 浏览器添加的本地人物资料
+
+`/api/jav-browser/people` 复用现有专用令牌与浏览器权限检查、规范实体关联和男优排除判据。人物名只读本地账本与发现资料快照,头像通过既有 `PreviewService.entity_image` 查找已安装文件;已有 Pillow 将其在内存缩为 64px JPEG,不落新头像、不抓外站。未初始化发现资料服务时直接读取快照,避免初始化恢复外站任务。缺头像省略图片字段,缺人物信息返回空数组,接口失败与正常缺失分别反馈。用户脚本显示灰底首字母,不显示作品封面,无新增依赖。
+
## 复核字段筛选与文本差异
复核文本差异复用 [jsdiff](https://github.com/kpdecker/jsdiff) 的 `diffChars`,前端精确固定 `[email protected]`(BSD-3-Clause,自带类型),按 Unicode 码点比较并仅展示当前文本中的差异片段。当前值和候选相互对照,尚无当前值时对照其他来源;来源依据只比较同名字段。Peach 保留参照选择、语义高亮与字段筛选,不自行实现通用差异算法;原始候选值、提交契约和 ledger 均不改变。
diff --git a/docs/UI_COMPONENT_CONTRACTS.md b/docs/UI_COMPONENT_CONTRACTS.md
index 4b9264adc..0f17135af 100644
--- a/docs/UI_COMPONENT_CONTRACTS.md
+++ b/docs/UI_COMPONENT_CONTRACTS.md
@@ -40,6 +40,7 @@ React 与 BoardUI 的组件、颜色和尺寸采用 [BoardUI 适配](BOARD_UI.md
- 管理页单面板分区的标题放在面板内,不在框外重复;多卡片分组可用框外标题。同级分区标题用 `text-title-2-medium`,加载态与内容态共用 500 字重、20px 字号和 26px 行高。
- 控件高度只取 `--control-h-inline`/`-compact`/`--control-h`/`-large` 四档,同一行的同类控件同档;与文字同行的图标用 `--icon-inline`,单独图标按控件档取固定值;下拉不点开也要看得出在选什么(上方标签、触发键前缀或格子选择器的弹层标题三选一)。判据与坏例见 `docs/DESIGN_GUIDELINES.md` 第 2、10、11 节。
- React 使用 BoardUI 语义 token,遗留样式使用对应 `:root` token;新增 token 须说明现有词汇无法表达的语义。
+- 无图头像、首字母与默认人像复用 [BoardUI 无图头像规范](BOARD_UI.md#无图头像与浮卡子页),同时核对承载面的深浅主题、悬停和选中态;不能把数据未取得当作动作禁用而降低前景对比度。表格、表单与浮卡使用完整字阶和对应间距,复用快照须包含 Peach 已登记的暗色例外。
- 字重只有 400/500/600 三档,标题按既定层级选择 medium 或 semibold;圆角只用 `--badge-radius`/`--control-radius`/`--surface-radius`/`--floating-radius`/`--pill-radius` 加 `50%` 与 `0`,带边框容器里的头尾条用 `calc(… - 1px)` 保持同心。两者的字面值由 `tests/test_web_ui.py` 拒绝,归属判据见 `:root` 注释。
- 遗留 Geist 层单色优先:`--tungsten` 只给焦点环、链接、进度/数据与 Toggle 开态。主动作用 `--ink` 底 `--ground` 字且每屏最多一个。标题悬停下划线不变蓝,计数徽章中性灰。其它选择器引用 `--tungsten` 由 `tests/test_web_ui.py` 拒绝;实测见 `vercel-geist-semantics-measured.md`「选中态与开关色」「Button 全变体与状态」。
- 选中态只有填充:一律 `--hover` 底 `--ink` 字,不加边框、不加 `inset` 一圈线、不加字重(Geist Switch/Tabs 的类名里三样都没有)。填充既然专属选中,**同一排横向**互斥选项的未选中项悬停就只提文字色到 `--ink`;没有选中态的按钮和没有并排邻居的孤立开关悬停照旧抬填充。侧栏导航(`.edge`/`.dnav`)分工相反:实测 Geist 左栏是悬停抬填充、当前项握着文字与图标色,别把横排那条推广过去。清单见同一份快照的「选中态与它的悬停」和「侧栏导航是例外」。
diff --git a/src/peach/jav_browser.py b/src/peach/jav_browser.py
index 40b0a0b66..dc9a2f3fb 100644
--- a/src/peach/jav_browser.py
+++ b/src/peach/jav_browser.py
@@ -268,7 +268,13 @@ class JavBrowser:
"message": row.get("message") or MESSAGES[state]}
def add(self, body: dict) -> dict:
- code, page = code_key(body.get("code")), source_page(body.get("source_url"))
+ code = code_key(body.get("code"))
+ if body.get("manual") is True:
+ if body.get("source_url") not in (None, ""):
+ raise ValueError("手动添加不接受来源网页地址")
+ page = ""
+ else:
+ page = source_page(body.get("source_url"))
with self._lock:
config = self._config()
if not config.get("token_hash"):
@@ -327,7 +333,7 @@ class JavBrowser:
try:
submitted = submit_offline_download(
self.downloads, magnet=candidate["uri"], provider=provider, code=code,
- origin="browser:" + row["source_url"], dedupe_code=True)
+ origin="browser:" + (row["source_url"] or "manual"), dedupe_code=True)
task = submitted["task"]
with self._lock:
row.update(state="failed" if submitted["outcome"] in {"failed", "refused"} else "submitted",
diff --git a/src/peach/jav_browser_people.py b/src/peach/jav_browser_people.py
new file mode 100644
index 000000000..966a4c57b
--- /dev/null
+++ b/src/peach/jav_browser_people.py
@@ -0,0 +1,79 @@
+"""用户脚本的人物补充:只读馆藏、元数据快照与已安装头像。"""
+from __future__ import annotations
+
+import base64
+import io
+import json
+
+from PIL import Image, ImageOps
+
+from . import entities
+from .jav_browser import code_key
+from .previews import PreviewUnavailable
+from .web_jav_detail import visible_actors
+
+
+def _snapshots(contract, codes):
+ cached = getattr(contract, 'jav_discovery_metadata', None)
+ if cached is not None:
+ return {code: cached.peek(code)[0] for code in codes}
+ path = contract.cover_root.parent / 'jav-discovery-metadata.json'
+ try:
+ if path.stat().st_size > 16 * 1024 * 1024:
+ raise ValueError('本地人物快照过大')
+ payload = json.loads(path.read_text(encoding='utf-8'))
+ if payload.get('version') != 1 or not isinstance(payload.get('records'), dict):
+ raise ValueError('本地人物快照格式无效')
+ records = payload['records']
+ return {code: records.get(code, {}).get('movie', {}) for code in codes}
+ except FileNotFoundError:
+ return {}
+ except (OSError, UnicodeError, json.JSONDecodeError) as error:
+ raise ValueError('本地人物快照未取得') from error
+
+
+def cached_people(contract, preview, value: str) -> dict:
+ raw = value.split(',')
+ if not 1 <= len(raw) <= 50:
+ raise ValueError('每次最多查询 50 个番号')
+ codes = list(dict.fromkeys(code_key(code) for code in raw))
+ items, avatars = {}, {}
+ snapshots = _snapshots(contract, codes)
+ with contract.database.read_connection() as connection:
+ excluded = entities.male_performer_ids(connection)
+ for code in codes:
+ people = {}
+ for row in connection.execute(
+ "SELECT DISTINCT e.id,e.canonical_name FROM asset a "
+ "JOIN asset_entity ae ON ae.asset_id=a.id JOIN entity e ON e.id=ae.entity_id "
+ "WHERE normalise_code_key(a.code)=? AND a.medium='video' AND a.disposal IS NULL "
+ "AND e.kind='performer' ORDER BY e.canonical_name", (code,)):
+ if row['id'] not in excluded:
+ people[entities.normalize_entity_name(row['canonical_name'])] = {
+ 'id': row['id'], 'name': row['canonical_name']}
+ source = snapshots.get(code, {})
+ for actor in visible_actors(connection, source or {}, excluded):
+ name = actor['name'].strip()
+ key = entities.normalize_entity_name(name)
+ 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 person in people.values():
+ entity_id = person['id']
+ if entity_id is None or not contract.has_entity_image('performer', entity_id):
+ continue
+ if entity_id not in avatars:
+ try:
+ path, _ = preview.entity_image('performer', entity_id)
+ with Image.open(path) as original:
+ image = ImageOps.fit(original.convert('RGB'), (64, 64))
+ output = io.BytesIO()
+ image.save(output, format='JPEG', quality=75)
+ avatars[entity_id] = 'data:image/jpeg;base64,' + base64.b64encode(output.getvalue()).decode('ascii')
+ except (PreviewUnavailable, OSError, ValueError):
+ avatars[entity_id] = ''
+ person['avatar_unavailable'] = True
+ if avatars[entity_id]:
+ person['avatar'] = avatars[entity_id]
+ items[code] = list(people.values())
+ return {'ok': True, 'source': 'local-cache', 'items': items}
diff --git a/src/peach/routes_jav_browser.py b/src/peach/routes_jav_browser.py
index 1e1931d21..414d09468 100644
--- a/src/peach/routes_jav_browser.py
+++ b/src/peach/routes_jav_browser.py
@@ -52,6 +52,15 @@ 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)):
+ from .jav_browser_people import cached_people
+ try:
+ result = cached_people(service.contract, request.app.state.preview_service, codes)
+ return JSONResponse(result, headers={'Cache-Control': 'no-store'})
+ except ValueError as error:
+ raise HTTPException(400, str(error)) from None
+
+
def add(body: dict = Body(...), service=Depends(browser_client)):
try:
return JSONResponse(service.add(body), headers={"Cache-Control": "no-store"})
@@ -91,6 +100,7 @@ def create_router(local_only) -> APIRouter:
router.add_api_route("/api/jav-browser", status, methods=["GET"])
router.add_api_route("/api/jav-browser/identify", identify, methods=["GET"])
router.add_api_route("/api/jav-browser/updates", updates, methods=["GET"])
+ router.add_api_route("/api/jav-browser/people", people, methods=["GET"])
router.add_api_route("/api/jav-browser", add, methods=["POST"])
router.add_api_route("/api/jav-browser/errors", errors, methods=["POST"])
permissions = [Depends(require_auth), Depends(local_only)]
diff --git a/tests/test_downloads_jav_browser.py b/tests/test_downloads_jav_browser.py
index 7e119e71a..5c5bb0303 100644
--- a/tests/test_downloads_jav_browser.py
+++ b/tests/test_downloads_jav_browser.py
@@ -80,6 +80,66 @@ class BrowserTests(unittest.TestCase):
("115", "/115/Movies", "ABC-123", "browser:" + PAGE))
self.assertEqual(self.downloads.store.submissions(task.id)[0]["outcome"], "submitted")
+ def test_manual_number_queues_without_sending_the_source_page(self):
+ response = self.client.post('/api/jav-browser', headers=self.script_headers,
+ json={'code': 'ABC-123', 'manual': True})
+ self.assertEqual(response.status_code, 200, response.text)
+ self.assertEqual(response.json()['state'], 'queued')
+ self.assertEqual(self.service.rows['ABC-123']['source_url'], '')
+ self.service.process_one()
+ task = self.downloads.store.get(self.status().json()['task_id'])
+ self.assertEqual(task.origin, 'browser:manual')
+
+ def test_manual_number_rejects_source_urls_and_invalid_codes(self):
+ for body in ({'code': 'ABC-123', 'manual': True, 'source_url': 'https://example.org/private'},
+ {'code': 'not a code', 'manual': True},
+ {'code': 'ABC-123', 'manual': 'true'}):
+ response = self.client.post('/api/jav-browser', headers=self.script_headers, json=body)
+ self.assertEqual(response.status_code, 400, response.text)
+ self.assertEqual(self.service.rows, {})
+
+ def test_people_reads_local_names_and_avatar_without_starting_source_requests(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')
+ with patch('peach.javdb_public.PUBLIC_API.movie', side_effect=AssertionError('不能联网')):
+ response = self.client.get('/api/jav-browser/people', params={'codes': 'ABC-123,XYZ-999'},
+ headers=self.script_headers)
+ self.assertEqual(response.status_code, 200, response.text)
+ result = response.json()
+ self.assertEqual(result['source'], 'local-cache')
+ self.assertEqual(result['items']['XYZ-999'], [])
+ self.assertEqual(result['items']['ABC-123'][0]['name'], '测试演员')
+ self.assertTrue(result['items']['ABC-123'][0]['avatar'].startswith('data:image/jpeg;base64,'))
+ self.assertEqual(self.service.rows, {})
+ self.service.search.assert_not_called()
+
+ 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)):
+ self.assertEqual(self.client.get('/api/jav-browser/people', params={'codes':codes},
+ headers=self.script_headers).status_code, 400)
+ contract = self.app.state.web_contract
+ contract.cover_root = self.root / 'covers'
+ snapshot = contract.cover_root.parent / 'jav-discovery-metadata.json'
+ snapshot.parent.mkdir(parents=True, exist_ok=True)
+ snapshot.write_text(json.dumps({'version':1,'records':{'ABC-123':{'movie':{'actors':[{'name':'测试女优','gender':'female'}]}}}}),encoding='utf-8')
+ snapshot.with_suffix('.job.json').write_text(json.dumps({'status':'running','codes':['ABC-123']}),encoding='utf-8')
+ with patch('peach.jav_discovery_metadata.DiscoveryMetadata', side_effect=AssertionError('不能恢复后台抓取')):
+ result = self.client.get('/api/jav-browser/people', params={'codes':'ABC-123'}, headers=self.script_headers).json()
+ self.assertEqual(result['items']['ABC-123'], [{'id':None,'name':'测试女优'}])
+
def test_alias_clicks_and_service_restart_keep_one_job_and_one_cloud_submission(self):
self.add("abc123")
self.add("ABC-0123")