Peach: Local-first video metadata scraper and media manager.
fix(metadata): 补齐女优中文名与图库头像自动处理
longmeidaocddb7cf1a032
diff --git a/docs/REUSE.md b/docs/REUSE.mdindex 18023296a..99dde4712 100644--- a/docs/REUSE.md+++ b/docs/REUSE.md@@ -721,7 +721,7 @@ A 盘垃圾隔离使用短名称 `peach-purge-<32 位 UUID>.peach-quarantine`,| 相关推荐 | OpenAver `8cc17e50453d9f69a81f5fee1a072df80f7aab73` 的 Tag IDF + 系列/片商/出演者规则只作固定算法参考(MIT) | 独立实现规范实体评分、MMR 多样性、稳定 seed、解释原因与负反馈边界;不复制上游 UI/源码 || 女优姓名对照 | `li-peifeng/Jav-Actors-Mapping` 的固定 revision,仅作私有输入(仓库未声明许可证,不随 Peach 分发) | 精确匹配、冲突复核、别名、来源与真实 ledger 写入 || 女优头像候选 | Gfriends 的 GitHub raw 索引与单张媒体(只作外部 Provider,不克隆图库);r18.dev 人物对象给出的 DMM 官方 `actjpgs` 缩略图只作精确身份绑定的首次头像 | 名字链、质量档位、格式/尺寸/SHA-256 门槛、候选缓存、provenance、健康统计和人工复核;首次头像只在人物主名精确一致、实体已连到同一资产且没有在位头像时安装。自动档案缩略图未达标准尺寸时进入图库升级核验;没有可靠图库候选则保留档案照。换头像端点记录人工选择,自动后继保留该选择 |-| Gfriends 索引读法 | `src/peach/gfriends.py` | 页面与批处理共用:`Filetree.json` 解析、名字链匹配、`quality_key` 排序、raw 地址与本地缓存缓存有效期,`fetch_index` 校验后原子换入缓存(服务端由 `avatar_picker.IndexRefresher` 在后台调)。**目录前缀是来源优先级,不是清晰度**(上游 README 写的「质量升序」不准):`0-` 网友投稿、`1-`~`8-` 写真机构与片商官方、往后是原图两三百像素的大型数据库,排第一的是最该先试的一张;`AI-Fix-` 是上游放大去水印版,去掉前缀取原件 |+| Gfriends 索引读法 | `src/peach/gfriends.py` | 页面与自动任务共用 `avatar_picker.IndexRefresher`、统一采集出口、失败退避与原子缓存;自动任务等待索引准备,窗口按刷新状态读取新候选,索引内容摘要参与头像重派。`Filetree.json` 解析、名字链匹配、`quality_key` 排序与 raw 地址共用现有实现。**目录前缀是来源优先级,不是清晰度**(上游 README 写的「质量升序」不准):`0-` 网友投稿、`1-`~`8-` 写真机构与片商官方、往后是原图两三百像素的大型数据库,排第一的是最该先试的一张;`AI-Fix-` 是上游放大去水印版,去掉前缀取原件 || 「这个地址能不能让 Peach 替人去取」 | `src/peach/http.py` 的 `public_https_url` + `resolves_publicly` | 追更图片代理与手填头像地址共用:必须 https 与公网域名,不收 IP 字面量与用户信息,解析出的每个地址都要 `is_global`;否则 Peach 就是能访问路由器、NAS 与本机端口的跳板 || 头像写入 | `src/peach/avatar_provider.install_entity_avatar` | 采集脚本、复核页与换头像共用:`.img` 经临时文件原子替换,`.ct`、`.provenance.json`、`.face.json` 一起换;检不出脸要删掉旧 `.face.json`,否则页面按上一张的脸框取景且看不出错 || 厂牌 Logo 候选 | 厂牌官网确认的社交 handle → unavatar URL 解析 → 平台 CDN 单图 | handle 归属、内容缓存、方形归一、精确/感知哈希、provenance、健康统计与变化复核 |diff --git a/docs/SEED.md b/docs/SEED.mdindex 57166293f..c803c71ea 100644--- a/docs/SEED.md+++ b/docs/SEED.md@@ -8,6 +8,8 @@ Peach 随应用分发 `resources/seed/entities.json`,用已核对的公开文导入只匹配本机已识别的人物、厂牌与事务所,空库不会因此生成另一人的实体集合。别名和来源编号用于匹配,重复身份与冲突产生复核产物;人工修改和其他采集来源的资料受归属保护。种子自己写入的资料可由新版更新,累计撤销只针对明确记录的错误事实。数据包中没有某条资料不表示删除本机资料。+人物当前名称是种子中置信度至少 0.9 的登记别名、种子规范名为中文汉字且身份唯一时,导入会采用中文规范名并同步作品署名。原名保留为别名,人工选择和非登记自定义名称保持原样。名称更新前自动备份账本,活动记录显示中文名数量;种子批次撤回入口可还原原名与作品署名,保留后续人工选择。细节见 [ADR-0122](adr/0122-seed-performer-names-and-gallery-preparation.md)。+## 维护者如何更新1. 在隔离工作树完成资料采集与纠错。维护者真实账本仅作为只读导出来源,不把数据库文件放进仓库。diff --git a/docs/adr/0122-seed-performer-names-and-gallery-preparation.md b/docs/adr/0122-seed-performer-names-and-gallery-preparation.mdnew file mode 100644index 000000000..44817bfe2--- /dev/null+++ b/docs/adr/0122-seed-performer-names-and-gallery-preparation.md@@ -0,0 +1,23 @@+# ADR-0122:种子中文名与头像图库准备++- 状态:已接受+- 日期:2026-10-24+- 修订:ADR-0052 的自动改规范名前置条件、ADR-0075 的种子消费范围++## 背景++安装包包含已维护的中文人物名与 Gfriends 读取能力。普通扫描需要完整消费这些能力,不能依赖维护者运行本地脚本或打开换头像窗口。人物名字与头像均须保护用户选择,并能区分外部资料缺失和本次取证失败。++## 决策++种子导入对人物身份锚点、规范名、别名及站上编号取命中并集,只有唯一命中才导入。种子规范名为中文汉字、当前规范名是种子中置信度至少 0.9 的登记别名、目标名称没有被其他人物占用时,采用种子规范名。非登记自定义名称、人工选择、来源冲突和重复实体保持原样;不合并实体,不推测假名译名。++自动名称更新使用现有统一名称与作品署名同步实现,保存原名、原名称偏好、来源和时间,原名保留为别名。种子后继先在内存副本计算改名计划,有改名才用既有 SQLite 备份入口保存整本账本,再执行写事务。备份失败则任务失败。`revert_auto_landing.py` 按种子来源和批次还原仍归该批次拥有的名称快照与作品署名;后续人工选择不撤回。原名称被其他实体占用时,撤回事务失败。名称规则修订进入种子后继键,使已导入同版数据的安装也能消费名称规则。++头像自动任务和换头像接口共用应用实例内的索引刷新器,复用统一采集出口、原子缓存和失败退避。自动任务等待索引准备后再找图;窗口读取刷新状态并在当前弹层更新候选,刷新结束或失败后停止轮询。无索引且下载失败不记为已完成取证;已有索引可作为离线回退。图库内容摘要进入人物头像任务指纹,索引内容变化可使未解决的人物重新派发。索引过期时至少派一位仍需补图的人物准备索引;相同内容的保鲜刷新不整批重派。++元数据导入后的官方人物头像使用独立阶段的有界传输预算,复用代理设置、来源冷却和共享请求间隔。预算或来源暂停时停止该阶段,保留已安装图片和可重试问题。++## 验证++使用临时账本、固定来源响应和图片缓存覆盖种子匹配、规范名与署名同步、人工保护、冲突、备份、幂等与撤回。索引覆盖首次准备、失败退避、内容变化重派以及无索引失败不结算;窗口覆盖当前弹层更新及轮询终止。无需新增依赖或修改数据库结构。diff --git a/frontend/src/react/avatar-picker/avatar-picker-page.tsx b/frontend/src/react/avatar-picker/avatar-picker-page.tsxindex 901ef0607..3a5efa7f2 100644--- a/frontend/src/react/avatar-picker/avatar-picker-page.tsx+++ b/frontend/src/react/avatar-picker/avatar-picker-page.tsx@@ -105,8 +105,10 @@ function PickerBody({ kind, entityId, name, onPicked, close }: AvatarPickerPropsconst listing = useQuery({queryKey: key,queryFn: ({ signal }) => fetchAvatarChoices(kind, entityId, signal),- // 上一次点开没取到就重来。取到过的那一份留着,反复开合不必每次再问一遍。+ // 失败或索引过期时重新读取;有效候选在反复开合时复用。retryOnMount: true,+ refetchOnMount: (query) => query.state.data?.index_stale ? 'always' : false,+ refetchInterval: (query) => query.state.data?.index_refreshing && !query.state.error ? 1000 : false,});/* 换成功之后这一份候选里「在用」是哪一格已经过期,扔掉它,下次点开重新取。要等到弹层真的收起来再扔:这时候还有人在读这个键,当场清掉它会立刻再取一遍,白问一趟。 */diff --git a/frontend/src/react/avatar-picker/avatar-picker.ts b/frontend/src/react/avatar-picker/avatar-picker.tsindex 3adae2ee3..bd1eb6cc9 100644--- a/frontend/src/react/avatar-picker/avatar-picker.ts+++ b/frontend/src/react/avatar-picker/avatar-picker.ts@@ -48,6 +48,8 @@ export interface AvatarChoices {choices: AvatarChoice[];index_age_hours: number | null;index_stale: boolean;+ index_refreshing?: boolean;+ index_error?: string;}/** 一个人一个键:换个人就是另一份候选,不该读到上一个人的。 */@@ -153,6 +155,8 @@ const indexAge = (hours: number): string =>/** 图库索引没取过或已过期、这一次也一张图库图都没拿到时的那句提示;别的情形是空串。* 没取过和过期是两回事:过期的索引照样在查,只是新收的人像查不到。 */export function indexNote(data: AvatarChoices | undefined): string {+ if (data?.index_refreshing) return '正在更新图库索引,候选图片会自动显示。';+ if (data?.index_error && data.index_stale) return '图库索引未取得:' + data.index_error;if (!data || !data.index_stale || data.choices.some((one) => one.source === 'gfriends')) return '';return data.index_age_hours === null? '图库索引还没取过,只能从用过的图里选。'diff --git a/frontend/test/react/avatar-picker.test.tsx b/frontend/test/react/avatar-picker.test.tsxindex 54320fceb..9ce6637c9 100644--- a/frontend/test/react/avatar-picker.test.tsx+++ b/frontend/test/react/avatar-picker.test.tsx@@ -281,6 +281,55 @@ it('图库索引还没取过时只剩手填那两条路', async () => {expect(document.querySelector('input[type=file]')).not.toBeNull();});+it('索引准备完成后在当前弹层自动显示图库候选', async () => {+ let calls = 0;+ vi.stubGlobal('fetch', vi.fn(async () => ({+ ok: true, status: 200,+ json: async () => ++calls === 1+ ? listing([], { index_refreshing: true, index_age_hours: null, index_stale: true })+ : listing([choice()], { index_refreshing: false }),+ })));+ await openPicker();+ expect(dialog()?.textContent).toContain('正在更新图库索引');+ await vi.waitFor(() => expect(cells()).toHaveLength(1), { timeout: 2500 });+ expect(dialog()?.textContent).not.toContain('正在更新图库索引');+ const finished = calls;+ await new Promise((resolve) => setTimeout(resolve, 1100));+ expect(calls).toBe(finished);+});++it('索引刷新请求失败时停止轮询并允许手动重试', async () => {+ let calls = 0;+ vi.stubGlobal('fetch', vi.fn(async () => {+ if (++calls > 1) throw new Error('服务连接中断');+ return { ok: true, status: 200, json: async () => listing([], {+ index_refreshing: true, index_age_hours: null, index_stale: true,+ }) };+ }));+ await openPicker();+ await vi.waitFor(() => expect(buttonNamed('立即重试')).not.toBeNull(), { timeout: 2500 });+ await new Promise((resolve) => setTimeout(resolve, 1100));+ expect(calls).toBe(2);+});++it('过期索引在重新打开弹层时读取当前候选', async () => {+ let calls = 0;+ vi.stubGlobal('fetch', vi.fn(async () => ({+ ok: true, status: 200,+ json: async () => ++calls === 1+ ? listing([], { index_refreshing: false, index_error: '连接中断', index_age_hours: null, index_stale: true })+ : listing([choice()], { index_refreshing: false }),+ })));+ const { host } = await openPicker();+ expect(dialog()?.textContent).toContain('图库索引未取得');+ await click(dialog()?.querySelector('button[aria-label="关闭"]'));+ await settle();+ await click(host.querySelector('button'));+ await settle();+ expect(calls).toBe(2);+ expect(cells()).toHaveLength(1);+});+it('过期的图库索引说出多久没更新,不说成还没取过', async () => {server(listing([], { matched_names: [], index_age_hours: 124, index_stale: true }));await openPicker();diff --git a/scripts/revert_auto_landing.py b/scripts/revert_auto_landing.pyindex 09e346221..7f9c5c27b 100644--- a/scripts/revert_auto_landing.py+++ b/scripts/revert_auto_landing.py@@ -7,6 +7,7 @@里记 `source` 与 `batch`(ADR-0067),番号样张的 `code_sample_image.source` 也是批次号(ADR-0068),种子包补的所属事务所 `entity_membership.source` 与 label 的片商 `label_maker.source` 同样(ADR-0073、ADR-0075),查创作者身份后继写的身份断言 `entity_classification.source` 也是批次号(ADR-0098)。+种子中文规范名按 `entity.metadata_json.name_preference` 的来源和原名快照还原,作品署名同步恢复;后续人工选择保留(ADR-0122)。判据错了一批,就按它们认出来一起撤掉,不必一条条找。复核队列的自动否决记在 `review_decision.note` 里(`auto_rejected` 与 `rule`,ADR-0079),@@ -61,7 +62,7 @@ from pathlib import Pathsys.path.insert(0, str(Path(__file__).resolve().parents[1] / "src"))from peach import (company_profiles, fc2_sellers, follow_creators, jav_poster_crop, # noqa: E402- record_rehome, sample_images, wants, western_artwork)+ record_rehome, sample_images, seed_pack, wants, western_artwork)from peach.config import COVER_DIR, GENERATED_DIR # noqa: E402from peach.metadata_auto_apply import UNION_TAGS_SOURCE # noqa: E402from peach.scripting import add_ledger_write_args, open_for_write, verify_after_write # noqa: E402@@ -312,6 +313,7 @@ def main(argv: list[str] | None = None) -> int:try:links = planned_links(connection, args.source, args.batch)aliases = planned_aliases(connection, args.source, args.batch)+ names = seed_pack.planned_names(connection, args.source, args.batch)profiles = planned_profiles(connection, args.source, args.batch)claims = planned_claims(connection, args.source, args.batch)companies = company_profiles.planned_revert(connection, args.source, args.batch)@@ -332,6 +334,8 @@ def main(argv: list[str] | None = None) -> int:print(f" - 链接 {link['entity'][:20]:<20} {link['url'][:56]} {link['batch']}")for alias in aliases:print(f" - 别名 {alias['entity'][:20]:<20} {alias['alias'][:40]} {alias['source']}")+ for name in names:+ print(f" - 中文名 {name['entity']} → {name['previous_name']} {name['source']}")print_profiles(profiles, companies)for creator in creators:print(f" - 建档 {creator['name'][:20]:<20} {creator['sources']} 个来源 {creator['batch']}")@@ -357,11 +361,12 @@ def main(argv: list[str] | None = None) -> int:"公司资料": len(companies), "卖家": len(sellers), "关注建档": len(creators), "编号": len(refs),"归属": len(memberships), "片商": len(makers), "标识文件": len(files), "封面": len(covers),"样张": sum(sample["count"] for sample in samples), "否决": len(rejections),- "标签": len(tags), "接回": len(rehomes), "想要入库": len(acquired)})+ "标签": len(tags), "接回": len(rehomes), "想要入库": len(acquired), "中文名": len(names)})if not args.apply:print("dry-run;确认无误后加 --apply --backup <路径>")return 0with connection:+ restored_names = seed_pack.revert_names(connection, names)company_profiles.revert(connection, companies)connection.executemany("DELETE FROM entity_link WHERE id=?",[(link["id"],) for link in links])@@ -411,7 +416,7 @@ def main(argv: list[str] | None = None) -> int:"删除标签": len(tags), "删除扁平标签": removed_tag_rows, "重开决定": reopened,"撤回接回": restored, "想要回到待找": reopened_wants, "卖家关系": removed_seller_relations,"解绑关注来源": creator_revert["unbound"], "删除建档实体": creator_revert["removed"], "删除文件": removed,- "integrity_check": integrity, "foreign_key_check": orphans})+ "还原中文名": restored_names, "integrity_check": integrity, "foreign_key_check": orphans})return 0diff --git a/src/peach/avatar_followup.py b/src/peach/avatar_followup.pyindex 997df027d..77d27af70 100644--- a/src/peach/avatar_followup.py+++ b/src/peach/avatar_followup.py@@ -40,7 +40,7 @@ from collections.abc import Callablefrom dataclasses import dataclass, fieldfrom pathlib import Path-from . import avatar_cover_face, avatar_picker, face_match+from . import avatar_cover_face, avatar_picker, face_match, gfriendsfrom .avatar_provider import (MIN_LONG_SIDE, MIN_SHORT_SIDE, AvatarCandidateCache, InspectedAvatar, acceptable_avatar,)@@ -209,11 +209,11 @@ _OFFSITE_COUNT = ("(SELECT count(*) FROM entity_external_ref x WHERE x.entity_idMATCH_RULE = 9-def _fingerprint(works, aliases, offsite) -> str:- return f"{int(works or 0)}:{int(aliases or 0)}:{int(offsite or 0)}:r{MATCH_RULE}"+def _fingerprint(works, aliases, offsite, gallery: str = "") -> str:+ return f"{int(works or 0)}:{int(aliases or 0)}:{int(offsite or 0)}:r{MATCH_RULE}" + (f":g{gallery}" if gallery else "")-def fingerprint(connection: sqlite3.Connection, entity_id: int) -> str:+def fingerprint(connection: sqlite3.Connection, entity_id: int, providers_root=None) -> str:"""会让这条后继结论变的量,写成 `作品数:别名数:avwikidb 编号数:r版本`。多一部作品就多一张封面可截、可比;多一个别名就多一个名字去图库里找(`神山ももか`@@ -223,7 +223,8 @@ def fingerprint(connection: sqlite3.Connection, entity_id: int) -> str:row = connection.execute(f"SELECT {_WORK_COUNT}, {_ALIAS_COUNT}, {_OFFSITE_COUNT} FROM entity e WHERE e.id=?",(int(entity_id),)).fetchone()- return _fingerprint(*(row if row else (0, 0, 0)))+ gallery = gfriends.index_revision(Path(providers_root) / avatar_picker.GFRIENDS_CACHE) if providers_root is not None else ""+ return _fingerprint(*(row if row else (0, 0, 0)), gallery)def stock(connection: sqlite3.Connection, avatar_root, attempts, *, limit: int,@@ -236,6 +237,9 @@ def stock(connection: sqlite3.Connection, avatar_root, attempts, *, limit: int,return []skip = set(skip)found = []+ index_dir = attempts.root.parent / "performer-avatars" / avatar_picker.GFRIENDS_CACHE+ gallery = gfriends.index_revision(index_dir)+ refresh_needed = gfriends.index_stale(index_dir)for row in connection.execute(f"SELECT e.id,e.kind,e.canonical_name,{_WORK_COUNT} AS assets,"f" {_ALIAS_COUNT} AS aliases, {_OFFSITE_COUNT} AS offsite"@@ -244,13 +248,16 @@ def stock(connection: sqlite3.Connection, avatar_root, attempts, *, limit: int," ORDER BY assets DESC, e.id"):entity_id, kind = int(row["id"]), str(row["kind"])key = followup_key(kind, entity_id)- current = _fingerprint(row["assets"], row["aliases"], row["offsite"])+ current = _fingerprint(row["assets"], row["aliases"], row["offsite"], gallery if kind == "performer" else "")+ refresh = kind == "performer" and refresh_neededif (key in skip or not needs_avatar(avatar_root, kind, entity_id)- or attempts.settled(key, current)):+ or (attempts.settled(key, current) and not refresh)):continuename = str(row["canonical_name"] or "")found.append(Followup(key=key, task_key=TASK_KEY,label=f"{TASK_LABEL}:{name}" if name else TASK_LABEL))+ if kind == "performer":+ refresh_needed = Falseif len(found) >= limit:breakreturn found@@ -264,12 +271,18 @@ def run(contract, key: str, handle) -> dict:依据的那一次(`NO_IDENTITY`)同样不记。"""summary = _run(contract, key, handle)+ _kind, entity_id = parse_key(key)+ refresher = getattr(contract, "gfriends_index", None)+ if (_kind == "performer" and refresher is not None and refresher.error+ and gfriends.index_age(refresher.cache_dir) is None):+ summary["source_unavailable"] = True+ summary["outcome"] = "图库索引未取得;" + summary["outcome"]if (summary.get("face_match_unavailable") or summary.get("source_unavailable")or summary.get("outcome") == NO_IDENTITY):return summary- _kind, entity_id = parse_key(key)with contract.database.read_connection() as connection:- current = fingerprint(connection, entity_id)+ providers_root = contract.candidate_root / "provider-cache" / "performer-avatars"+ current = fingerprint(connection, entity_id, providers_root if _kind == "performer" else None)Attempts(attempts_root(contract.candidate_root)).record(key, current, str(summary.get("outcome", "")))return summary@@ -303,7 +316,8 @@ def _run(contract, key: str, handle) -> dict:handle.progress(label=f"{TASK_LABEL}:{name}", throttle=0)return _install_account_face(contract, connection, providers_root, avatar_root,entity_id, name, cropped_px)- # 图库索引只读本地缓存,这一步不联网;联网只发生在要量、要比、要装那几张的时候。+ avatar_picker.index_refresher(contract).ensure()+ # 自动任务等待索引准备完成,再按本地缓存列候选。listing = avatar_picker.choices(connection, providers_root, avatar_root,kind, entity_id, deduplicate=False)found = [choice for choice in listing["choices"]diff --git a/src/peach/avatar_picker.py b/src/peach/avatar_picker.pyindex 8402d860a..b4d16f12b 100644--- a/src/peach/avatar_picker.py+++ b/src/peach/avatar_picker.py@@ -104,7 +104,7 @@ class IndexRefresher:"""图库索引缺失或过期时,在后台补一份。`request` 只排一轮、立刻返回,页面照旧读本地缓存(`gfriends.load_index`);- 取到的索引下次打开头像框时生效。同一时刻最多一轮在跑。`transport` 每轮新建、+ 页面按刷新状态读取新候选。同一时刻最多一轮在跑。`transport` 每轮新建、用完关掉:一天取一次,用不着常驻连接池。"""@@ -114,6 +114,23 @@ class IndexRefresher:self._lock = threading.Lock()self._thread: threading.Thread | None = Noneself._failed_at: float | None = None+ self._fetch_lock = threading.Lock()+ self.error = ""++ @property+ def refreshing(self) -> bool:+ return self._thread is not None and self._thread.is_alive()++ def ensure(self) -> bool:+ """自动任务等待索引就绪;与页面共用单次下载和失败退避。"""+ with self._fetch_lock:+ if not gfriends.index_stale(self.cache_dir):+ return True+ with self._lock:+ if (self._failed_at is not None+ and time.monotonic() - self._failed_at < INDEX_RETRY_SECONDS):+ return False+ return self.refresh()def request(self) -> bool:"""需要的话在后台排一轮,返回是否排上了。"""@@ -125,7 +142,7 @@ class IndexRefresher:if (self._failed_at is not Noneand time.monotonic() - self._failed_at < INDEX_RETRY_SECONDS):return False- self._thread = threading.Thread(target=self.refresh, daemon=True,+ self._thread = threading.Thread(target=self.ensure, daemon=True,name="PeachGfriendsIndex")self._thread.start()return True@@ -144,12 +161,30 @@ class IndexRefresher:LOGGER.warning("图库索引未取得:%s", error)with self._lock:self._failed_at = time.monotonic()+ self.error = str(error)return Falsewith self._lock:self._failed_at = None+ self.error = ""return True+_INDEX_LOCK = threading.Lock()+++def index_refresher(contract) -> IndexRefresher:+ """应用的自动头像任务与换头像接口共用同一份索引状态。"""+ with _INDEX_LOCK:+ refresher = getattr(contract, "gfriends_index", None)+ if refresher is None:+ from .scraping_access import SourceTransport+ refresher = IndexRefresher(+ contract.candidate_root / "provider-cache" / "performer-avatars" / GFRIENDS_CACHE,+ lambda: SourceTransport(contract.follow_secrets_root))+ contract.gfriends_index = refresher+ return refresher++@dataclass(frozen=True)class Choice:"""一个可选项。`ref` 是前端唯一回递的东西。"""diff --git a/src/peach/entities.py b/src/peach/entities.pyindex 246c16432..623e64471 100644--- a/src/peach/entities.py+++ b/src/peach/entities.py@@ -334,14 +334,25 @@ def rewrite_flat_projection(connection: Connection, kind: str, entity_id: int,return rewritten-def prefer_entity_name(connection: Connection, entity_id: int, chosen: str) -> dict:+def prefer_entity_name(connection: Connection, entity_id: int, chosen: str, *,+ source: str = "user:preferred-name") -> dict:"""把实体已有别名设为统一名称,并同步作品署名。"""- row = connection.execute("SELECT kind,canonical_name FROM entity WHERE id=?", (entity_id,)).fetchone()+ row = connection.execute("SELECT kind,canonical_name,metadata_json FROM entity WHERE id=?", (entity_id,)).fetchone()if row is None:raise ValueError("entity not found")kind, current = str(row["kind"]), str(row["canonical_name"])+ try:+ metadata = json.loads(row["metadata_json"] or "{}")+ except (TypeError, ValueError):+ metadata = {}+ if not isinstance(metadata, dict):+ metadata = {}chosen_key = normalize_entity_name(chosen)if chosen_key == normalize_entity_name(current):+ if source.startswith("user:"):+ metadata["name_preference"] = {"name": current, "source": source}+ connection.execute("UPDATE entity SET metadata_json=? WHERE id=?",+ (json.dumps(metadata, ensure_ascii=False), entity_id))return {"ok": True, "canonical_name": current, "changed": False}known = {normalize_entity_name(str(item[0])): str(item[0]) for item in connection.execute("SELECT alias FROM entity_alias WHERE entity_id=?", (entity_id,))}@@ -357,7 +368,13 @@ def prefer_entity_name(connection: Connection, entity_id: int, chosen: str) -> d(known[chosen_key], chosen_key, stamp, entity_id))connection.execute("INSERT OR IGNORE INTO entity_alias(entity_id,alias,normalized_alias,source,confidence) VALUES(?,?,?,?,1.0)",- (entity_id, current, normalize_entity_name(current), "user:preferred-name"))+ (entity_id, current, normalize_entity_name(current), source))+ previous_preference = metadata.get("name_preference")+ metadata["name_preference"] = {"name": known[chosen_key], "previous_name": current,+ "previous_preference": previous_preference,+ "source": source, "at": stamp}+ connection.execute("UPDATE entity SET metadata_json=? WHERE id=?",+ (json.dumps(metadata, ensure_ascii=False), entity_id))flat = rewrite_flat_projection(connection, kind, entity_id, current, known[chosen_key])return {"ok": True, "canonical_name": known[chosen_key], "changed": True,"previous_name": current, "flat_rewritten": flat}diff --git a/src/peach/gfriends.py b/src/peach/gfriends.pyindex cfc9f7a0a..317f0834f 100644--- a/src/peach/gfriends.py+++ b/src/peach/gfriends.py@@ -14,6 +14,7 @@ Minnano、FANZA 这些大型数据库,收录量上万但原图常常只有两"""from __future__ import annotations+import hashlibimport jsonimport reimport time@@ -96,6 +97,16 @@ def index_stale(cache_dir: Path) -> bool:return age is None or age > INDEX_MAX_AGE_SECONDS+def index_revision(cache_dir: Path | None) -> str:+ """索引内容指纹;相同内容的保鲜刷新不触发整批头像重派。"""+ if cache_dir is None:+ return "missing"+ try:+ return hashlib.sha256((cache_dir / INDEX_NAME).read_bytes()).hexdigest()[:16]+ except OSError:+ return "missing"++def load_index(cache_dir: Path) -> dict[str, list[tuple[str, str]]]:"""只读本地缓存的索引。取不到或坏了都返回空。diff --git a/src/peach/library_processing.py b/src/peach/library_processing.pyindex 0861f924c..0884b793d 100644--- a/src/peach/library_processing.py+++ b/src/peach/library_processing.py@@ -1614,6 +1614,14 @@ def _enrich_finished_performers(database, groups, config, candidate_root, remoteif database is None or not active():return emptyfrom .metadata_performer_profiles import enrich_performer_profiles+ from .jav_cover_fetch import HostLimitedTransport+ from .scraping_access import SourceTransport++ def profile_transport():+ return HostLimitedTransport(+ SourceTransport(config.directory('secrets'), max_requests=MAX_SOURCE_REQUESTS,+ max_bytes=MAX_SOURCE_BYTES, max_seconds=MAX_SOURCE_SECONDS),+ 2.0, limiter=SOURCE_LIMITER)# 问题清单要的是这条资产的 id 和路径,候选行上都有。rows = {int(group['asset_id']): {'id': int(group['asset_id']),'path': group.get('asset_path') or ''}@@ -1621,7 +1629,7 @@ def _enrich_finished_performers(database, groups, config, candidate_root, remotereturn enrich_performer_profiles(database, groups.values(), config.directory('generated') / 'avatars',candidate_root / 'provider-cache' / 'performer-avatars',- transport_factory=lambda: getattr(remote.provider(), 'transport', None),+ transport_factory=profile_transport,active=active, progress=update,# 头像取不到是可重试的:下一次「重试失败项」会连着这条资产一起再来一遍。issue=lambda asset_id, message: issue(rows.get(asset_id), message,diff --git a/src/peach/metadata_performer_profiles.py b/src/peach/metadata_performer_profiles.pyindex fb85cc670..60ad79e35 100644--- a/src/peach/metadata_performer_profiles.py+++ b/src/peach/metadata_performer_profiles.py@@ -15,6 +15,7 @@ from . import avatar_pickerfrom .entities import canonicalize_entity_name, normalize_entity_name, resolve_entityfrom .http import HttpxTransportfrom .library_processing import describe_failure+from .scraping_access import SourcePausedLOGGER = logging.getLogger(__name__)@@ -178,8 +179,7 @@ def enrich_performer_profiles(database, groups, avatar_root: Path,if not tasks:return resulttransport = transport_factory() if transport_factory else None- owns_transport = not callable(transport)- if owns_transport:+ if not callable(transport):transport = HttpxTransport()try:for done, (entity_id, profile) in enumerate(tasks.items()):@@ -204,10 +204,13 @@ def enrich_performer_profiles(database, groups, avatar_root: Path,LOGGER.warning("performer avatar failed: entity=%s url=%s: %s",entity_id, profile["avatar_url"], reason, exc_info=True)issue(profile["asset_id"], f'{profile["name"]} 的头像未取得:{reason}')+ if isinstance(error, SourcePaused) or isinstance(error.__cause__, SourcePaused):+ break# 每张之后上报一次:这一段每张都要联网,不报进度就会被判成「长时间没有进展」。progress(stage=PROFILE_STAGE, performer_avatars=result["avatars"],performer_profile_failed=result["failed"])finally:- if owns_transport:- transport.close()+ close = getattr(transport, "close", None)+ if callable(close):+ close()return resultdiff --git a/src/peach/routes_media.py b/src/peach/routes_media.pyindex d311324d2..acf0efe42 100644--- a/src/peach/routes_media.py+++ b/src/peach/routes_media.py@@ -1403,12 +1403,7 @@ def _index_refresher(app) -> avatar_picker.IndexRefresher:if refresher is None:contract = app.state.web_contract- def transport():- from .scraping_access import SourceTransport- return SourceTransport(contract.follow_secrets_root)-- refresher = avatar_picker.IndexRefresher(- _picker_roots(contract)[0] / avatar_picker.GFRIENDS_CACHE, transport)+ refresher = avatar_picker.index_refresher(contract)app.state.gfriends_index = refresherreturn refresher@@ -1504,7 +1499,7 @@ def avatar_choices(request: Request, kind: str = "performer", id: int = 0,args: dict[str, str] = Depends(require_auth)):"""这个人还能换成哪些图。只读本地缓存,不等联网。- 图库索引缺失或过期时顺手在后台排一轮刷新;这一次照旧按旧缓存列,下次打开生效。+ 图库索引缺失或过期时在后台刷新,返回刷新状态供当前窗口读取新候选。"""state = request.app.state.web_contractproviders_root, avatar_root = _picker_roots(state)@@ -1516,7 +1511,11 @@ def avatar_choices(request: Request, kind: str = "performer", id: int = 0,if kind == "creator":listing["choices"] += [choice.as_dict() for choice in avatar_online.choices(connection, id, project=_picker_online_projection)]- _index_refresher(request.app).request()+ refresher = _index_refresher(request.app)+ queued = refresher.request()+ listing["index_refreshing"] = bool(queued or refresher.refreshing or (+ listing["index_stale"] and not avatar_picker.gfriends.index_stale(refresher.cache_dir)))+ listing["index_error"] = refresher.errorreturn JSONResponse(listing)diff --git a/src/peach/seed_followup.py b/src/peach/seed_followup.pyindex b00a1a080..ddd57107d 100644--- a/src/peach/seed_followup.py+++ b/src/peach/seed_followup.py@@ -11,6 +11,7 @@from __future__ import annotationsimport sqlite3+import timefrom pathlib import Pathfrom . import seed_pack, seed_corrections, seed_validation@@ -22,11 +23,11 @@ REVIEW_FILE = "seed-landing.csv"FIELDS = ("kind", "entity", "field", "ours", "source", "theirs", "detail", "batch", "withdrawal_id", "evidence")#: 活动页摘要里的计数键与它们的中文名,按这个顺序拼结论。SUMMARY_LABELS = (("aliases", "别名"), ("refs", "编号"), ("links", "链接"), ("profiles", "资料"),- ("memberships", "归属"), ("makers", "片商"), ("refreshed", "换新"), ("withdrawn", "撤销"))+ ("memberships", "归属"), ("makers", "片商"), ("refreshed", "换新"), ("withdrawn", "撤销"), ("names", "中文名"))def followup_key(version: str, content_hash: str = "") -> str:- return f"{TASK_KEY}:{version}" + (f":{content_hash}" if content_hash else "")+ return f"{TASK_KEY}:{version}" + (f":{content_hash}:names1" if content_hash else "")def pack_version(path: Path | None = None) -> str | None:@@ -106,6 +107,13 @@ def run(contract, key: str, handle) -> dict:raise ValueError("种子内容与排队任务的摘要不一致,请重新派发")if handle is not None:handle.progress(label=f"{TASK_LABEL}:{pack['version']}", throttle=0)+ with contract.database.read_connection() as connection:+ rename = bool(seed_pack.plan(connection, pack).get("names"))+ if rename:+ from .migrations import sqlite_backup+ db_path = Path(contract.database.db_path)+ backup = db_path.with_name(f"ledger.pre-seed-names-{time.time_ns()}.db")+ sqlite_backup(db_path, backup)with contract.database.write_transaction() as connection:report = seed_pack.land(connection, pack)if seed_pack.written(report):diff --git a/src/peach/seed_pack.py b/src/peach/seed_pack.pyindex cee61709a..45eda0c93 100644--- a/src/peach/seed_pack.py+++ b/src/peach/seed_pack.py@@ -16,13 +16,14 @@from __future__ import annotationsimport json+import reimport sqlite3from datetime import datetime, timezonefrom urllib.parse import urlsplitfrom . import link_statusfrom . import seed_corrections, seed_validation-from .entities import _ref_is_free, normalize_entity_name+from .entities import _ref_is_free, normalize_entity_name, prefer_entity_name, rewrite_flat_projectionfrom .minnano_av import PROFILE_COLUMNSfrom .performer_profiles import read_profile, write_profilefrom .config import PROJECT_ROOT@@ -401,6 +402,8 @@ def _land_pointer(connection, entity_id: int, item: dict, field: str, batch: strdef _land_one(connection, entity_id: int, item: dict, version: str, batch: str, stamp: str, report: dict, *, revision: bool = False) -> None:report["aliases"] += _land_aliases(connection, entity_id, item, version, batch, report)+ if _land_name(connection, entity_id, item, batch):+ report["names"] = report.get("names", 0) + 1report["refs"] += _land_refs(connection, entity_id, item, batch, stamp)report["links"] += _land_links(connection, entity_id, item, batch, stamp)_land_profile(connection, entity_id, item, batch, report, revision=revision)@@ -408,9 +411,81 @@ def _land_one(connection, entity_id: int, item: dict, version: str, batch: str,_land_pointer(connection, entity_id, item, field, batch, stamp, report)+def _land_name(connection, entity_id: int, item: dict, batch: str) -> bool:+ """唯一匹配人物的中文规范名;保留人工选择、非登记写法与身份冲突。"""+ target = str(item["name"])+ if item["kind"] != "performer" or not re.fullmatch(r"[一-鿿·]+", target):+ return False+ row = connection.execute("SELECT canonical_name,metadata_json FROM entity WHERE id=?", (entity_id,)).fetchone()+ current = str(row[0])+ if current == target:+ return False+ try:+ metadata = json.loads(row[1] or "{}")+ except (TypeError, ValueError):+ return False+ if not isinstance(metadata, dict):+ return False+ preference = metadata.get("name_preference") or {}+ if not isinstance(preference, dict) or str(preference.get("source", "")).startswith(("user:", "review:")):+ return False+ manual = connection.execute("SELECT 1 FROM entity_alias WHERE entity_id=? AND source='user:preferred-name' LIMIT 1", (entity_id,)).fetchone()+ names = {normalize_entity_name(a["alias"]) for a in item.get("aliases", [])+ if float(a.get("confidence", 1.0)) >= 0.9}+ if manual or normalize_entity_name(current) not in names:+ return False+ known = connection.execute("SELECT 1 FROM entity_alias WHERE entity_id=? AND normalized_alias=?", (entity_id, normalize_entity_name(target))).fetchone()+ taken = connection.execute("SELECT 1 FROM entity WHERE kind='performer' AND normalized_name=? AND id<>? UNION SELECT 1 FROM entity_alias a JOIN entity e ON e.id=a.entity_id WHERE e.kind='performer' AND a.normalized_alias=? AND e.id<>?", (normalize_entity_name(target), entity_id, normalize_entity_name(target), entity_id)).fetchone()+ if not known or taken:+ return False+ return prefer_entity_name(connection, entity_id, target, source=batch)["changed"]++def written(report: dict) -> int:"""这次导入动了多少行:补上的加换掉的。"""- return sum(int(report.get(key, 0)) for key in (*COUNT_KEYS[1:], "refreshed", "withdrawn"))+ return sum(int(report.get(key, 0)) for key in (*COUNT_KEYS[1:], "refreshed", "withdrawn", "names"))+++def planned_names(connection, source: str, batch: str = "") -> list[dict]:+ """当前仍归指定种子批次拥有、且有原名快照的规范名。"""+ if source != SOURCE:+ return []+ found = []+ for entity_id, name, raw in connection.execute(+ "SELECT id,canonical_name,metadata_json FROM entity WHERE kind='performer'"):+ try:+ metadata = json.loads(raw or "{}")+ except (TypeError, ValueError):+ continue+ record = metadata.get("name_preference") if isinstance(metadata, dict) else None+ if (isinstance(record, dict) and _ours(record.get("source"))+ and (not batch or record["source"] == batch)+ and record.get("name") == name and record.get("previous_name")):+ found.append({"entity_id": entity_id, "entity": name, **record})+ return found+++def revert_names(connection, names: list[dict]) -> int:+ """按原名快照还原规范名和作品署名,保留后续人工选择。"""+ changed = 0+ for item in names:+ entity_id, previous = item["entity_id"], item["previous_name"]+ row = connection.execute("SELECT canonical_name,metadata_json FROM entity WHERE id=?", (entity_id,)).fetchone()+ metadata = json.loads(row[1] or "{}") if row else {}+ if not row or metadata.get("name_preference", {}) != {k: v for k, v in item.items() if k not in {"entity_id", "entity"}}:+ continue+ taken = connection.execute("SELECT 1 FROM entity WHERE kind='performer' AND normalized_name=? AND id<>?", (normalize_entity_name(previous), entity_id)).fetchone()+ if taken:+ raise ValueError("原规范名已被其他实体占用,未撤回中文名")+ if item.get("previous_preference") is None:+ metadata.pop("name_preference", None)+ else:+ metadata["name_preference"] = item["previous_preference"]+ connection.execute("UPDATE entity SET canonical_name=?,normalized_name=?,metadata_json=?,updated_at=? WHERE id=?",+ (previous, normalize_entity_name(previous), json.dumps(metadata, ensure_ascii=False), _now(), entity_id))+ rewrite_flat_projection(connection, "performer", entity_id, row[0], previous)+ changed += 1+ return changeddef land(connection: sqlite3.Connection, pack: dict) -> dict:@@ -441,7 +516,9 @@ def _land_pack(connection: sqlite3.Connection, pack: dict) -> dict:report.update(withdrawn=0, withdrawal_conflicts=[])seed_corrections.withdraw(connection, pack, report)for item in pack.get("entities") or []:- found = matches(connection, item["identity"] if revision else item)+ found = matches(connection, item)+ if revision:+ found |= matches(connection, item["identity"])if len(found) > 1:report["duplicates"].append({"kind": item["kind"], "name": item["name"],"entities": sorted(_name(connection, entity_id) for entity_id in found)})@@ -457,6 +534,7 @@ def _land_pack(connection: sqlite3.Connection, pack: dict) -> dict:def plan(connection: sqlite3.Connection, pack: dict) -> dict:"""dry-run:在只读账本的内存副本上跑一遍 `land`,交出同样的报告,本机账本一字不动。"""scratch = sqlite3.connect(":memory:")+ scratch.row_factory = sqlite3.Rowtry:connection.backup(scratch)scratch.execute("PRAGMA foreign_keys=ON")diff --git a/tests/test_avatar_picker.py b/tests/test_avatar_picker.pyindex 4cb277d26..291f0ba7a 100644--- a/tests/test_avatar_picker.py+++ b/tests/test_avatar_picker.py@@ -179,6 +179,21 @@ class IndexRefreshTests(unittest.TestCase):self.assertIn("葵つかさ", gfriends.load_index(self.cache))self.assertFalse(gfriends.index_stale(self.cache))+ def test_an_automatic_consumer_prepares_the_index_once(self):+ refresher = self.refresher()+ self.assertTrue(refresher.ensure())+ self.assertIn("葵つかさ", gfriends.load_index(self.cache))+ self.assertTrue(refresher.ensure())+ self.assertEqual(self.calls, [gfriends.INDEX_URL])++ def test_an_automatic_consumer_honours_the_failure_retry_window(self):+ self.reply = lambda: HttpResponse(503, {}, b"", gfriends.INDEX_URL)+ refresher = self.refresher()+ with self.assertLogs(avatar_picker.LOGGER, "WARNING"):+ self.assertFalse(refresher.ensure())+ self.assertFalse(refresher.ensure())+ self.assertEqual(self.calls, [gfriends.INDEX_URL])+def test_a_stale_index_is_replaced(self):self.seed_old(gfriends.INDEX_MAX_AGE_SECONDS + 3600)self.assertTrue(self.run_queued(self.refresher()))diff --git a/tests/test_feeds_web.py b/tests/test_feeds_web.pyindex ee82bac50..0bc72002d 100644--- a/tests/test_feeds_web.py+++ b/tests/test_feeds_web.py@@ -841,7 +841,7 @@ class FeedWebTest(FeedWebFixture):["feed-cover:HMN-071"])def test_every_check_carries_performers_still_missing_an_avatar(self):- """资料处理不跑的日子,缺头像的存量女优跟着定时拉取补(ADR-0097)。试过的不再带。"""+ """缺头像的存量女优跟着定时拉取补;当前图库下已取证的跳过,图库变化后重新派发。"""from peach import avatar_followupfrom peach.followups import Attempts, attempts_root@@ -857,11 +857,18 @@ class FeedWebTest(FeedWebFixture):"INSERT INTO asset_entity(asset_id,entity_id,role,source)"" VALUES(9001,?,'performer','test')", (entity_id,))key = avatar_followup.followup_key("performer", entity_id)+ providers_root = self.contract.candidate_root / "provider-cache" / "performer-avatars"+ index_dir = providers_root / "gfriends"+ index_dir.mkdir(parents=True, exist_ok=True)+ index_path = index_dir / "gfriends-filetree.json"+ index_path.write_text('{"Content": {}}', encoding="utf-8")self.assertIn(key, [item["key"] for item in self._check(automatic=True)["followups"]])with self.contract.database.read_connection() as connection:- current = avatar_followup.fingerprint(connection, entity_id)+ current = avatar_followup.fingerprint(connection, entity_id, providers_root)Attempts(attempts_root(self.contract.candidate_root)).record(key, current, "图库 6 张认不准")self.assertNotIn(key, [item["key"] for item in self._check(automatic=True)["followups"]])+ index_path.write_text(json.dumps({"Content": {"1-S1": {"二の宮すずか.jpg": "二の宮すずか.jpg"}}}), encoding="utf-8")+ self.assertIn(key, [item["key"] for item in self._check(automatic=True)["followups"]])def test_an_unknown_action_is_refused(self):with self.assertRaises(ValueError):diff --git a/tests/test_followups.py b/tests/test_followups.pyindex e95eeecb3..afcb2a33b 100644--- a/tests/test_followups.py+++ b/tests/test_followups.py@@ -432,6 +432,10 @@ class CoverFaceFollowupTests(LedgerTestCase):self.covers = self.root / "covers"self.covers.mkdir()self.person = self.entity("performer", "梨奈")+ self.providers = self.root / "generated" / "provider-cache" / "performer-avatars"+ index_dir = self.providers / "gfriends"+ index_dir.mkdir(parents=True)+ (index_dir / "gfriends-filetree.json").write_text('{"Content": {}}', encoding="utf-8")faces = self.FACESclass Probe:@@ -637,6 +641,9 @@ class FaceStubCase(LedgerTestCase):self.covers.mkdir()self.person = self.entity("performer", "梨奈")self.providers = self.root / "generated" / "provider-cache" / "performer-avatars"+ index_dir = self.providers / "gfriends"+ index_dir.mkdir(parents=True)+ (index_dir / "gfriends-filetree.json").write_text('{"Content": {}}', encoding="utf-8")self.gallery: dict[str, dict[str, str]] = {}self.unavailable = ""vectors, test = self.VECTORS, self@@ -750,6 +757,74 @@ class FaceMatchFollowupTests(FaceStubCase):self.assertTrue(all(cover["score"] >= 0.363 for cover in match["covers"]))self.assertEqual((match["candidates"], match["compared"]), (3, 2))+ def test_a_changed_gallery_requeues_an_unresolved_person(self):+ from peach.avatar_followup import stock+ from peach.followups import Attempts, attempts_root++ self.work(1, "IPX-001", self.BLANK)+ self.run_followup()+ attempts = Attempts(attempts_root(self.root / "generated"))+ with self.database.read_connection() as connection:+ self.assertEqual(stock(connection, self.avatars, attempts, limit=10), [])+ self.candidate("1-S1", (400, 600), self.HER)+ with self.database.read_connection() as connection:+ planned = stock(connection, self.avatars, attempts, limit=10)+ self.assertEqual([item.key for item in planned], [followup_key("performer", self.person)])++ def test_an_expired_gallery_can_refresh_when_unresolved_people_are_settled(self):+ import os+ from peach import gfriends+ from peach.avatar_followup import stock+ from peach.followups import Attempts, attempts_root++ self.work(1, "IPX-001", self.BLANK)+ self.run_followup()+ index_path = self.providers / "gfriends" / gfriends.INDEX_NAME+ stamp = time.time() - gfriends.INDEX_MAX_AGE_SECONDS - 1+ os.utime(index_path, (stamp, stamp))+ attempts = Attempts(attempts_root(self.root / "generated"))+ with self.database.read_connection() as connection:+ found = stock(connection, self.avatars, attempts, limit=10)+ self.assertEqual([item.key for item in found], [followup_key("performer", self.person)])++ def test_a_missing_gallery_is_prepared_before_candidate_selection(self):+ from peach import avatar_picker, gfriends+ from peach.http import HttpResponse++ self.candidate("1-S1", (400, 600), self.HER)+ index_path = self.providers / "gfriends" / gfriends.INDEX_NAME+ body = index_path.read_bytes()+ index_path.unlink()+ requests = []++ def send(request, *_args):+ requests.append(request.url)+ return HttpResponse(200, {}, body, request.url)++ contract = self.contract()+ contract.gfriends_index = avatar_picker.IndexRefresher(index_path.parent, lambda: send)+ from peach.avatar_followup import run+ summary = run(contract, followup_key("performer", self.person), mock.Mock())+ self.assertEqual(summary["outcome"], "已装上")+ self.assertEqual(self.provenance()["provider"], "gfriends")+ self.assertEqual(requests, [gfriends.INDEX_URL])++ def test_a_failed_gallery_fetch_does_not_settle_an_absent_index(self):+ from peach import avatar_picker, gfriends+ from peach.followups import attempts_root+ from peach.http import HttpResponse+ from peach.avatar_followup import run++ index_path = self.providers / "gfriends" / gfriends.INDEX_NAME+ index_path.unlink()+ self.work(1, "IPX-001", self.BLANK)+ contract = self.contract()+ contract.gfriends_index = avatar_picker.IndexRefresher(index_path.parent, lambda: lambda request, *_: HttpResponse(503, {}, b"", request.url))+ with self.assertLogs(avatar_picker.LOGGER, "WARNING"):+ summary = run(contract, followup_key("performer", self.person), mock.Mock())+ self.assertTrue(summary["source_unavailable"])+ self.assertFalse(any(attempts_root(contract.candidate_root).glob("*.json")))+def test_only_her_pictures_are_eligible_when_someone_else_shares_the_name(self):"""同名的另一个人那张更大、排得更前,照样落选;检不出脸的那张不算她。"""self.candidate("0-Hand-Storage", (900, 1200), self.OTHER)@@ -1459,6 +1534,9 @@ class ProcessLibraryTests(LedgerTestCase):avatar_root=self.root / 'generated' / 'avatars',candidate_root=self.root / 'generated', cover_root=self.root / 'covers',cache_bust=lambda: None)+ index_dir = contract.candidate_root / 'provider-cache' / 'performer-avatars' / 'gfriends'+ index_dir.mkdir(parents=True, exist_ok=True)+ (index_dir / 'gfriends-filetree.json').write_text('{"Content": {}}', encoding='utf-8')offline = {performer_alias_followup.MINNANO: Offline(),performer_alias_followup.AV_NEME: Offline()}profile_offline = {performer_profile_followup.MINNANO: Offline(),diff --git a/tests/test_metadata_library.py b/tests/test_metadata_library.pyindex 9bb8b6748..015d97178 100644--- a/tests/test_metadata_library.py+++ b/tests/test_metadata_library.py@@ -749,7 +749,6 @@ class LibraryNfoTests(unittest.TestCase):locations={'local': (str(media),)})transport = Mock()provider = stub_provider()- provider.transport = transportprovider.query.return_value = {'id': 'ABW-358'}# 采集跑完、收尾还没开始的那一刻按下停止。alive = {'value': True}@@ -836,7 +835,8 @@ class LibraryNfoTests(unittest.TestCase):}provider.cover.return_value = False- with patch('peach.avatar_provider.FaceProbe') as face, \+ with patch('peach.scraping_access.SourceTransport', return_value=transport), \+ patch('peach.avatar_provider.FaceProbe') as face, \patch('peach.library_processing._generate_previews', return_value=0):face.return_value.return_value = Noneresult = process_library(diff --git a/tests/test_metadata_performer_profiles.py b/tests/test_metadata_performer_profiles.pyindex c20a66ea7..6a16e6985 100644--- a/tests/test_metadata_performer_profiles.py+++ b/tests/test_metadata_performer_profiles.py@@ -78,6 +78,38 @@ class ImportedPerformerProfileTests(unittest.TestCase):self.assertTrue((self.root / "avatars" / "performer-7.img").is_file())transport.assert_called_once()+ def test_a_paused_transport_stops_the_avatar_phase(self):+ from peach.scraping_access import SourcePaused+ group = self.group()+ people = json.loads(group["candidates_json"])+ with self.database.write_transaction() as connection:+ connection.execute("INSERT INTO entity(id,kind,canonical_name,normalized_name,created_at,updated_at) VALUES(9,'performer','八乃つばさ','八乃つばさ','t','t')")+ connection.execute("INSERT INTO asset_entity(asset_id,entity_id,role,source) VALUES(1,9,'performer','test')")+ people[0]["value"].append({"name": "八乃つばさ", "external_id": "1041234", "profile_source": "r18dev", "thumb_url": "https://pics.dmm.co.jp/mono/actjpgs/hachino_tsubasa.jpg"})+ group["candidates_json"] = json.dumps(people, ensure_ascii=False)+ transport = Mock(side_effect=SourcePaused("本趟采集时间已用完,再跑一次接着采;已有图片保留"))+ with self.assertLogs("peach.metadata_performer_profiles", "WARNING"):+ result = enrich_performer_profiles(self.database, [group], self.root / "avatars", self.root / "providers", transport_factory=lambda: transport)+ self.assertEqual(result["failed"], 1)+ transport.assert_called_once()++ def test_profile_avatars_have_their_own_phase_budget(self):+ from types import SimpleNamespace+ from peach.library_processing import _enrich_finished_performers+ from peach.scraping_access import SourcePaused++ remote = Mock()+ remote.provider.return_value.transport.side_effect = SourcePaused("本趟采集时间已用完")+ transport = Mock(return_value=HttpResponse(200, {"content-type": "image/jpeg"}, picture(), self.group()["candidates_json"]))+ config = SimpleNamespace(directory=lambda key: self.root / key)+ groups = {"asset:1:performers": self.group()}+ with patch("peach.scraping_access.SourceTransport", return_value=transport), patch("peach.avatar_provider.FaceProbe") as face:+ face.return_value.return_value = None+ result = _enrich_finished_performers(self.database, groups, config, self.root / "providers", remote, lambda: True)+ self.assertEqual(result["avatars"], 1)+ remote.provider.return_value.transport.assert_not_called()+ transport.close.assert_called_once()+def test_refreshed_approval_selects_the_confirmed_profile_evidence(self):with self.database.write_transaction() as connection:connection.execute(diff --git a/tests/test_seed_followup.py b/tests/test_seed_followup.pyindex 12df07b7c..e7fa0370f 100644--- a/tests/test_seed_followup.py+++ b/tests/test_seed_followup.py@@ -95,6 +95,42 @@ class PlanTests(Case):class RunTests(Case):+ def chinese_pack(self):+ pack = {**PACK, "entities": [{"kind": "performer", "name": "天使萌",+ "aliases": [{"alias": "天使もえ", "source": "avdb-actor-mapping@test"}],+ "refs": [], "links": []}]}+ self.pack.write_text(seed_pack.dump(pack), encoding="utf-8")+ return seed_followup.followup_key(VERSION, seed_validation.digest(pack))++ def test_chinese_names_are_backed_up_and_reported(self):+ import json+ import sqlite3+ from contextlib import closing++ key = self.chinese_pack()+ person = self.add("performer", "天使もえ")+ summary = seed_followup.run(self.contract, key, None)+ backups = list(self.root.rglob("ledger.pre-seed-names-*.db"))+ self.assertEqual(len(backups), 1)+ with closing(sqlite3.connect(backups[0])) as connection:+ self.assertEqual(connection.execute("SELECT canonical_name FROM entity WHERE id=?", (person,)).fetchone()[0], "天使もえ")+ with self.database.read_connection() as connection:+ row = connection.execute("SELECT canonical_name,metadata_json FROM entity WHERE id=?", (person,)).fetchone()+ self.assertEqual(row[0], "天使萌")+ self.assertEqual(json.loads(row[1])["name_preference"]["previous_name"], "天使もえ")+ self.assertEqual(summary["names"], 1)+ self.assertIn("中文名 1", summary["outcome"])++ def test_failed_name_backup_leaves_the_ledger_unchanged(self):+ key = self.chinese_pack()+ person = self.add("performer", "天使もえ")+ with mock.patch("peach.migrations.sqlite_backup", side_effect=OSError("备份目录不可写")):+ with self.assertRaisesRegex(OSError, "备份目录不可写"):+ seed_followup.run(self.contract, key, None)+ with self.database.read_connection() as connection:+ self.assertEqual(connection.execute("SELECT canonical_name FROM entity WHERE id=?", (person,)).fetchone()[0], "天使もえ")+ self.assertEqual(connection.execute("SELECT count(*) FROM entity_alias").fetchone()[0], 0)+def test_queued_content_change_is_rejected_without_writing(self):self.add("performer", "天川そら")modified = seed_pack.load(self.pack)diff --git a/tests/test_seed_pack.py b/tests/test_seed_pack.pyindex c499e911e..457238cbc 100644--- a/tests/test_seed_pack.py+++ b/tests/test_seed_pack.py@@ -123,6 +123,77 @@ class SeedPackCase(unittest.TestCase):return seed_pack.export_pack(con, version=VERSION)+class SeedPerformerNameTests(SeedPackCase):+ def name_pack(self, *, revision=None):+ with self.source:+ person = entity(self.source, "performer", "天使萌")+ alias(self.source, person, "天使もえ", "avdb-actor-mapping@test")+ return seed_pack.export_pack(self.source, version=VERSION, revision=revision)++ def test_verified_chinese_name_updates_the_entity_and_work_projection(self):+ pack = self.name_pack()+ with self.target:+ person = entity(self.target, "performer", "天使もえ")+ self.target.execute("INSERT INTO asset(id,location,path,name,medium) VALUES(1,'local','R:\\a.mp4','a','video')")+ self.target.execute("INSERT INTO asset_entity(asset_id,entity_id,role,source) VALUES(1,?,'performer','test')", (person,))+ self.target.execute("INSERT INTO asset_tag(asset_id,tag,source) VALUES(1,'演员:天使もえ','test')")+ report = seed_pack.land(self.target, pack)+ self.assertEqual(self.target.execute("SELECT canonical_name FROM entity WHERE id=?", (person,)).fetchone()[0], "天使萌")+ self.assertEqual(self.target.execute("SELECT tag FROM asset_tag WHERE asset_id=1").fetchone()[0], "演员:天使萌")+ self.assertEqual(report["names"], 1)+ self.assertIn("天使もえ", {r[0] for r in self.target.execute("SELECT alias FROM entity_alias WHERE entity_id=?", (person,))})+ with self.target:+ self.assertEqual(seed_pack.written(seed_pack.land(self.target, pack)), 0)+ target_path = self.target.execute("PRAGMA database_list").fetchone()[2]+ revert = load_script("revert_auto_landing")+ with contextlib.redirect_stdout(io.StringIO()):+ self.assertEqual(revert.main(["--db", target_path, "--source", "auto:seed", "--apply",+ "--backup", str(self.root / "pre-revert.db"), "--logo-root", str(self.root / "logos")]), 0)+ self.assertEqual(self.target.execute("SELECT canonical_name FROM entity WHERE id=?", (person,)).fetchone()[0], "天使もえ")+ self.assertEqual(self.target.execute("SELECT tag FROM asset_tag WHERE asset_id=1").fetchone()[0], "演员:天使もえ")++ def test_a_user_preferred_name_is_preserved(self):+ from peach.entities import prefer_entity_name+ pack = self.name_pack()+ with self.target:+ person = entity(self.target, "performer", "天使萌")+ alias(self.target, person, "天使もえ", "user:manual")+ prefer_entity_name(self.target, person, "天使もえ")+ seed_pack.land(self.target, pack)+ self.assertEqual(self.target.execute("SELECT canonical_name FROM entity WHERE id=?", (person,)).fetchone()[0], "天使もえ")+ self.assertEqual(seed_pack.planned_names(self.target, "auto:seed"), [])++ def test_confirming_the_current_name_protects_it_from_localization(self):+ from peach.entities import prefer_entity_name+ pack = self.name_pack()+ with self.target:+ person = entity(self.target, "performer", "天使もえ")+ prefer_entity_name(self.target, person, "天使もえ")+ seed_pack.land(self.target, pack)+ self.assertEqual(self.target.execute("SELECT canonical_name FROM entity WHERE id=?", (person,)).fetchone()[0], "天使もえ")++ def test_revision_identity_and_aliases_must_resolve_to_one_person(self):+ pack = self.name_pack(revision=1)+ with self.target:+ person = entity(self.target, "performer", "天使もえ")+ report = seed_pack.land(self.target, pack)+ self.assertEqual(report["names"], 1)+ self.assertEqual(self.target.execute("SELECT canonical_name FROM entity WHERE id=?", (person,)).fetchone()[0], "天使萌")++ def test_custom_names_and_ambiguous_identities_are_preserved(self):+ pack = self.name_pack()+ with self.target:+ person = entity(self.target, "performer", "我选的名字")+ alias(self.target, person, "天使もえ", "user:manual")+ seed_pack.land(self.target, pack)+ self.assertEqual(self.target.execute("SELECT canonical_name FROM entity WHERE id=?", (person,)).fetchone()[0], "我选的名字")+ with self.target:+ entity(self.target, "performer", "天使萌")+ report = seed_pack.land(self.target, pack)+ self.assertEqual(len(report["duplicates"]), 1)+ self.assertEqual(report.get("names", 0), 0)++class ExportTests(SeedPackCase):def test_pack_carries_public_facts_and_nothing_local(self):pack = self.seeded_source()diff --git a/web/dist/peach-app.js b/web/dist/peach-app.jsindex 0a02b9d7f..c6dc2bb5d 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] = "e51ad429-7728-473f-ac70-484fe2795a25", e._sentryDebugIdIdentifier = "sentry-dbid-e51ad429-7728-473f-ac70-484fe2795a25");+ t && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[t] = "70fabfa5-c456-4fc8-9209-1b7de712c4a6", e._sentryDebugIdIdentifier = "sentry-dbid-70fabfa5-c456-4fc8-9209-1b7de712c4a6");} 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) => {@@ -61328,7 +61328,7 @@ function pSe(e, t) {}var mSe = (e) => e < 48 ? `${Math.max(1, Math.round(e))} 小时` : `${Math.floor(e / 24)} 天`;function hSe(e) {- return !e || !e.index_stale || e.choices.some((e) => e.source === "gfriends") ? "" : e.index_age_hours === null ? "图库索引还没取过,只能从用过的图里选。" : `图库索引 ${mSe(e.index_age_hours)}没更新,新收的人像这里还查不到。`;+ return e?.index_refreshing ? "正在更新图库索引,候选图片会自动显示。" : e?.index_error && e.index_stale ? "图库索引未取得:" + e.index_error : !e || !e.index_stale || e.choices.some((e) => e.source === "gfriends") ? "" : e.index_age_hours === null ? "图库索引还没取过,只能从用过的图里选。" : `图库索引 ${mSe(e.index_age_hours)}没更新,新收的人像这里还查不到。`;}var _Q = (e) => e.cast > 1, gSe = (e) => _Q(e) ? `${e.label}:${e.cast.toLocaleString()} 人合演,先找到她自己的脸,再拖动方框选一块。` : `${e.label}:拖动方框选一块,滚轮或角上那枚方块改大小。`, _Se = {gfriends: "图库",@@ -61396,7 +61396,9 @@ function wSe({ kind: e, entityId: t, name: n, onPicked: r, close: i }) {let a = (0, D.useRef)(null), o = sV(), [s, c] = (0, D.useState)(""), [l, u] = (0, D.useState)(""), [d, f] = (0, D.useState)(null), p = uQ(e, t), m = (0, D.useRef)(!1), h = Ct({queryKey: p,queryFn: ({ signal: n }) => oSe(e, t, n),- retryOnMount: !0+ retryOnMount: !0,+ refetchOnMount: (e) => e.state.data?.index_stale ? "always" : !1,+ refetchInterval: (e) => e.state.data?.index_refreshing && !e.state.error ? 1e3 : !1});(0, D.useEffect)(() => () => {m.current && H.removeQueries({ queryKey: uQ(e, t) });@@ -80072,4 +80074,4 @@ BNe($9);//#endregionexport { FI as $2ec61d1d4f780267$export$a8a3e93435678ff9, UI as $3a442827418ebe87$export$eb2fcfdbd7ba97d4, oR as $542a13ca2fa5b484$export$5b6b19405a83ff9d, Jw as $72abaeab4d80592f$export$78efe591171d7d45, QR as $76d00c5a4edb230a$export$76ccd210b9029917, YR as $76d00c5a4edb230a$export$816b5d811295e6bc, tz as $76d00c5a4edb230a$export$b59bdbef9ce70de2, rz as $76d00c5a4edb230a$export$f6f0c3fe4ec306ea, JR as $76d00c5a4edb230a$export$f850895b287ef28e, Fde as $b4f18e3395fe64d7$export$3d96ec278d3efce4, Pde as $b4f18e3395fe64d7$export$3e41faf802a29e71, jde as $b4f18e3395fe64d7$export$b2539bed5023c21c, sz as $b4f18e3395fe64d7$export$e51a686c67fdaa2d, Rde as $bd263d78e9bf3c56$export$f5c9f3c2c4054eec, FC as $ea3928288112382f$export$439d29a4e110a164, yR as $f2ff30fde7b014be$export$3ddf2d174ce01153, ER as $fe21c36db05242bb$export$a98f0dcb43a68a25, DR as $fe21c36db05242bb$export$d7b12c4107be0d61, bfe as $l, AA as ACCENT_CHOICES, xwe as AMANE_BRIDGE_CHECK_URL, Z$ as AMANE_BRIDGE_KEY, Swe as AMANE_BRIDGE_REBUILD_URL, kn as ApiError, vW as ArtSlot, q as Button, pI as ButtonLink, kfe as Bx, Vt as CLOUD_LOCATIONS, Z1 as CLOUD_PROXY_HELP, mr as COLUMN_SORT, l1 as CONFIGURATION_KEY, tX as CONFIGURATION_URL, Cwe as COOKIE_TEXT_LIMIT, X$ as COVER_JOB_KEY, _i as CREDENTIAL_STATE, K$ as CUSTOM_SOURCES_KEY, G$ as CUSTOM_SOURCES_URL, oV as Checkbox, aV as CheckboxGlyph, XB as ChevronSortDown, hZ as Chip, q2 as CloudDownloadDialog, HH as CollapseChevron, VH as CollapseRegion, p$ as CollectionSummary, eye as DEFAULT_CATEGORY, Nn as DEFAULT_SORT, LQ as DIAGNOSTICS_KEY, Zye as DIRECTORY_TEMPLATE_ERROR, M0 as DISCOVERY_SORTS, V2 as DOWNLOADS_KEY, B2 as DOWNLOADS_URL, TY as DUPLICATES_KEY, cY as DataTableFooter, iY as DataTableFrame, sY as DataTableSort, YH as Disclosure, jDe as DownloadsPanel, dfe as E3, tye as ENTITY_REVIEW_KINDS, Y1 as ENTRY_LINKS_HELP, X1 as ENTRY_LINKS_HINT, Cfe as Ea, Bfe as EmptyFocusButton, zz as EmptyState, qH as ErrorText, yhe as ExternalLink, lr as FEEDS_KEY, lX as FEED_SCHEDULE_KEY, Ake as FLOW_LABEL_X, L3 as FLOW_VIEWBOX, sr as FOLLOW_CHECK_KEY, or as FOLLOW_CREDENTIALS_KEY, M8 as FOLLOW_INITIAL_RANGE_OPTIONS, ar as FOLLOW_MANAGE_KEY, cr as FOLLOW_RESOLVE_KEY, cX as FOLLOW_SCHEDULE_KEY, xhe as Fact, bhe as FactList, JH as FieldLabel, R$ as Fieldset, L$ as FieldsetTitle, Mle as FilterGlass, oI as FilterGlassRows, aI as FilterIconButton, sI as FilterPill, vhe as Footer, Cz as Gg, cI as GlassPill, KH as Help, Az as HintText, Ske as IDLE_POLL_MS, Uve as IDLE_REPAIR, tI as IconButton, Fz as Input, Pz as InputBase, tA as JAV_LAYOUTS, P0 as JAV_RECOMMENDATION_GRID, MX as JUNK_KEY, X3 as JavHeader, Lve as KEEP_LABELS, dr as LAYOUTS, J1 as LIBRARY_FOLDER_HELP, pH as LIBRARY_PROCESSING_KEY, qY as LINKS_KEY, JY as LINK_CHECK_KEY, Cye as LINK_KINDS, YY as LINK_PRUNE_KEY, wn as LOC, kz as Label, V$ as LibraryProcessingCard, nB as LibraryShortcuts, wH as LinkButton, IH as LoadingDots, pfe as M6, Oye as MEDIA_PROCESSING_KEY, dX as MEDIA_PROCESSING_URL, AY as MEDIA_REPAIR_KEY, kY as MEDIA_REPAIR_URL, Vn as MEDIA_SOURCES_KEY, Po as MEDIA_SOURCE_ICONS, zt as MEDIA_SOURCE_OPTIONS, eV as MENU_ITEM, tV as MENU_ITEM_INTERACTIVE, $B as MENU_POPOVER_SURFACE, EH as MenuDialog, mG as MixCard, Iz as ModalFrame, hv as MotionConfigContext, Oz as NR, Rz as Note, Ife as OA, mX as ORGANIZE_KEY, _X as ORPHAN_RECORDS_KEY, Sz as OV, hz as P7, zCe as PHASES, nX as PICK_FOLDER_URL, U$ as PLAYLISTS_KEY, CTe as POLICY_COLUMNS, TTe as POLICY_COVER_NOTE, wTe as POLICY_MATRIX, q1 as POLICY_SUMMARY, oY as Pagination, B$ as PathLine, MF as PillTabList, RH as Progress, FY as QUALITY_GOALS_KEY, j$ as REPAIR_CARD_TEXT, jY as REPAIR_LIBRARIES_KEY, SX as RESOURCE_APPLY_KEY, xX as RESOURCE_SCAN_KEY, QCe as RESULT_PANEL, $Ce as RESULT_SECTION, $ve as REVIEW_CATEGORIES, jX as REVIEW_COUNTS_KEY, RY as REVIEW_KEY, zY as REVIEW_LABELS, _W as RetryNote, Ffe as Rf, ghe as Rows, ywe as SCRAPING_CHECK_URL, J$ as SCRAPING_COVER_URL, Y$ as SCRAPING_KEY, vwe as SCRAPING_SETTINGS_URL, CU as SEGMENT, SU as SEGMENTED_TRACK, sX as SETTINGS_KEY, rX as SETTINGS_URL, Pn as SORT_DEFAULT_DIR, Mn as SORT_OPTIONS, Ht as SOURCE_LABELS, c3 as STATS_KEY, hhe as Section, _he as SectionSkeleton, xU as SegmentedRadioGroup, age as SegmentedTabList, YU as Segments, aY as Select, mU as Select$1, p1 as SelectField, hU as SelectItem, hk as SelectionDock, UH as SettingsCard, mhe as SettingsRow, WH as SettingsSectionLabel, The as SiteLabel, OU as SortDirectionIcon, QU as SortKeys, bQ as SourceAvatar, $H as SourceLabel, XH as SourceMark, GH as Stack, z$ as StatusLabel, P2 as Switch, VF as TASKS_KEY, dke as TASTE_REFRESH_KEY, fke as TASTE_WINDOWS, uX as THUMBNAIL_JOBS_KEY, PX as TRASH_KEY, fle as TRIGGER_LABELS, YJ as Table, hY as TableColumnControls, gY as TableColumnResizer, vY as TableSelectionHeader, zH as TaskProgress, Mz as TextField, jz as TextFieldContext, xz as Un, _$ as WANTS_KEY, r4 as WantMagnets, Yf as WithPromise, gz as Wt, bz as Xc, Dz as Xf, hfe as Xt, ffe as _8, o as __commonJSMin, s as __exportAll, l as __toESM, Pfe as aB, Jr as addAlias, qr as addSource, y$ as addWant, B as apiGet, V as apiSend, Yk as appSettingsStore, gbe as applyConfirmText, AX as applyLeftovers, hbe as applyPlanText, vbe as applyText, $k as applyTheme, qg as asNumber, ibe as attachOrphan, Ar as authorAvatar, Mr as authorGroups, kr as authorInitial, Or as authorName, jq as autoResetPageIndex, Ra as avatarInner, m3 as bandRows, Qye as baseName, Hve as batchOperate, bk as boundedPreference, zve as bulkCloudPreferences, Uz as busyProps, Nfe as cB, VDe as cachedMagnetStates, zf as calcGeneratorVelocity, sye as canApprove, uf as cancelFrame, lbe as candidateText, FH as cardClass, mA as cardRatio, yz as cc, pi as checkEvidenceGap, fi as checkFailures, ri as checkFeeds, Dye as checkLine, ui as checkReceipt, di as checkSummary, Twe as checkText, mi as checkedText, BW as clickedBlank, jve as cloudLocations, O0 as cloudProxySkeleton, ax as clsx, Efe as cn, Gm as collectMotionValues, rJ as columnVisibilityFeature, WJ as column_getCanSort, BJ as column_getSortFn, aye as commonReviewSources, uV as configurationSection, gke as configureTasteBrowser, Sc as confirmModal, eq as copyInstancePropertiesWithoutMemos, ja as coverUrl, Jq as createColumnHelper, fwe as createPlaylist, vi as credentialDone, w0 as credentialsSkeleton, gye as currentReviewRow, kF as cx, Tz as dZ, pye as decisionPayload, mye as decisionReceipt, fye as defaultChoice, mwe as deletePlaylist, K1 as diagnosticsSkeleton, qCe as discoveryArtwork, w$ as discoveryKey, YTe as discoveryScore, Fve as distinctName, yye as dropReviewRows, ci as dropSources, Mfe as du, Bve as duplicateVictims, JF as elapsedText, La as entityFaceImg, tn as entityPath, Cr as errorHeadline, jn as errorMessage, z as esc, kq as expandRowModel, fz as f1, Sr as feedIntervalText, e1 as fetchAmaneBridge, Br as fetchCheckJob, u1 as fetchConfiguration, $$ as fetchCoverJob, zr as fetchCredentials, q$ as fetchCustomSources, RQ as fetchDiagnostics, T$ as fetchDiscoveries, DY as fetchDuplicates, sle as fetchEarlier, jye as fetchFeedSchedule, ei as fetchFeeds, Rr as fetchFollow, Aye as fetchFollowSchedule, IX as fetchJunkSummary, QY as fetchLinkCheck, $Y as fetchLinkPrune, ZY as fetchLinkStats, kye as fetchMediaProcessing, MY as fetchMediaRepair, Hn as fetchMediaSources, hX as fetchOrganize, Wye as fetchOrganizeExample, vX as fetchOrphanRecords, $r as fetchPending, W$ as fetchPlaylists, IY as fetchQualityGoals, NY as fetchRepairLibraries, Vr as fetchResolveJob, wX as fetchResourceApply, CX as fetchResourceScan, WY as fetchReview, FX as fetchReviewCounts, fX as fetchSettings, Q$ as fetchSources, l3 as fetchStats, Hr as fetchSuggestions, UF as fetchTasks, P3 as fetchTaste, _ke as fetchTasteJob, Mye as fetchThumbnailJobs, LX as fetchTrashSummary, v$ as fetchWants, rye as filterReviewRows, Sn as firstGrapheme, bK as flexRender, Mke as flowGraph, Nke as flowLabel, jOe as fmtCount, gn as fmtDur, vn as fmtSize, xle as foldRoutine, ai as followFeedByName, ur as followSuggestKey, Cle as followupDetail, lf as frame, nfe as g4, oJ as getDefaultPaginationState, pA as gridLayout, jr as groupByAuthor, ble as groupFollowups, VY as groupReviewRows, pbe as hasChanges, TX as hasResourceRoots, GF as hasResultProblems, Cke as historySpan, pz as i2, xke as importTasteExport, T0 as indexersSkeleton, jf as interpolate, x$ as invalidateWants, qF as isActive, xr as isBroken, hr as isLayout, gh as isMotionValue, BY as isReviewCategory, Sle as isRoutine, E0 as javBrowserSkeleton, I0 as javContentSkeleton, oA as javLayout, F0 as javTagSkeleton, Cbe as junkBreakdown, hwe as keepPlaylist, ve as keepPreviousData, Fr as keepSelected, u3 as known, ofe as l7, yle as latestOfKind, UOe as lengthRows, Gn as localTime, ii as lookupFeedActor, lfe as m7, wz as mM, Jt as mapLimit, Qr as markItem, h3 as max, VOe as mediumRows, cle as mergeFinished, g3 as min, xye as mirrorText, Kve as missingToolText, OY as mixedCloudPreferences, QF as momentText, Dy as motion, qm as motionValue, ebe as organizeOutcome, Q0 as overlayHost, gr as pageSizeOf, Pr as pageWindow, Ln as paginationRange, si as patchSource, QV as peachHistory, QV as peachHistory$1, dye as pendingGenres, NOe as percentText, qye as pickOrganizeFolder, $ye as planSummary, d3 as playedFor, FOe as playedItemUrl, HF as pollInterval, fs as popCount, dwe as posterUrl, IW as previewLibraryColor, Kye as previewOrganize, Yve as previewUrl, vle as problemDestination, YF as progressText, QH as providerIcon, Eye as pruneText, DX as purgeCount, abe as purgeOrphan, Ez as pv, jfe as qE, H as queryClient, mz as r2, kke as radarRows, ROe as radialArc, zOe as radialBarSize, LOe as radialCeiling, IOe as radialSlices, Ej as randomId, Dke as rankDetail, Oke as rankShares, p3 as reachedShare, XF as readableErrorHeadline, XTe as recommendationScore, _ye as recordGenre, sbe as recordsText, gwe as recreatePlaylist, lwe as refreshPlaylists, nl as relayoutCovers, li as reloadFollowManage, bye as reloadReview, OTe as rememberShape, Yye as rememberTemplates, Yr as removeAlias, ni as removeFeed, Kr as removeSource, bke as removeTasteSource, b$ as removeWants, Xr as renameAliasGroup, pwe as renamePlaylist, GOe as replayRows, E as require_jsx_runtime, v as require_react, S as require_react_dom, UK as require_with_selector, HCe as resetWants, In as resolveFollowSort, Gf as resolveStartTime, uwe as resumeAssetId, nye as reviewGroupingOptions, Sbe as reviewSummary, iye as reviewWindow, lye as rowEvidence, UY as rowFieldName, pJ as rowPaginationFeature, PJ as rowSelectionFeature, qJ as rowSortingFeature, HY as rowSubject, uye as rowTags, cye as rowTitle, rfe as s5, Zr as saveCredential, mbe as scanLine, Lye as schedulePollInterval, WCe as searchNote, oye as selectReviewRange, Ir as selectionState, ti as setFeedEnabled, Gr as setSourceEnabled, mV as settingsPath, Pve as sharedNamePrefix, $V as shellNavigate, y8 as showToast, cn as siteMarkUrl, pq as skipFirstRun, AF as sortCx, vr as sortLabel, Ut as sourceDefaultCost, gi as sourceIconUrl, _be as sourceMeta, rs as spinnerHtml, Of as spring, Vz as spriteGlyph, Ur as startCheck, wye as startLinkCheck, Tye as startLinkPrune, Jye as startOrganize, Wr as startResolve, dbe as startResourceApply, ube as startResourceScan, yke as startTasteRefresh, mle as statusLabel, Gve as statusLine, br as statusText, hA as storeJavLayout, hye as submitDecision, $F as summaryItems, Yq as tableFeatures, mq as tableMemo, Nr as tableRows, _le as taskIssues, F3 as tasteDate, Tke as tasteDimensions, wke as tasteHours, N3 as tasteKey, mke as tasteRefetchInterval, hke as tasteTime, IF as textLang, Wu as time, yfe as tl, Lr as toggleGroup, I3 as topScores, Sfe as uo, NH as useAction, RZ as useBackgroundJob, nu as useConstant, iI as useHorizontalScroller, ru as useIsomorphicLayoutEffect, RW as useLibraryTints, wt as useMutation, sV as useOverlayScrollbar, Ct as useQuery, A as useQueryClient, vy as useReducedMotion, Iye as useRunSchedule, Pye as useSaveFollowSchedule, pX as useSaveSettings, Rye as useSaveThumbnailMode, JJ as useTable, dY as useTablePreferences, Vve as victimBytes, UCe as wantName, POe as watchNote, f3 as watchedShare, Us as wireHorizontalScroller, Xye as withOrganizeJob };-//# debugId=e51ad429-7728-473f-ac70-484fe2795a25\ No newline at end of file+//# debugId=70fabfa5-c456-4fc8-9209-1b7de712c4a6\ No newline at end of file