Peach: Local-first video metadata scraper and media manager.
fix(web): 补齐新作与创作者头像及官方视频预览
longmeidao7f516d6d88af
diff --git a/frontend/src/card-art/feed-identity.ts b/frontend/src/card-art/feed-identity.tsindex 06a375f25..c785bdc65 100644--- a/frontend/src/card-art/feed-identity.ts+++ b/frontend/src/card-art/feed-identity.ts@@ -2,16 +2,20 @@ import { entityPath, esc } from '@peach/legacy/core';import { avatarInner, type FaceRef } from './markup';+type FeedFace = FaceRef & { name: string; source_actor_id?: string; source_avatar?: boolean };+/** 新作署名共用人物头像、取景与首字回退;已有身份通往人物资料页。 */-export function feedIdentity(item: { performers?: string; performer_refs?: (FaceRef & { name: string })[] }): string {+export function feedIdentity(item: { code?: string; performers?: string; performer_refs?: FeedFace[] }): string {const refs = item.performer_refs || [];const names = [...new Set((item.performers || '').split(/[,,、;/]/).map(name => name.trim()).filter(Boolean))];- const people: (FaceRef & { name: string })[] = refs.length ? refs : names.map(name => ({ name }));+ const people: FeedFace[] = refs.length ? refs : names.map(name => ({ name }));const faces = people.slice(0, 3).map(ref => {- const html = avatarInner(ref.name, ref, null);+ const source = item.code && ref.source_actor_id && ref.source_avatar && !ref.has_image && !ref.has_avatar;+ const attrs = source ? ` data-feed-source-avatar data-code="${esc(item.code!)}" data-actor="${esc(ref.source_actor_id!)}" data-name="${esc(ref.name)}"` : '';+ const html = source ? '' : avatarInner(ref.name, ref, null);return 'id' in ref && ref.id- ? `<a class="mav" href="${esc(entityPath('performer', ref.name, ref.id))}" aria-label="打开女优页:${esc(ref.name)}">${html}</a>`- : `<span class="mav" title="${esc(ref.name)}">${html}</span>`;+ ? `<a class="mav"${attrs} href="${esc(entityPath('performer', ref.name, ref.id))}" aria-label="打开女优页:${esc(ref.name)}">${html}</a>`+ : `<span class="mav"${attrs} title="${esc(ref.name)}">${html}</span>`;}).join('');return people.length > 1 ? `<div class="mavstack">${faces}</div>` : faces;}diff --git a/frontend/src/card-art/markup.ts b/frontend/src/card-art/markup.tsindex 563ed9aa6..c69d0d95c 100644--- a/frontend/src/card-art/markup.ts+++ b/frontend/src/card-art/markup.ts@@ -25,6 +25,8 @@ export interface FaceRef {rep?: number | null;has_avatar?: boolean;identity_categories?: string[];+ source_avatar_url?: string;+ source_avatar_fallbacks?: string[];}/** 代表作画面替账号顶着圆框时,悬停与读屏读到的那句。 */@@ -138,13 +140,16 @@ export function avatarInner(name: string, ref: FaceRef | null | undefined, repId// 这一层大多是小圆框和窄格子,厂牌标识在那里要方形图标而不是横着的字标;索引页的// 厂牌大格是同一个模板里的例外,由调用方点名要 `large`。const hint = focus === undefined ? (ref && ref.avatar_focus) || null : focus;+ const sourceFace = !ref?.has_image && !logoName && ref?.source_avatar_url+ ? `<img src="${esc(ref.source_avatar_url)}" width="128" height="128" alt="" loading="lazy" decoding="async" ${+ imageFallbackAttrs({ fallbacks: ref.source_avatar_fallbacks || [] })}>` : '';return `<span class="ini">${esc(firstGrapheme(name))}</span>`- + entityFaceImg({+ + (sourceFace || entityFaceImg({kind, id: ref && ref.id, hasImage: !!(ref && ref.has_image), version: ref && ref.image_version,rep: ref?.has_avatar && ref.rep ? ref.rep : repId, mark: markId,logo: logoName, logoVersion: ref && ref.logo_version, logoVariant, focus: hint, thumb,standIn: !!(ref && ref.avatar_stand_in),- });+ }));}/** 卡片署名、Mix 叠放头像、沉浸作者那一格:`avatarInner` 读取引用或顶栏代表作表。`kind` 为空是diff --git a/frontend/src/react/feed-new/feed-new-row.tsx b/frontend/src/react/feed-new/feed-new-row.tsxindex 669f8d5fa..34df6f573 100644--- a/frontend/src/react/feed-new/feed-new-row.tsx+++ b/frontend/src/react/feed-new/feed-new-row.tsx@@ -2,8 +2,10 @@* 那一份模板(`feedNewCardHtml`)。忽略的那条当场消失,已看过的留在原位只是变淡,想要那颗键* 按下去换成填实的星;三样都直接改这一行的节点,不重画整行——重画会把横滚的位置和自动滚动* 一起打回起点。一条都没有就整块不出。 */-import { useContext, useEffect, useLayoutEffect, useRef, type MouseEvent } from 'react';+import { useContext, useEffect, useLayoutEffect, useRef, useState, type MouseEvent } from 'react';+import { createPortal } from 'react-dom';import { ShellActionsContext } from '../router/router';+import { SourceAvatar } from '../components/source-avatar';import type { FeedNew } from './feed-new';@@ -19,6 +21,7 @@ export function FeedNewRow({ feedNew, host, wire, act, settled }: {}) {const actions = useContext(ShellActionsContext);const box = useRef<HTMLDivElement>(null);+ const [sourceFaces, setSourceFaces] = useState<HTMLElement[]>([]);const html = feedNew?.items.length ? feedNew.html : '';useLayoutEffect(() => {host.removeAttribute('aria-busy');@@ -27,6 +30,7 @@ export function FeedNewRow({ feedNew, host, wire, act, settled }: {}, [host, html, feedNew, settled]);useEffect(() => {if (html) wire(box.current?.querySelector('.feednewrow') ?? null);+ setSourceFaces([...box.current?.querySelectorAll<HTMLElement>('[data-feed-source-avatar]') ?? []]);}, [wire, html]);const click = async (event: MouseEvent<HTMLDivElement>) => {const link = (event.target as Element).closest<HTMLAnchorElement>('a.feednewopen');@@ -53,6 +57,8 @@ export function FeedNewRow({ feedNew, host, wire, act, settled }: {settled?.(false);}};- return html ? <div ref={box} className="contents" onClick={(event) => { void click(event) }}- dangerouslySetInnerHTML={{ __html: html }} /> : null;+ return html ? <><div ref={box} className="contents" onClick={(event) => { void click(event) }}+ dangerouslySetInnerHTML={{ __html: html }} />{sourceFaces.map((face, index) => createPortal(+ <SourceAvatar code={face.dataset.code!} person={{ name: face.dataset.name!, source_actor_id: face.dataset.actor! }} />,+ face, `${html.length}:${index}`))}</> : null;}diff --git a/frontend/test/card-art/markup.test.ts b/frontend/test/card-art/markup.test.tsindex 040d2f1cf..6bda869d8 100644--- a/frontend/test/card-art/markup.test.ts+++ b/frontend/test/card-art/markup.test.ts@@ -27,6 +27,17 @@ describe('西方官方封面', () => {});});+it('创作者名片官方头像使用本机代理和归档回退,实体图优先', () => {+ const ref = { id: 7, has_image: false, source_avatar_url: '/follow-avatar?service=fanbox&id=123',+ source_avatar_fallbacks: ['/follow-avatar?provider=kemono&ref=fanbox%2F123'] };+ const image = parse(avatarInner('创作者', ref, null, 'creator'))!;+ expect(image.getAttribute('src')).toBe(ref.source_avatar_url);+ expect(image.dataset.fallbacks).toBe(ref.source_avatar_fallbacks[0]);+ expect(image.dataset.drop).toBe('self');+ expect(parse(avatarInner('创作者', { ...ref, has_image: true }, null, 'creator'))?.getAttribute('src'))+ .toBe('/entity-image?kind=creator&id=7');+});+describe('entityFaceImg:实体图优先,取不到退代表作头像', () => {it('两样都取不到就一个 <img> 都不出', () => {expect(entityFaceImg({ id: 3, hasImage: false })).toBe('');diff --git a/frontend/test/feed-identity.test.ts b/frontend/test/feed-identity.test.tsindex 5a0704286..cd668ebbe 100644--- a/frontend/test/feed-identity.test.ts+++ b/frontend/test/feed-identity.test.ts@@ -22,6 +22,19 @@ it('没有实体图的新作留首字,不请求不存在的头像', () => {expect(host.querySelector('.ini')?.textContent).toBe('甲');});+it('共演新作来源头像槽保留规范人物链接和作品身份', () => {+ const host = render({ code: 'EXM-001', performer_refs: [+ { id: 1, name: '甲', has_image: true },+ { id: 2, name: '乙', has_image: false, source_avatar: true, source_actor_id: 'Actor2' },+ { name: '未建档', source_avatar: true, source_actor_id: 'Actor3' },+ ] });+ const slots = [...host.querySelectorAll<HTMLElement>('[data-feed-source-avatar]')];+ expect(slots).toHaveLength(2);+ expect(slots[0]?.getAttribute('href')).toBe('/performers/2');+ expect(slots.map(slot => slot.dataset.actor)).toEqual(['Actor2', 'Actor3']);+ expect(slots.every(slot => slot.dataset.code === 'EXM-001')).toBe(true);+});+it('未建档多人署名最多叠三枚首字并转义名字', () => {const host = render({ performers: '<甲>、乙、丙、丁' });expect(host.querySelectorAll('.mav')).toHaveLength(3);diff --git a/frontend/test/react/feed-new.test.tsx b/frontend/test/react/feed-new.test.tsxindex 243b8d09d..ca0d2b160 100644--- a/frontend/test/react/feed-new.test.tsx+++ b/frontend/test/react/feed-new.test.tsx@@ -10,6 +10,8 @@ import { feedNewKey, prefetchFeedNew, type FeedDiscoveries, type FeedNewProps }import { FeedNewPage } from '../../src/react/feed-new/feed-new-page';import { queryClient } from '../../src/react/query';import { click, mountRoot, settle } from './render';+import { FeedNewRow } from '../../src/react/feed-new/feed-new-row';+import { feedIdentity } from '../../src/card-art/feed-identity';afterEach(() => { queryClient.clear() });notifyManager.setScheduler((notify) => notify());@@ -34,6 +36,26 @@ function serve(...rounds: number[][]) {const reads = (fetcher: ReturnType<typeof serve>) =>fetcher.mock.calls.map(([url]) => String(url)).filter((url) => url.startsWith('/api/feeds/discoveries'));+it('新作来源共演头像经详情同一查询加载并在忽略后可卸载', async () => {+ vi.stubGlobal('IntersectionObserver', undefined);+ const fetcher = vi.fn(async (_url: string) => ({ ok: true, status: 200, json: async () => ({ ok: true, image: 'data:image/jpeg;base64,cGl4ZWxz' }) }));+ vi.stubGlobal('fetch', fetcher);+ const host = document.createElement('section');+ document.body.append(host);+ const html = `<div class="feednewrow"><article data-feed-id="1">${feedIdentity({ code: 'EXM-001', performer_refs: [+ { name: '甲', source_actor_id: 'A', source_avatar: true },+ { name: '乙', source_actor_id: 'B', source_avatar: true }] })}<button data-feed-action="ignore">忽略</button></article></div>`;+ const mounted = await mountRoot(<QueryClientProvider client={queryClient}><FeedNewRow host={host} feedNew={{ items: [{ id: 1 }], html }}+ wire={() => {}} act={async () => {}} /></QueryClientProvider>);+ await settle();+ expect(mounted.host.querySelectorAll('.mav img')).toHaveLength(2);+ expect(fetcher.mock.calls.map(([url]) => url).sort()).toEqual([+ '/api/jav/image?code=EXM-001&image=actor%3AA', '/api/jav/image?code=EXM-001&image=actor%3AB']);+ await click(mounted.host.querySelector('[data-feed-action]'));+ await settle();+ expect(mounted.host.querySelector('[data-feed-id]')).toBeNull();+});+function props(patch: Partial<FeedNewProps> = {}): FeedNewProps {const host = document.createElement('section');host.hidden = true;diff --git a/frontend/test/react/jav-preview.test.tsx b/frontend/test/react/jav-preview.test.tsxnew file mode 100644index 000000000..3060a7ed7--- /dev/null+++ b/frontend/test/react/jav-preview.test.tsx@@ -0,0 +1,31 @@+import { notifyManager, QueryClientProvider } from '@tanstack/react-query';+import { afterEach, expect, it, vi } from 'vitest';+import { JavDetailPage } from '../../src/react/jav-detail/jav-detail-page';+import { javDetailKey, type JavDetail } from '../../src/react/jav-detail/jav-detail';+import { queryClient } from '../../src/react/query';+import { click, mountRoot, settle } from './render';++const player = vi.hoisted(() => vi.fn((_video: HTMLVideoElement, _source: { src: string; type: string }, _failed: () => void) => vi.fn()));+vi.mock('../../src/player', () => ({ mountPreviewPlayer: player }));+notifyManager.setScheduler(notify => notify());+afterEach(() => { queryClient.clear(); player.mockClear() });++it('官方MP4预告进入现有播放器并在关闭时销毁', async () => {+ const src = '/jav-preview/EXM-001/0123456789abcdef';+ const item: JavDetail = { code: 'EXM-001', title: '示例作品', state: 'ready', summary: '', director: '', publisher: '',+ performers: '', performer_refs: [], studio_refs: [], series_refs: [], tags: [], has_cover: false,+ source_image: false, preview_count: 0, comments_count: 0, source_url: '', wanted: false, want_id: null,+ preview_video_url: src };+ queryClient.setQueryData(javDetailKey(item.code), item);+ vi.stubGlobal('fetch', vi.fn(async () => ({ ok: true, status: 200, json: async () => ({ ok: true, image: '' }) })));+ const mounted = await mountRoot(<QueryClientProvider client={queryClient}><JavDetailPage code={item.code} readOnly+ actions={{ close: vi.fn(), navigate: vi.fn(), openTag: vi.fn(), receipt: vi.fn() }} /></QueryClientProvider>);+ await click(mounted.host.querySelector('[data-jav-preview-toggle]'));+ await settle();+ expect(player).toHaveBeenCalledOnce();+ expect(player.mock.calls[0]?.[1]).toEqual({ src, type: 'video/mp4' });+ expect(mounted.host.querySelector('video')?.getAttribute('aria-label')).toBe('视频预览');+ const dispose = player.mock.results[0]!.value;+ await mounted.unmount();+ expect(dispose).toHaveBeenCalledOnce();+});diff --git a/src/peach/follow_identity.py b/src/peach/follow_identity.pyindex 3292c7848..1cab8dfb0 100644--- a/src/peach/follow_identity.py+++ b/src/peach/follow_identity.py@@ -145,6 +145,32 @@ def official_avatar_url(row) -> str | None:{"service": "profile", "id": profiles})+def creator_avatar_refs(contract) -> dict:+ """按已绑定实体汇总官方与归档头像,本机代理处理实际取图。"""+ from .follow_assets import mirror_avatar_url++ def read():+ with contract.read_connection() as connection:+ if not connection.execute("SELECT 1 FROM sqlite_master WHERE name='follow_source'").fetchone():+ return {}+ sources = connection.execute(+ "SELECT s.* FROM follow_source s JOIN entity e ON e.id=s.entity_id "+ "WHERE e.kind='creator' ORDER BY s.provider,s.ref").fetchall()+ groups = {}+ for row in sources:+ urls = groups.setdefault(row['entity_id'], [[], []])+ official = official_avatar_url(row)+ if official:+ urls[0].append(official)+ if mirror_avatar_url(row['provider'], row['ref']):+ urls[1].append('/follow-avatar?' + urllib.parse.urlencode(+ {'provider': row['provider'], 'ref': row['ref']}))+ return {identity: list(dict.fromkeys(official + archive))+ for identity, (official, archive) in groups.items()}++ return contract.cached('creator_avatar_refs', read)++def author_name(rows, key: str, canonical: dict[str, str]) -> str:"""一位作者(同一作者键下的几条来源)叫什么。diff --git a/src/peach/jav_official_preview.py b/src/peach/jav_official_preview.pynew file mode 100644index 000000000..fa969a99b--- /dev/null+++ b/src/peach/jav_official_preview.py@@ -0,0 +1,60 @@+"""官方商品已声明的预告;媒体地址与作品身份同时核对。"""+from __future__ import annotations++import json+import re+import time+from urllib.parse import quote++import httpx++from .catalog_rules import normalise_code_key+from .jav_cover_fetch import HostLimitedTransport, PRESTIGE_MEDIA, PRESTIGE_PRODUCT, _fetch+from .javdb_public import PublicSourceUnavailable+from .scraping_access import SourceTransport++PRESTIGE_SKU = 'https://www.prestige-av.com/api/sku/item/{code}'+_UUID = re.compile(r'[a-f0-9]{8}(?:-[a-f0-9]{4}){3}-[a-f0-9]{12}')+_MOVIE_PATH = re.compile(r'[a-f0-9]/[a-f0-9]/[a-f0-9-]{36}\.mp4')+++def prestige_preview(code, secrets_root, *, transport=None):+ """复用 amane 固定版本的 SKU→UUID 协议,只读取两份 JSON。"""+ owned = transport is None+ transport = transport or HostLimitedTransport(SourceTransport(+ secrets_root, max_requests=3, max_bytes=2 * 1024 * 1024, max_seconds=30), 2)+ deadline = time.monotonic() + 30++ def read(url):+ body = _fetch(transport, url, referer='https://www.prestige-av.com/',+ limit=1024 * 1024, deadline=deadline)+ payload = json.loads(body)+ if not isinstance(payload, dict):+ raise ValueError('商品资料格式未识别')+ return payload++ try:+ sku = read(PRESTIGE_SKU.format(code=quote(normalise_code_key(code))))+ uuid = (sku.get('parentProduct') or {}).get('uuid')+ if not isinstance(uuid, str) or not _UUID.fullmatch(uuid):+ raise ValueError('商品身份未取得')+ product = read(PRESTIGE_PRODUCT.format(uuid=uuid))+ numbers = [row.get('deliveryItemId') for row in product.get('sku') or [] if isinstance(row, dict)]+ if product.get('uuid') != uuid or not any(normalise_code_key(number) == normalise_code_key(code) for number in numbers):+ raise ValueError('来源作品身份不匹配')+ if 'movie' not in product:+ raise ValueError('公开预告字段未取得')+ movie = product['movie']+ if movie is None:+ return ''+ if not isinstance(movie, dict) or movie.get('mimeType') != 'video/mp4' or movie.get('isLimited') != 0:+ raise ValueError('公开预告格式未识别')+ path = movie.get('path')+ if not isinstance(path, str) or not _MOVIE_PATH.fullmatch(path):+ raise ValueError('公开预告地址未识别')+ return PRESTIGE_MEDIA.format(path=path)+ except (OSError, ValueError, TypeError, AttributeError, RuntimeError, httpx.HTTPError) as error:+ raise PublicSourceUnavailable('官方视频预览未取得,请稍后重试') from error+ finally:+ if owned:+ transport.close()diff --git a/src/peach/javdb_public.py b/src/peach/javdb_public.pyindex 461c714e3..0553ffc3c 100644--- a/src/peach/javdb_public.py+++ b/src/peach/javdb_public.py@@ -411,6 +411,13 @@ class PublicAPI:self._rows(f"/v1/movies/{movie['id']}/magnets", "magnets"),released=movie.get('release_date'), refresh=refresh)+ def official_preview(self, code, fetch, *, released=None, refresh=False):+ """预告单独补齐:已取得的视频按发行日保存,未提供的视频一天后可再检查。"""+ def read():+ url = fetch()+ return {'url': url, **({'release_date': released} if url else {})}+ return self._cached('preview:prestige:' + normalise_code_key(code), read, refresh=refresh)+def image(self, code: str, index: str) -> str:movie = self.media_movie(code)if index == "cover":diff --git a/src/peach/preview_cache.py b/src/peach/preview_cache.pyindex 746ea7625..184fda3cd 100644--- a/src/peach/preview_cache.py+++ b/src/peach/preview_cache.py@@ -15,12 +15,15 @@ class PreviewCache:def __init__(self, cache):self.cache = cache- def register(self, code: str, url: str, *, identity: str = "", playlist: bool | None = None) -> str:+ def register(self, code: str, url: str, *, identity: str = "", playlist: bool | None = None,+ media_type: str = "") -> str:if not public_https_url(url):raise ValueError("预览来源不可用")ref = hashlib.sha256((identity or url).encode()).hexdigest()path = self.cache.folder("preview:" + code) / (ref + ".source.json")value = {"url": url, "playlist": playlist if playlist is not None else urlsplit(url).path.lower().endswith(".m3u8")}+ if media_type == 'video/mp4':+ value['media_type'] = media_typetry:current = json.loads(path.read_text(encoding='utf-8'))except (OSError, ValueError):diff --git a/src/peach/routes_media.py b/src/peach/routes_media.pyindex cbdb9ebd5..52d5ab965 100644--- a/src/peach/routes_media.py+++ b/src/peach/routes_media.py@@ -1026,8 +1026,16 @@ def jav_preview(request: Request, code: str, ref: str, args: dict[str, str] = Debody = previews.playlist(code, ref, fetch)return Response(b"" if request.method == "HEAD" else body, media_type="application/vnd.apple.mpegurl",headers={"cache-control": "private, max-age=31536000", "content-length": str(len(body))})- return cache.stream(f"preview:{code}:{ref}", request,- lambda: open_upstream(client, request.method, target, incoming=request.headers))+ def media():+ response = open_upstream(client, request.method, target, incoming=request.headers)+ if source.get('media_type') == 'video/mp4':+ kind = response.headers.get('content-type', '').split(';')[0].lower()+ if kind not in {'video/mp4', 'application/octet-stream', 'binary/octet-stream'}:+ response.close()+ raise FollowProxyError('视频预览响应未取得')+ response.headers['content-type'] = 'video/mp4'+ return response+ return cache.stream(f"preview:{code}:{ref}", request, media)except (ValueError, OSError, FollowProxyError, httpx.HTTPError):return Response(status_code=404, headers={"cache-control": "no-store"})diff --git a/src/peach/web_catalog.py b/src/peach/web_catalog.pyindex 57d937dbf..9596af2e5 100644--- a/src/peach/web_catalog.py+++ b/src/peach/web_catalog.py@@ -465,6 +465,12 @@ def entity_ref(contract: WebContract, kind: str, entity_id, name: str) -> dict:if has_image:ref["image_version"] = contract.entity_image_version(kind, entity_id)ref["avatar_focus"] = contract.avatar_focus(kind, entity_id)+ if kind == 'creator':+ from .follow_identity import creator_avatar_refs+ urls = creator_avatar_refs(contract).get(entity_id, [])+ if urls:+ ref['source_avatar_url'] = urls[0]+ ref['source_avatar_fallbacks'] = urls[1:]return refdiff --git a/src/peach/web_feeds.py b/src/peach/web_feeds.pyindex ce2823500..ac384d271 100644--- a/src/peach/web_feeds.py+++ b/src/peach/web_feeds.py@@ -467,6 +467,8 @@ LISTED = (def _discovery_performers(connection, contract, rows) -> dict[int, list[dict]]:+ from .web_jav_discovery import _cached_movie+ from .web_jav_detail import source_performer_refs, visible_actors"""新作出演名单按已有身份解析,头像契约与馆藏卡片共用。"""names = {name.strip() for row in rowsfor name in re.split(r"[,,、;/]", row["performers"] or "") if name.strip()}@@ -479,6 +481,12 @@ def _discovery_performers(connection, contract, rows) -> dict[int, list[dict]]:for found in identities.values() if found}performers = {}for row in rows:+ source = _cached_movie(row['code'], contract)+ if 'actors' in source:+ refs = source_performer_refs(contract, connection, visible_actors(connection, source, excluded))+ performers[int(row['id'])] = refs+ row['performers'] = '、'.join(ref['name'] for ref in refs)+ continuerefs = []row['performers'] = '、'.join(name.strip() for name in re.split(r"[,,、;/]", row['performers'] or '')if name.strip() in identities)diff --git a/src/peach/web_jav_detail.py b/src/peach/web_jav_detail.pyindex 387384296..1e2985e2e 100644--- a/src/peach/web_jav_detail.py+++ b/src/peach/web_jav_detail.py@@ -94,7 +94,9 @@ def q_jav_detail(contract, args) -> dict:with contract.database.read_connection() as connection:decisions = load_genre_decisions(connection)payload.update(_source_fields(source or {}, decisions))- payload.update(_artwork_fields(contract, code, item, source or {}))+ payload.update(_artwork_fields(contract, code, item, source or {}, refresh=args.get('refresh') == '1'))+ if payload.get('preview_message'):+ payload['message'] = ';'.join(filter(None, (payload['message'], payload['preview_message'])))payload.update(_identity_fields(contract, code, item, source or {}))return payload@@ -158,12 +160,12 @@ def source_performer_refs(contract, connection, actors):return refs-def _artwork_fields(contract, code, item, source):+def _artwork_fields(contract, code, item, source, *, refresh=False):return {"has_cover": contract.has_cover(code), "cover_version": contract.cover_version(code),"cover_url": item.get("cover_url") or "","source_image": bool(source and (source.get("cover_url") or source.get("thumb_url"))),"preview_count": min(len(source.get("preview_images") or []), 30),- "preview_video_url": _preview_url(contract, code, source),+ **_preview_fields(contract, code, source, refresh=refresh),"source_url": "https://javdb.com/v/" + str(source["id"]) if source else item.get("link") or ""}@@ -237,14 +239,28 @@ def _fetch_image(contract, code, index):return image-def _preview_url(contract, code, source):+def _preview_fields(contract, code, source, *, refresh=False):url = preview_video_url(source)- if not url:- return ""- if '?' in url:+ if url and '?' in url:url = preview_video_url(PUBLIC_API.media_movie(code)) or url- ref = PreviewCache(cache_for(contract)).register(code, url, identity="root", playlist=True)- return f"/jav-preview/{code}/{ref}.m3u8"+ if not url and ('prestige' in str(source.get('maker_name') or '').casefold()+ or 'プレステージ' in str(source.get('maker_name') or '')):+ from .jav_official_preview import prestige_preview+ try:+ result = PUBLIC_API.official_preview(code, lambda: prestige_preview(code, contract.follow_secrets_root),+ released=source.get('release_date'), refresh=refresh)+ url = result['url']+ failure = cache_error('preview:prestige:' + code)+ if failure and not url:+ raise PublicSourceUnavailable(failure)+ except PublicSourceUnavailable as error:+ return {'preview_video_url': '', 'preview_state': 'unavailable', 'preview_message': str(error)}+ if not url:+ return {'preview_video_url': '', 'preview_state': 'missing'}+ playlist = url.endswith('.m3u8') or '.m3u8?' in url+ ref = PreviewCache(cache_for(contract)).register(code, url, identity="root", playlist=playlist,+ media_type='' if playlist else 'video/mp4')+ return {'preview_video_url': f"/jav-preview/{code}/{ref}{'.m3u8' if playlist else ''}", 'preview_state': 'ready'}@_source_cachediff --git a/src/peach/web_library_shortcuts.py b/src/peach/web_library_shortcuts.pyindex f56165059..5d5178c0e 100644--- a/src/peach/web_library_shortcuts.py+++ b/src/peach/web_library_shortcuts.py@@ -115,6 +115,9 @@ def _favorite_art(contract, row, representative):row['image_url'] = '/logo?' + urlencode({'studio': row['name'], 'variant': 'icon', 'v': contract.logo_version(row['name'])})elif ref['has_image']:row['image_url'] = '/entity-image?' + urlencode({'kind': row['kind'], 'id': row['entity_id'], 'thumb': 1, 'v': ref.get('image_version', '')})+ elif ref.get('source_avatar_url'):+ row['image_url'] = ref['source_avatar_url']+ row['image_fallbacks'] = ref.get('source_avatar_fallbacks', [])elif row['kind'] not in {'studio', 'agency'} and representative and contract.has_avatar(*representative):row['image_url'] = f'/avatar?id={representative[0]}'row['image_label'] = row['name'] + ' · 代表作'diff --git a/tests/test_fastapi_api.py b/tests/test_fastapi_api.pyindex 5c3f7f293..4fc197934 100644--- a/tests/test_fastapi_api.py+++ b/tests/test_fastapi_api.py@@ -2210,6 +2210,43 @@ class FastApiContractTests(unittest.IsolatedAsyncioTestCase):self.app.state.http_transport.client = originalfake.close()+ async def test_official_mp4_preview_preserves_type_range_and_local_replay(self):+ from peach.preview_cache import PreviewCache+ from peach.remote_media_cache import cache_for+ cache = cache_for(self.app.state.web_contract)+ ref = PreviewCache(cache).register('EXM-001', 'https://www.prestige-av.com/api/media/public.mp4', playlist=False, media_type='video/mp4')+ body = b'\0\0\0\x18ftypisom' + b'\0' * 64+ calls = []+ def upstream(request):+ calls.append(request)+ if request.url.path.endswith('failure.mp4'):+ return httpx.Response(200, headers={'content-type': 'text/html'},+ stream=httpx.ByteStream(b'<html>unavailable</html>'), request=request)+ return httpx.Response(200, headers={'content-type': 'application/octet-stream', 'content-length': str(len(body))},+ stream=httpx.ByteStream(body), request=request)+ original = self.app.state.http_transport.client+ fake = httpx.Client(transport=httpx.MockTransport(upstream))+ self.app.state.http_transport.client = fake+ try:+ with patch('peach.follow_stream.resolves_publicly', return_value=True):+ response = await self.client.get(f'/jav-preview/EXM-001/{ref}?t=secret')+ self.assertEqual(response.status_code, 200)+ self.assertEqual(response.headers['content-type'], 'video/mp4')+ self.assertEqual(response.content, body)+ replay = await self.client.get(f'/jav-preview/EXM-001/{ref}?t=secret', headers={'Range': 'bytes=0-7'})+ self.assertEqual(replay.status_code, 206)+ self.assertEqual(replay.content, body[:8])+ self.assertEqual(replay.headers['content-range'], f'bytes 0-7/{len(body)}')+ self.assertEqual(len(calls), 1)+ invalid = PreviewCache(cache).register('EXM-002', 'https://www.prestige-av.com/api/media/failure.mp4',+ playlist=False, media_type='video/mp4')+ failed = await self.client.get(f'/jav-preview/EXM-002/{invalid}?t=secret')+ self.assertEqual(failed.status_code, 404)+ self.assertEqual(failed.headers['cache-control'], 'no-store')+ finally:+ self.app.state.http_transport.client = original+ fake.close()+async def test_follow_image_failure_has_no_image_body_and_can_be_retried(self):from types import SimpleNamespaceitem = SimpleNamespace(id=28, provider='simpcity', url='https://simpcity.cr/post/28',diff --git a/tests/test_feeds_web.py b/tests/test_feeds_web.pyindex 600d2cb03..70a95127f 100644--- a/tests/test_feeds_web.py+++ b/tests/test_feeds_web.py@@ -129,6 +129,37 @@ class FeedWebFixture(unittest.TestCase):class FeedWebTest(FeedWebFixture):+ def test_newwork_cast_reads_cached_source_faces_and_local_aliases_without_fetching(self):+ from peach.jav_discovery_metadata import discovery_metadata+ self._add()+ self._check()+ self._drain(1)+ with self.contract.database.write_transaction() as connection:+ connection.execute("INSERT INTO entity(kind,canonical_name,normalized_name,created_at,updated_at)"+ " VALUES('performer','规范乙','规范乙',?,?)", (feeds.stamp(), feeds.stamp()))+ eid = connection.execute("SELECT id FROM entity WHERE canonical_name='规范乙'").fetchone()[0]+ connection.execute("INSERT INTO entity_alias(entity_id,alias,normalized_alias,source)"+ " VALUES(?,'来源乙','来源乙','test')", (eid,))+ metadata = discovery_metadata(self.contract)+ with self.contract.database.read_connection() as connection:+ codes = [row[0] for row in connection.execute('SELECT code FROM feed_discovery')]+ for code in codes:+ metadata.remember(code, {'number': code, 'actors': [+ {'id': 'A', 'name': '深田えいみ', 'gender': 0, 'avatar_url': 'https://tp.spfcas.com/A.jpg'},+ {'id': 'B', 'name': '来源乙', 'gender': 0, 'avatar_url': 'https://tp.spfcas.com/B.jpg'},+ {'id': 'C', 'name': '来源男优', 'gender': 1}]})+ with patch('peach.javdb_public.PUBLIC_API.movie') as fetch:+ items = dispatch_api_get(self.contract, '/api/feeds/discoveries', {})['items']+ fetch.assert_not_called()+ self.assertTrue(items)+ for item in items:+ self.assertEqual(item['performers'], '深田えいみ、规范乙')+ self.assertEqual([ref['source_actor_id'] for ref in item['performer_refs']], ['A', 'B'])+ self.assertTrue(all(ref['source_avatar'] for ref in item['performer_refs']))+ self.assertEqual(item['performer_refs'][1]['id'], eid)+ with self.contract.database.read_connection() as connection:+ self.assertEqual({row[0] for row in connection.execute('SELECT performers FROM feed_discovery')}, {'深田えいみ'})+def test_home_shape_tracks_visible_discoveries_without_an_entity(self):def has_feed():return dispatch_api_get(self.contract, "/api/entity/shapes", {})["home"]["feed"]diff --git a/tests/test_jav_official_preview.py b/tests/test_jav_official_preview.pynew file mode 100644index 000000000..413376d19--- /dev/null+++ b/tests/test_jav_official_preview.py@@ -0,0 +1,105 @@+"""官方预告的精确作品身份、地址边界、固定成功缓存和短期缺失缓存。"""+import json+import tempfile+import unittest+from pathlib import Path+from unittest.mock import Mock, patch++import httpx++from peach.http import HttpResponse+from peach.jav_official_preview import prestige_preview+from peach.javdb_public import PublicAPI, PublicSourceUnavailable+from peach.preview_cache import PreviewCache+from peach.remote_media_cache import cache_for+from peach.web_jav_detail import q_jav_detail+from peach.web_state import WebContract+from support.ledger import fresh_ledger++UUID = '69fa4c03-103c-482e-aec5-14f971ba4d7d'+VIDEO = 'https://www.prestige-av.com/api/media/6/9/' + UUID + '.mp4'+++class OfficialPreviewTests(unittest.TestCase):+ def transport(self, product):+ return Mock(side_effect=[HttpResponse(200, {}, json.dumps({'parentProduct': {'uuid': UUID}}).encode()),+ HttpResponse(200, {}, json.dumps(product).encode())])++ def product(self, **values):+ return {'uuid': UUID, 'sku': [{'deliveryItemId': 'EXM-001'}],+ 'movie': {'path': '6/9/' + UUID + '.mp4', 'mimeType': 'video/mp4', 'isLimited': 0}, **values}++ def test_exact_sku_provides_declared_public_mp4_without_media_download(self):+ transport = self.transport(self.product())+ self.assertEqual(prestige_preview('EXM-001', Path('unused'), transport=transport), VIDEO)+ self.assertEqual(transport.call_count, 2)+ self.assertTrue(transport.call_args_list[0].args[0].url.endswith('/api/sku/item/EXM-001'))+ self.assertTrue(transport.call_args_list[1].args[0].url.endswith('/api/product/' + UUID))++ def test_undeclared_fields_wrong_identity_and_private_movies_are_unavailable(self):+ missing = self.product()+ del missing['movie']+ for product in [missing, self.product(uuid='another'), self.product(sku=[{'deliveryItemId': 'EXM-002'}]),+ self.product(movie={'path': '../private.mp4', 'mimeType': 'video/mp4', 'isLimited': 0}),+ self.product(movie={'path': '6/9/' + UUID + '.mp4', 'mimeType': 'video/mp4', 'isLimited': 1})]:+ with self.subTest(product=product), self.assertRaises(PublicSourceUnavailable):+ prestige_preview('EXM-001', Path('unused'), transport=self.transport(product))++ def test_source_absence_is_distinct_from_transport_failure(self):+ self.assertEqual(prestige_preview('EXM-001', Path('unused'), transport=self.transport(self.product(movie=None))), '')+ with self.assertRaises(PublicSourceUnavailable):+ prestige_preview('EXM-001', Path('unused'), transport=Mock(side_effect=httpx.ConnectError('offline')))++ def test_empty_preview_rechecks_daily_and_good_old_preview_survives_restart(self):+ with tempfile.TemporaryDirectory() as directory:+ now = [1791936000.0]+ root = Path(directory).resolve()+ api = PublicAPI(cache_root=root, clock=lambda: now[0], wallclock=lambda: now[0])+ fetch = Mock(return_value='')+ self.assertEqual(api.official_preview('EXM-001', fetch, released='2020-01-01')['url'], '')+ api.official_preview('EXM-001', fetch, released='2020-01-01')+ self.assertEqual(fetch.call_count, 1)+ now[0] += 86400+ fetch.return_value = VIDEO+ self.assertEqual(api.official_preview('EXM-001', fetch, released='2020-01-01')['url'], VIDEO)+ self.assertEqual(fetch.call_count, 2)+ now[0] += 86400 * 400+ restarted = PublicAPI(cache_root=root, clock=lambda: now[0], wallclock=lambda: now[0])+ forbidden = Mock(side_effect=AssertionError('来源请求不可执行'))+ self.assertEqual(restarted.official_preview('EXM-001', forbidden)['url'], VIDEO)+ forbidden.assert_not_called()++ def test_detail_projects_official_mp4_and_preserves_movie_metadata(self):+ with tempfile.TemporaryDirectory() as directory:+ root = Path(directory).resolve()+ contract = WebContract(fresh_ledger(root), cover_root=root / 'covers')+ self.addCleanup(contract.stop_background_jobs)+ movie = {'number': 'EXM-001', 'id': 'Exact', 'maker_name': 'PRESTIGE,プレステージ',+ 'release_date': '2020-01-01', 'preview_video_url': None}+ api = PublicAPI()+ api.movie = Mock(return_value=movie)+ with patch('peach.web_jav_detail.PUBLIC_API', api), \+ patch('peach.jav_official_preview.prestige_preview', return_value=VIDEO) as official:+ payload = q_jav_detail(contract, {'code': 'EXM-001'})+ again = q_jav_detail(contract, {'code': 'EXM-001'})+ self.assertEqual(payload['preview_state'], 'ready')+ self.assertEqual(payload['preview_video_url'], again['preview_video_url'])+ self.assertFalse(payload['preview_video_url'].endswith('.m3u8'))+ ref = payload['preview_video_url'].rsplit('/', 1)[-1]+ self.assertEqual(PreviewCache(cache_for(contract)).source('EXM-001', ref), {'url': VIDEO, 'playlist': False, 'media_type': 'video/mp4'})+ official.assert_called_once()+ self.assertEqual(movie['preview_video_url'], None)++ def test_failed_official_preview_keeps_detail_and_reports_retryable_state(self):+ with tempfile.TemporaryDirectory() as directory:+ root = Path(directory).resolve()+ contract = WebContract(fresh_ledger(root), cover_root=root / 'covers')+ self.addCleanup(contract.stop_background_jobs)+ api = PublicAPI()+ api.movie = Mock(return_value={'number': 'EXM-001', 'id': 'Exact', 'maker_name': 'Prestige'})+ with patch('peach.web_jav_detail.PUBLIC_API', api), \+ patch('peach.jav_official_preview.prestige_preview', side_effect=PublicSourceUnavailable('预告连接未取得')):+ payload = q_jav_detail(contract, {'code': 'EXM-001'})+ self.assertEqual(payload['state'], 'ready')+ self.assertEqual(payload['preview_state'], 'unavailable')+ self.assertIn('预告连接未取得', payload['message'])diff --git a/tests/test_web_library_shortcuts.py b/tests/test_web_library_shortcuts.pyindex 82516ae29..7612cbf05 100644--- a/tests/test_web_library_shortcuts.py+++ b/tests/test_web_library_shortcuts.py@@ -89,6 +89,29 @@ class LibraryShortcutsTests(unittest.TestCase):stored = json.loads(c.execute('SELECT settings_json FROM profile').fetchone()[0])self.assertNotIn('image_url', stored['libraryShortcuts']['favorites'][0])+ def test_creator_favorite_projects_bound_official_and_archive_avatars(self):+ from peach.web_catalog import entity_ref+ with closing(sqlite3.connect(self.path)) as c, c:+ c.executescript("""+ INSERT INTO entity VALUES(4,'creator','创作者');+ INSERT INTO entity VALUES(5,'creator','同名待确认');+ CREATE TABLE follow_source(id INTEGER PRIMARY KEY,provider TEXT,ref TEXT,entity_id INTEGER,metadata_json TEXT);+ INSERT INTO follow_source VALUES(1,'kemono','fanbox/123',4,'{}');+ INSERT INTO follow_source VALUES(2,'pawchive','fanbox/123',4,'{}');+ INSERT INTO follow_source VALUES(3,'f95zone','99',NULL,'{}');+ """)+ creator = self.write(action='favorite', entity_id=4, on=True)['favorites'][0]+ self.assertEqual(creator['image_url'], '/follow-avatar?service=fanbox&id=123')+ self.assertEqual(creator['image_fallbacks'], [+ '/follow-avatar?provider=kemono&ref=fanbox%2F123',+ '/follow-avatar?provider=pawchive&ref=fanbox%2F123'])+ self.assertEqual(entity_ref(self.contract, 'creator', 4, '创作者')['source_avatar_url'], creator['image_url'])+ unknown = self.write(action='favorite', entity_id=5, on=True)['favorites'][1]+ self.assertEqual(unknown['image_url'], '')+ with closing(sqlite3.connect(self.path)) as c:+ stored = json.loads(c.execute('SELECT settings_json FROM profile').fetchone()[0])+ self.assertNotIn('image_url', stored['libraryShortcuts']['favorites'][0])+def test_bad_targets_are_rejected_without_writes(self):for href in ('https://evil.example/', '//evil.example/', '/configuration', '/?token=x', '/?seed=123'):with self.subTest(href=href), self.assertRaises(ValueError):