Peach: Local-first video metadata scraper and media manager.
fix(metadata): 核实官方目录来源并恢复暂时故障连接
longmeidao78b724ca8290
diff --git a/docs/REUSE.md b/docs/REUSE.mdindex 594d30533..70039b7e7 100644--- a/docs/REUSE.md+++ b/docs/REUSE.md@@ -221,7 +221,7 @@ MGS 专属发行先查自营商品目录,Prestige 番号复用 `metadata_route正式封面和商品图以像素面积择优,同尺寸优先商品图,剧照预览保留末档;图片角色不让低清商品图覆盖更大的官方封面。-只有厂牌图片的快照继续补查 DMM 目录;属于当前番号的 DMM 图片候选才算目录已覆盖,r18.dev 的缺失记忆不替代 DMM 查询。+只有厂牌图片的快照继续补查 DMM 目录;成功的 DMM 来源快照才省略目录查询,按厂牌编号构造的 CDN 地址和 r18.dev 的缺失记忆都不替代 DMM 查询。人脸缓存使用 `cover-face-v3` 与源图尺寸校验。`detect_cover_faces.py` 自动重算过期记录,逐图核查加 `--refresh-faces` 可在重算整图主脸后再决定版式;无可信书脊的 4:3 画布或左侧主脸明显占优的大封按整幅画面取景。安装、批次重算与恢复默认取景读取同一版式标记。diff --git a/scripts/upgrade_audited_covers.py b/scripts/upgrade_audited_covers.pyindex 0d1624171..e6d42e229 100644--- a/scripts/upgrade_audited_covers.py+++ b/scripts/upgrade_audited_covers.py@@ -64,6 +64,16 @@ def upgrade(path, known, transport, report, *, live=False, metadata_root=None):return {**result, 'status': 'installed'}+def failure_result(code, error, transport):+ """暂时故障重建连接池,来源明确缺失保留原有连接;逐番号记录可重试性。"""+ from peach.library_processing import describe_failure, is_missing+ retryable = not is_missing(error)+ if retryable:+ transport.renew()+ return dict(code=code, status='failed', error=describe_failure(error),+ error_type=type(error).__name__, retryable=retryable)++def main():parser = argparse.ArgumentParser(description=__doc__)parser.add_argument('--data-root', type=Path, required=True)@@ -98,9 +108,7 @@ def main():result = upgrade(path, known, transport, args.report, live=args.live,metadata_root=args.data_root / 'sources/metadata/javinizer-go')except Exception as error:- from peach.library_processing import describe_failure, is_missing- result = dict(code=path.stem, status='failed', error=describe_failure(error),- error_type=type(error).__name__, retryable=not is_missing(error))+ result = failure_result(path.stem, error, transport)results.append(result)atomic_write_text(checkpoint, json.dumps(result, ensure_ascii=False, indent=2))print(json.dumps({'index': index, **result}, ensure_ascii=False), flush=True)diff --git a/src/peach/jav_cover_fetch.py b/src/peach/jav_cover_fetch.pyindex 03b1d208a..02e3f3621 100644--- a/src/peach/jav_cover_fetch.py+++ b/src/peach/jav_cover_fetch.py@@ -744,17 +744,6 @@ def _usable_candidates(code: str, candidates, known_sizes: dict[str, tuple[int,]-def _has_dmm_catalog_image(code: str, evidence: MetadataEvidence) -> bool:- """候选是否已有属于当前番号的 DMM 目录图片,厂牌小图不构成这份证据。"""- for candidate in evidence.candidates:- parsed = urlparse(candidate.url)- host = parsed.hostname or ''- if (host.endswith(('.dmm.com', '.dmm.co.jp')) and _DMM_CID.search(parsed.path)- and not is_cross_product_cover(code, candidate.url)):- return True- return False--def _site_candidates(transport: HttpTransport, code: str, evidence: MetadataEvidence, *,delay: float, deadline: float | None, record=lambda key: None) -> list[Candidate]:"""复用官方目录并按发行面查询图片;FC2 由调用方提供商品图候选。"""@@ -771,7 +760,7 @@ def _site_candidates(transport: HttpTransport, code: str, evidence: MetadataEvidcandidates += mgstage_images(transport, code, deadline=deadline)if candidates or ((prestige or amateur) and evidence.candidates):return candidates- if (not _has_dmm_catalog_image(code, evidence)+ if ('dmm' not in evidence.sourcesand not prestige and not amateur and not is_uncensored_code(code)):try:live_evidence = dmm_evidence(transport, code, deadline=deadline)diff --git a/tests/test_jav_covers.py b/tests/test_jav_covers.pyindex 4d4c9cd3f..205f7a395 100644--- a/tests/test_jav_covers.py+++ b/tests/test_jav_covers.py@@ -76,7 +76,8 @@ class FetchRetryTests(unittest.TestCase):modern = original.replace('awsimgsrc.dmm.co.jp/pics_dig/', 'awsimgsrc.dmm.com/dig/')item = {'id': 'cawd00447', 'title': '作品', 'makerContentId': 'CAWD-447','packageImage': {'largeUrl': original}}- evidence = covers.MetadataEvidence((covers.candidate_for(factory),), sources=frozenset({'makers', 'r18dev'}))+ guessed = covers.candidate_for('https://awsimgsrc.dmm.com/dig/digital/video/1cawd00447/1cawd00447pl.jpg')+ evidence = covers.MetadataEvidence((covers.candidate_for(factory), guessed), sources=frozenset({'makers', 'r18dev'}))winner, size, _ = covers.best_cover(transport_for({factory: (200, jpeg(800, 538)),'https://api.video.dmm.co.jp/graphql': (200, json.dumps({'data': {'ppvContent': item}}).encode()),modern: (200, jpeg(2184, 1468))}), 'CAWD-447', 0, known=evidence)diff --git a/tests/test_jav_poster_crop.py b/tests/test_jav_poster_crop.pyindex 1dcf71dc9..4f2b9eacb 100644--- a/tests/test_jav_poster_crop.py+++ b/tests/test_jav_poster_crop.py@@ -723,6 +723,16 @@ class BatchScriptTests(unittest.TestCase):self.assertEqual(install.call_args.kwargs['evidence']['resolver'], 'official-live-upgrade-v1')self.assertEqual((report / 'originals/ABW-232.jpg').read_bytes(), self.before)+ def test_upgrade_resets_connections_only_for_retryable_source_failures(self):+ from peach.jav_cover_fetch import NotFound, Unavailable+ from unittest.mock import Mock+ script = batch_script('upgrade_audited_covers')+ for error, expected in ((NotFound('HTTP 404'), False), (Unavailable('HTTP 503'), True)):+ transport = Mock()+ result = script.failure_result('ABW-232', error, transport)+ self.assertEqual(result['retryable'], expected)+ self.assertEqual(transport.renew.call_count, int(expected))+def test_javdb_quarantine_preserves_bytes_and_resumes_without_duplicates(self):covers = self.root / 'generated/covers'covers.mkdir(parents=True)