Peach: Local-first video metadata scraper and media manager.
fix(covers): 完整显示无书脊的宣传画布
longmeidao6c04fdeeec13
diff --git a/docs/REUSE.md b/docs/REUSE.mdindex 7cf58f168..f60847459 100644--- a/docs/REUSE.md+++ b/docs/REUSE.md@@ -221,7 +221,7 @@ MGS 专属发行先查自营商品目录,Prestige 番号复用 `metadata_route正式封面和商品图以像素面积择优,同尺寸优先商品图,剧照预览保留末档;图片角色不让低清商品图覆盖更大的官方封面。-人脸缓存使用 `cover-face-v2` 与源图尺寸校验。`detect_cover_faces.py` 自动重算过期记录,逐图核查加 `--refresh-faces` 可在重算整图主脸后再决定版式;无可信书脊且左侧主脸明显占优的大封按整幅画面取景。安装、批次重算与恢复默认取景读取同一版式标记。+人脸缓存使用 `cover-face-v3` 与源图尺寸校验。`detect_cover_faces.py` 自动重算过期记录,逐图核查加 `--refresh-faces` 可在重算整图主脸后再决定版式;无可信书脊的 4:3 画布或左侧主脸明显占优的大封按整幅画面取景。安装、批次重算与恢复默认取景读取同一版式标记。取景由 `poster-crop-v12` 管理。Blu-ray 来源标题、明确的版次标签与图片比例共同决定 0.85 正封比例,标题随正封框保留,重算人脸与正封框均读取同一版次;有效宽正封框在没有版次标题的卡片上也完整显示。VR 标记、IENEE、IENFE、SDHS 数字发行拼图,以及可信主脸跨过 DVD 正封先验边界的大封保留整幅画面,由 `cover_frame.layout=still` 传给卡片。大封在竖版大图按主脸居中填满,横版小图完整显示,均不使用模糊补边;JPEG 软边的书脊识别结合突出度、左忙右静的方向与正封侧基线。手工框保持用户取景。重试队列按最早尝试时间轮转,收起的合集沿用设置跳过;逐番号结果保存在 `feed-cover-attempts/`。复用现有 HTTP、Pillow、OpenCV 与文件锁,无新增依赖。diff --git a/docs/adr/0107-cover-quality-and-javdb-evidence.md b/docs/adr/0107-cover-quality-and-javdb-evidence.mdindex edb4f5d15..a259b131e 100644--- a/docs/adr/0107-cover-quality-and-javdb-evidence.md+++ b/docs/adr/0107-cover-quality-and-javdb-evidence.md@@ -17,7 +17,7 @@- JavDB 图片只作来源复核与图像一致性证据,不作为正式封面、下载兜底或页面显示兜底。安装、封面索引与详情投影均执行此边界。官方图片未取得时显示未取得状态。- 有 JavDB 来源证据的历史封面及其边车移入 `review/` 下的可恢复归档,保留逐番号清单。来源未登记不等于 JavDB,不凭缺少来源批量移走文件。整个流程不写 ledger。- `poster-crop-v12` 结合主脸是否跨越正封先验边界识别整幅大封,结合梯度突出度与正封侧基线收紧书脊切点;手工取景保持原样。-- `cover-face-v2` 在整图上挑主脸,再决定是否按正封过滤。没有可辨书脊且左侧主脸面积至少为右侧两倍时按整幅大封取景;可信书脊保持传统封套布局。人脸缓存校验算法版本与图片尺寸,逐图核查支持 `--refresh-faces`。+- `cover-face-v3` 在整图上挑主脸,再决定是否按正封过滤。没有可辨书脊的 4:3 画布,以及左侧主脸面积至少为右侧两倍的无书脊图片,按整幅大封取景;可信书脊保持传统封套布局。整幅大封容许明显占据主体的闭眼或侧脸,人脸缓存校验算法版本与图片尺寸,逐图核查支持 `--refresh-faces`。- 整幅大封在竖版大图卡片按主脸居中填满,在横版小图卡片完整放入容器;两种视图均不使用模糊补边。图片比例不同,横版完整显示时允许实色留边。## 验证与复核产物diff --git a/src/peach/cover_artwork.py b/src/peach/cover_artwork.pyindex 798a1a75d..47890d7d5 100644--- a/src/peach/cover_artwork.py+++ b/src/peach/cover_artwork.py@@ -16,7 +16,7 @@ from .jav_cover_fetch import Unavailable, is_javdb_imageFRONT_START = 0.468MIN_FACE_Y, MAX_FACE_Y = 0.05, 0.60-FACE_ALGORITHM_VERSION = 'cover-face-v2'+FACE_ALGORITHM_VERSION = 'cover-face-v3'_INSTALL_LOCK = threading.RLock()@@ -61,6 +61,24 @@ def _dominant_left_face(image, largest, faces, *, code, title):return box['method'] == jav_poster_crop.RATIO+def _promotional_canvas(image, *, code, title):+ """4:3 画布没有可辨书脊时保留整幅,版式识别不依赖人脸是否检出。"""+ height, width = image.shape[:2]+ if abs(width / height - 4 / 3) >= .015 or not jav_poster_crop.crops_to_portrait(code, title):+ return False+ box = jav_poster_crop.front_panel_box(width, height, lambda: jav_poster_crop.column_gradient(image), code, title)+ return box['method'] == jav_poster_crop.RATIO+++def _full_picture_face(faces):+ """宣传大封允许明显占据主体的闭眼或侧脸,微弱的大框仍由强脸优先。"""+ strong = main_face(faces)+ if strong is None:+ return None+ largest = max(faces, key=lambda face: face.area)+ return largest if largest.score >= .7 and largest.area >= 4 * strong.area else strong++def face_record(image, detector, *, code: str, title: str = '') -> dict | None:"""已解码的封面 → 页面取景记录;无法解码时不生成记录。@@ -78,15 +96,15 @@ def face_record(image, detector, *, code: str, title: str = '') -> dict | None:full_cover = jav_poster_crop.face_crosses_spine(width, height, {'cx': largest.cx, 'w': largest.width, 'h': largest.height,'score': largest.score} if largest else None) or _dominant_left_face(- image, largest, portraits, code=code, title=title)+ image, largest, portraits, code=code, title=title) or _promotional_canvas(image, code=code, title=title)if (not full_cover and jav_poster_crop.crops_to_portrait(code, title)and (jav_poster_crop.SLEEVE_RATIO_MIN <= ratio < jav_poster_crop.SLEEVE_RATIO_MAXor (jav_poster_crop.is_wide_sleeve_label(code, title)and jav_poster_crop.WIDE_SLEEVE_RATIO_MIN <= ratio < jav_poster_crop.WIDE_SLEEVE_RATIO_MAX))):faces = [face for face in faces if face.cx >= FRONT_START]- low, high = (0.0, 1.0) if jav_poster_crop.is_scene_cover(code, title) else (MIN_FACE_Y, MAX_FACE_Y)+ low, high = (0.0, 1.0) if full_cover or jav_poster_crop.is_scene_cover(code, title) else (MIN_FACE_Y, MAX_FACE_Y)faces = [face for face in faces if low <= face.cy <= high]- best = main_face(faces)+ best = _full_picture_face(faces) if full_cover else main_face(faces)return {"version": FACE_ALGORITHM_VERSION, "ratio": round(ratio, 3), "px": [int(width), int(height)],**({'layout': 'still'} if full_cover or jav_poster_crop.is_scene_cover(code, title) else {}), "face": ({"cx": best.cx, "cy": best.cy, "w": best.width, "h": best.height,@@ -110,6 +128,10 @@ def _sidecars(code: str, payload: bytes, size: tuple[int, int], detector=None, e(lambda: jav_poster_crop.column_gradient(image)) if image is not None else None,title=title, face=(face or {}).get('face'), layout=(face or {}).get('layout', ''),)+ if (face is None and abs(size[0] / size[1] - 4 / 3) < .015+ and poster['box']['method'] == jav_poster_crop.RATIO):+ face = {'px': list(size), 'layout': 'still', 'face': None}+ poster = jav_poster_crop.crop_record(code, *size, title=title, layout='still')records = {jav_poster_crop.SIDECAR_SUFFIX: poster}if face is not None:records[".face.json"] = facediff --git a/tests/test_jav_cover_artwork.py b/tests/test_jav_cover_artwork.pyindex 41b50958c..c6cdd081b 100644--- a/tests/test_jav_cover_artwork.py+++ b/tests/test_jav_cover_artwork.py@@ -70,6 +70,34 @@ class CoverArtworkTests(unittest.TestCase):(cover_artwork.FACE_ALGORITHM_VERSION, 'still', .22))self.assertIsNone(jav_poster_crop.projection(jav_poster_crop.read_sidecar(self.target)))+ def test_four_three_collage_without_a_spine_keeps_the_largest_closed_eye_face(self):+ detector = Detector()+ with patch.object(detector, 'detect', return_value=[+ Face(.511, .435, .419, .717, .751), Face(.115, .128, .173, .227, .909)]):+ cover_artwork.install_cover(self.target, 'SONE-694', jpeg((80, 90, 100), (800, 600)),+ (800, 600), detector=detector)+ face = json.loads(self.target.with_suffix('.face.json').read_text(encoding='utf-8'))+ self.assertEqual((face['layout'], face['face']['cx']), ('still', .511))+ self.assertIsNone(jav_poster_crop.projection(jav_poster_crop.read_sidecar(self.target)))++ def test_a_large_weak_body_box_does_not_displace_the_portrait_on_a_full_canvas(self):+ detector = Detector()+ with patch.object(detector, 'detect', return_value=[+ Face(.389, .482, .427, .313, .798), Face(.389, .262, .202, .170, .928)]):+ cover_artwork.install_cover(self.target, 'SONE-694', jpeg((80, 90, 100), (800, 600)),+ (800, 600), detector=detector)+ face = json.loads(self.target.with_suffix('.face.json').read_text(encoding='utf-8'))+ self.assertEqual(face['face']['cy'], .262)++ def test_full_canvas_layout_is_available_without_a_face_model(self):+ with patch('peach.cover_artwork._default_detector', side_effect=FaceModelUnavailable('未取得')):+ cover_artwork.install_cover(self.target, 'CAWD-186', jpeg((80, 90, 100), (800, 600)), (800, 600))+ face = json.loads(self.target.with_suffix('.face.json').read_text(encoding='utf-8'))+ self.assertEqual(face['layout'], 'still')+ self.assertIsNone(face['face'])+ self.assertNotIn('version', face)+ self.assertIsNone(jav_poster_crop.projection(jav_poster_crop.read_sidecar(self.target)))+def test_a_clear_spine_keeps_the_front_portrait_despite_a_larger_back_portrait(self):detector = Detector()with patch.object(detector, 'detect', return_value=[Face(.22, .3, .3, .4, .95), Face(.8, .3, .06, .1, .9)]):