Skip to content

armgit / peach

Public Imported from GitHub
0

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

fix(covers): 识别居中正封与纸张比例大封

longmeidao193417bca69c
diff --git a/.claude/skills/peach-jav-cover-workflow/SKILL.md b/.claude/skills/peach-jav-cover-workflow/SKILL.md
index e936931e1..eff4a794d 100644
--- a/.claude/skills/peach-jav-cover-workflow/SKILL.md
+++ b/.claude/skills/peach-jav-cover-workflow/SKILL.md
@@ -70,6 +70,7 @@ description: 在用户说 JAV 封面、高清封面、缺封面、封面刮削
- 判据在 `peach.jav_poster_crop`:Sobel 列梯度找书脊折痕,HEYZO/FC2/六位日期/韩国 MIB
不裁;16:9 只认满高拼接缝(覆盖 ≥75% 行)夹出的居中正封(PASN 等),原图不动。
+ DVD 比例的居中正封还须双侧接缝满高,且两侧纹理均低于正封四分之一;无书脊的 4:3、√2:1 画布保留整幅。
- **折痕按「切出来的正封形状对不对」认,不按它落在全宽的百分之几**。正封宽高比是印刷面的物理常数
(DVD 135×190mm = 0.711),本机 637 张实测中位 0.704、1% 分位 0.684、99% 分位 0.725;折痕在全宽里的
位置则随背面留白与书脊厚度飘。所以只在 0.68~0.76(`PANEL_ASPECT_MIN`~`PANEL_ASPECT_MAX`)这个窗口里
diff --git a/docs/REUSE.md b/docs/REUSE.md
index 70039b7e7..9386ed967 100644
--- a/docs/REUSE.md
+++ b/docs/REUSE.md
@@ -223,11 +223,11 @@ MGS 专属发行先查自营商品目录,Prestige 番号复用 `metadata_route
只有厂牌图片的快照继续补查 DMM 目录;成功的 DMM 来源快照才省略目录查询,按厂牌编号构造的 CDN 地址和 r18.dev 的缺失记忆都不替代 DMM 查询。
-人脸缓存使用 `cover-face-v3` 与源图尺寸校验。`detect_cover_faces.py` 自动重算过期记录,逐图核查加 `--refresh-faces` 可在重算整图主脸后再决定版式;无可信书脊的 4:3 画布或左侧主脸明显占优的大封按整幅画面取景。安装、批次重算与恢复默认取景读取同一版式标记。
+人脸缓存使用 `cover-face-v4` 与源图尺寸校验。`detect_cover_faces.py` 自动重算过期记录,逐图核查加 `--refresh-faces` 可在重算整图主脸后再决定版式;无可信书脊的 4:3、√2:1 画布或左侧主脸明显占优的大封按整幅画面取景。安装、批次重算与恢复默认取景读取同一版式标记。
正封与整幅封面均使用卡片纯色底。传统正封完整居中,竖版大封按主脸填满,横版完整放入容器;图片切换时清理残留背景属性。
-取景由 `poster-crop-v12` 管理。Blu-ray 来源标题、明确的版次标签与图片比例共同决定 0.85 正封比例,标题随正封框保留,重算人脸与正封框均读取同一版次;有效宽正封框在没有版次标题的卡片上也完整显示。VR 标记、IENEE、IENFE、SDHS 数字发行拼图,以及可信主脸跨过 DVD 正封先验边界的大封保留整幅画面,由 `cover_frame.layout=still` 传给卡片。大封在竖版大图按主脸居中填满,横版小图完整显示,均不使用模糊补边;JPEG 软边的书脊识别结合突出度、左忙右静的方向与正封侧基线。手工框保持用户取景。重试队列按最早尝试时间轮转,收起的合集沿用设置跳过;逐番号结果保存在 `feed-cover-attempts/`。复用现有 HTTP、Pillow、OpenCV 与文件锁,无新增依赖。
+取景由 `poster-crop-v13` 管理。Blu-ray 来源标题、明确的版次标签与图片比例共同决定 0.85 正封比例,标题随正封框保留,重算人脸与正封框均读取同一版次;有效宽正封框在没有版次标题的卡片上也完整显示。VR 标记、IENEE、IENFE、SDHS 数字发行拼图,以及可信主脸跨过 DVD 正封先验边界的大封保留整幅画面,由 `cover_frame.layout=still` 传给卡片。两条满高接缝夹出居中正封且两侧纹理均低于正封四分之一时,只显示中间正封。大封在竖版大图按主脸居中填满,横版小图完整显示,均不使用模糊补边;JPEG 软边的书脊识别结合突出度、左忙右静的方向与正封侧基线。手工框保持用户取景。重试队列按最早尝试时间轮转,收起的合集沿用设置跳过;逐番号结果保存在 `feed-cover-attempts/`。复用现有 HTTP、Pillow、OpenCV 与文件锁,无新增依赖。
馆藏与新作取图共用 `cover_artwork.metadata_snapshots` 和 `best_cover`,片商官网、发行方、R18 与 DMM 的官方候选均参与尺寸比较。馆藏采集将长边 1600px 作为高清重探界限,社区转存图可由官方封面替换;同类官方图按像素面积升级,FC2 保留商品图的来源保护。`scripts/audit_cover_artwork.py` 逐张核对尺寸、来源、版次与取景框,输出 CSV;`scripts/upgrade_audited_covers.py` 按已有官方快照逐番号重探,`--live` 经同一官方链在线补查,保存原件备份与结果检查点。两者只处理可重建图片和边车,不写 ledger。
diff --git a/docs/adr/0107-cover-quality-and-javdb-evidence.md b/docs/adr/0107-cover-quality-and-javdb-evidence.md
index d6e715dcf..c25b8df71 100644
--- a/docs/adr/0107-cover-quality-and-javdb-evidence.md
+++ b/docs/adr/0107-cover-quality-and-javdb-evidence.md
@@ -16,8 +16,8 @@
- 缺少快照的有码作品复用已有 `DmmSource` 查询官方目录,DMM 成功证据与其目录镜像共用图片候选;FC2 快照只提取发行方存储原件。目录连接失败、拒绝访问与解析失败属于未取得,不能写成来源确认没有。
- JavDB 图片只作来源复核与图像一致性证据,不作为正式封面、下载兜底或页面显示兜底。安装、封面索引与详情投影均执行此边界。官方图片未取得时显示未取得状态。
- 有 JavDB 来源证据的历史封面及其边车移入 `review/` 下的可恢复归档,保留逐番号清单。来源未登记不等于 JavDB,不凭缺少来源批量移走文件。整个流程不写 ledger。
-- `poster-crop-v12` 结合主脸是否跨越正封先验边界识别整幅大封,结合梯度突出度与正封侧基线收紧书脊切点;手工取景保持原样。
-- `cover-face-v3` 在整图上挑主脸,再决定是否按正封过滤。没有可辨书脊的 4:3 画布,以及左侧主脸面积至少为右侧两倍的无书脊图片,按整幅大封取景;可信书脊保持传统封套布局。整幅大封容许明显占据主体的闭眼或侧脸,人脸缓存校验算法版本与图片尺寸,逐图核查支持 `--refresh-faces`。
+- `poster-crop-v13` 结合主脸是否跨越正封先验边界识别整幅大封,主脸在边界任一侧都受保护;梯度突出度与正封侧基线用于书脊切点。两条满高接缝夹出的居中正封,在两侧纹理均低于正封四分之一时优先保留中间区域。手工取景保持原样。
+- `cover-face-v4` 在整图上挑主脸,再决定是否按正封过滤。没有可辨书脊的 4:3、√2:1 画布,以及左侧主脸面积至少为右侧两倍的无书脊图片,按整幅大封取景;可信书脊与居中正封保持传统封套布局。整幅大封容许明显占据主体的闭眼或侧脸,人脸缓存校验算法版本与图片尺寸,逐图核查支持 `--refresh-faces`。
- 整幅大封在竖版大图卡片按主脸居中填满,在横版小图卡片完整放入容器;两种视图均不使用模糊补边。图片比例不同,横版完整显示时允许实色留边。
- 传统正封完整居中显示,比例差异处保留卡片纯色底。卡片不使用封底作为模糊背景,避免封底颜色出现在已裁好的正封边缘。
diff --git a/scripts/poster_crop_boxes.py b/scripts/poster_crop_boxes.py
index aa4c3396d..87fd981ba 100644
--- a/scripts/poster_crop_boxes.py
+++ b/scripts/poster_crop_boxes.py
@@ -117,7 +117,7 @@ def run(args: argparse.Namespace) -> int:
+ ",".join(f"{key} {value}" for key, value in counts.items()),
flush=True)
- print("\n折痕 {fold},右半居中 {ratio},16:9 居中正封 {center},不裁 {none},"
+ print("\n折痕 {fold},右半居中 {ratio},居中正封 {center},不裁 {none},"
"读图失败 {unreadable}".format(
fold=counts[jav_poster_crop.FOLD], ratio=counts[jav_poster_crop.RATIO],
center=counts[jav_poster_crop.CENTER], none=counts[jav_poster_crop.NONE],
diff --git a/src/peach/cover_artwork.py b/src/peach/cover_artwork.py
index 47890d7d5..d55af7ceb 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_image
FRONT_START = 0.468
MIN_FACE_Y, MAX_FACE_Y = 0.05, 0.60
-FACE_ALGORITHM_VERSION = 'cover-face-v3'
+FACE_ALGORITHM_VERSION = 'cover-face-v4'
_INSTALL_LOCK = threading.RLock()
@@ -52,9 +52,10 @@ def _dominant_left_face(image, largest, faces, *, code, title):
height, width = image.shape[:2]
if not (jav_poster_crop.SLEEVE_RATIO_MIN <= width / height < jav_poster_crop.SLEEVE_RATIO_MAX):
return False
- if largest is None or largest.cx >= FRONT_START or largest.score < .8 or largest.width < .075 or largest.height < .12:
+ spine = 1 - jav_poster_crop.PANEL_ASPECT * height / width
+ if largest is None or largest.cx >= spine or largest.score < .8 or largest.width < .075 or largest.height < .12:
return False
- front = main_face([face for face in faces if face.cx >= FRONT_START])
+ front = main_face([face for face in faces if face.cx >= spine])
if front and largest.width * largest.height < 2 * front.width * front.height:
return False
box = jav_poster_crop.front_panel_box(width, height, lambda: jav_poster_crop.column_gradient(image), code, title)
@@ -62,9 +63,10 @@ def _dominant_left_face(image, largest, faces, *, code, title):
def _promotional_canvas(image, *, code, title):
- """4:3 画布没有可辨书脊时保留整幅,版式识别不依赖人脸是否检出。"""
+ """4:3 与纸张比例的画布没有可辨书脊时保留整幅。"""
height, width = image.shape[:2]
- if abs(width / height - 4 / 3) >= .015 or not jav_poster_crop.crops_to_portrait(code, title):
+ if (min(abs(width / height - ratio) for ratio in (4 / 3, 2 ** .5)) >= .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
@@ -97,6 +99,9 @@ def face_record(image, detector, *, code: str, title: str = '') -> dict | None:
'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) or _promotional_canvas(image, code=code, title=title)
+ if full_cover:
+ panel = jav_poster_crop.front_panel_box(width, height, lambda: jav_poster_crop.column_gradient(image), code, title)
+ full_cover = panel['method'] != jav_poster_crop.CENTER
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_MAX
or (jav_poster_crop.is_wide_sleeve_label(code, title)
diff --git a/src/peach/jav_cover_fetch.py b/src/peach/jav_cover_fetch.py
index 02e3f3621..71784d2c1 100644
--- a/src/peach/jav_cover_fetch.py
+++ b/src/peach/jav_cover_fetch.py
@@ -114,13 +114,15 @@ IMAGE_URL = re.compile(r"https?://[^\"'\\ )]+?\.(?:jpg|jpeg|png|webp)")
def is_javdb_image(url: str = '', source: str = '') -> bool:
"""JavDB 转存图片仅参与来源印证,不作为正式封面。"""
+ from .sources.javdb import JAVDB
+ domains = (*JAVDB.domains, 'tp.spfcas.com')
for value in (url, source):
value = str(value or '').strip().lower()
if value in {'javdb', 'javdb-public', 'javdb_public'}:
return True
host = urlparse(value).hostname if '://' in value else value
if host and any(host == domain or host.endswith('.' + domain)
- for domain in ('jdbstatic.com', 'javdb.com', 'tp.spfcas.com')):
+ for domain in domains):
return True
return False
diff --git a/src/peach/jav_poster_crop.py b/src/peach/jav_poster_crop.py
index 941a33d1b..d087ee1b6 100644
--- a/src/peach/jav_poster_crop.py
+++ b/src/peach/jav_poster_crop.py
@@ -13,7 +13,7 @@ JAV 的官方封套是「背面 | 书脊 | 正面」拼成的一整张横图,
- `fold`:Sobel 找到了书脊折痕那道竖直峭壁,正面从折痕右侧开始。
- `ratio`:没找到折痕,按正封宽高比的先验从右缘量回去。
-- `center`:16:9 拼图正中的正封,左右两侧是剧照,框在两条拼接缝之间。
+- `center`:拼图或模糊补边正中的正封,框在两条拼接缝之间。
- `none`:这张图不该裁。整图框原样返回,页面维持现有的封面取景。
- `manual`:人在详情页自己框的。它压过上面四条,也不受算法版本号管辖——
框后面没有算法,改判据不构成重算它的理由。作废的唯一条件是封面换了张图
@@ -169,7 +169,7 @@ MANUAL = "manual"
MANUAL_SOURCE = "user:crop"
#: 算法版本号。sidecar 记着它,落后的重算。改动判据、常数或框的形状都要进位。
-ALGORITHM_VERSION = "poster-crop-v12"
+ALGORITHM_VERSION = "poster-crop-v13"
#: sidecar 与封面同名换后缀:`ABW-232.jpg` → `ABW-232.poster.json`。人脸取景是
#: `.face.json`,两者同目录、同命名风格,各描述一件事:一个是脸在哪,一个是正封在哪。
SIDECAR_SUFFIX = ".poster.json"
@@ -200,7 +200,7 @@ def face_crosses_spine(width: int, height: int, face: dict | None) -> bool:
cx, fw, fh = (float(face.get(key) or 0) for key in ('cx', 'w', 'h'))
spine = 1 - PANEL_ASPECT * height / width
return (float(face.get('score') or 0) >= .8 and fw >= .075 and fh >= .12
- and cx - fw / 2 < spine < cx)
+ and cx - fw / 2 < spine < cx + fw / 2)
def crops_to_portrait(code: str | None, title: str = '') -> bool:
@@ -289,7 +289,7 @@ def front_panel_box(width: int, height: int,
返回 `{"x0", "y0", "x1", "y1", "method"}`,坐标是源图像素,右下开区间。
封套的框右下角就是源图的右下角,`x0` 就是折痕所在的列——正封是「折痕右边的全部」,
- 不是它里面某个形状的子区域。16:9 的居中正封左右两条缝之间就是框。`method` 为
+ 不是它里面某个形状的子区域。居中正封左右两条缝之间就是框。`method` 为
`none` 时框是整张图:没有可裁的形状,调用方照原图处理。
`code` 只用来认宽封套的厂牌:不给就没有这一档,别的判据全由尺寸和梯度决定。
@@ -309,7 +309,24 @@ def front_panel_box(width: int, height: int,
or _whole(width, height))
if ratio < SLEEVE_RATIO_MIN:
return _whole(width, height)
- return _sleeve(width, height, gradient_source, DVD_PANEL)
+ profile = gradient_source() if callable(gradient_source) else gradient_source
+ return padded_center_panel(width, height, profile) or _sleeve(width, height, profile, DVD_PANEL)
+
+
+def padded_center_panel(width: int, height: int, profile) -> dict | None:
+ """两侧均为低纹理补边、两条满高接缝夹出的居中正封。"""
+ seams = getattr(profile, 'seams', None)
+ panel = center_panel(width, height, seams)
+ if panel is None:
+ return None
+ left, right = panel['x0'], panel['x1']
+ if min(seams[left - 1], seams[right]) < SEAM_MIN_COVERAGE:
+ return None
+ middle = statistics.median(profile[left:right])
+ if middle <= 0 or any(statistics.median(side) >= middle * .25
+ for side in (profile[:left], profile[right:])):
+ return None
+ return panel
def _sleeve(width: int, height: int, gradient_source: GradientSource,
@@ -464,7 +481,7 @@ def _seam_beyond(profile: list[float], seams: Sequence[float] | None, found: int
def center_panel(width: int, height: int, seams: Sequence[float] | None) -> dict | None:
- """16:9 拼图正中那块正封的框;不是这种版式返回 None。
+ """画布正中那块正封的框;不是这种版式返回 None。
缝只在「宽 `PANEL_ASPECT` 倍高、正好居中」的两个边位附近找,一侧够满高就成立,
另一侧按居中对称补上。缝那一列本身是过渡带,留在框外。
@@ -574,8 +591,9 @@ def crop_record(code: str | None, width: int, height: int,
"""
width, height = int(width or 0), int(height or 0)
box = (front_panel_box(width, height, gradient_source, code, title)
- if layout != 'still' and crops_to_portrait(code, title) and not face_crosses_spine(width, height, face)
- else _whole(width, height))
+ if layout != 'still' and crops_to_portrait(code, title) else _whole(width, height))
+ if box['method'] != CENTER and face_crosses_spine(width, height, face):
+ box = _whole(width, height)
return {"version": ALGORITHM_VERSION, "px": [width, height], "box": box,
**({'title': title} if title else {})}
diff --git a/tests/test_jav_cover_artwork.py b/tests/test_jav_cover_artwork.py
index c6cdd081b..bd3b02896 100644
--- a/tests/test_jav_cover_artwork.py
+++ b/tests/test_jav_cover_artwork.py
@@ -33,13 +33,50 @@ class CoverArtworkTests(unittest.TestCase):
from peach.jav_cover_fetch import Unavailable
data = jpeg((80, 90, 100))
self.target.write_bytes(data)
- for evidence in ({'source_url': 'https://c0.jdbstatic.com/covers/x.jpg'},
- {'source': 'javdb-public'}):
+ from peach.sources.javdb import JAVDB
+ evidence_list = [{'source_url': 'https://c0.' + domain + '/covers/x.jpg'}
+ for domain in (*JAVDB.domains, 'tp.spfcas.com')]
+ for evidence in [*evidence_list, {'source': 'javdb-public'}]:
with self.subTest(evidence=evidence), self.assertRaisesRegex(Unavailable, '无 JavDB 水印'):
cover_artwork.install_cover(self.target, 'FC2-PPV-12345', data, (840, 472), evidence=evidence)
self.assertEqual(self.target.read_bytes(), data)
self.assertFalse(self.target.with_suffix('.face.json').exists())
+ def test_a_paper_canvas_keeps_a_face_left_of_the_expected_spine(self):
+ detector = Detector()
+ with patch.object(detector, 'detect', return_value=[Face(.478, .094, .085, .155, .838)]):
+ cover_artwork.install_cover(self.target, 'STARS-350', jpeg((80, 90, 100), (840, 594)),
+ (840, 594), detector=detector)
+ face = json.loads(self.target.with_suffix('.face.json').read_text(encoding='utf-8'))
+ self.assertEqual(face['layout'], 'still')
+ self.assertEqual(face['face']['cx'], .478)
+ self.assertIsNone(jav_poster_crop.projection(jav_poster_crop.read_sidecar(self.target)))
+
+ def test_a_paper_canvas_without_faces_preserves_the_complete_picture(self):
+ detector = Detector()
+ with patch.object(detector, 'detect', return_value=[]):
+ cover_artwork.install_cover(self.target, 'SDDE-640', jpeg((80, 90, 100), (840, 594)),
+ (840, 594), detector=detector)
+ face = json.loads(self.target.with_suffix('.face.json').read_text(encoding='utf-8'))
+ self.assertEqual(face['layout'], 'still')
+ self.assertIsNone(jav_poster_crop.projection(jav_poster_crop.read_sidecar(self.target)))
+
+ def test_centered_front_with_padding_keeps_its_panel(self):
+ import numpy
+ image = numpy.full((563, 840, 3), 40, numpy.uint8)
+ image[:, 225:618] = numpy.random.default_rng(42).integers(100, 255, (563, 393, 3), dtype=numpy.uint8)
+ output = io.BytesIO()
+ Image.fromarray(image).save(output, 'PNG')
+ detector = Detector()
+ with patch.object(detector, 'detect', return_value=[Face(.487, .231, .135, .242, .93)]):
+ cover_artwork.install_cover(self.target, 'HHL-018', output.getvalue(), (840, 563), detector=detector)
+ face = json.loads(self.target.with_suffix('.face.json').read_text(encoding='utf-8'))
+ self.assertNotIn('layout', face)
+ box = jav_poster_crop.read_sidecar(self.target)['box']
+ self.assertEqual(box['method'], jav_poster_crop.CENTER)
+ self.assertLessEqual(abs(box['x0'] - 225), 1)
+ self.assertLessEqual(abs(box['x1'] - 618), 1)
+
def test_large_face_crossing_the_assumed_spine_uses_the_whole_cover(self):
detector = Detector()
with patch.object(detector, 'detect', return_value=[
diff --git a/tests/test_jav_poster_crop.py b/tests/test_jav_poster_crop.py
index 4f2b9eacb..b5ab996c3 100644
--- a/tests/test_jav_poster_crop.py
+++ b/tests/test_jav_poster_crop.py
@@ -21,6 +21,28 @@ from peach.jav_poster_crop import CENTER, FOLD, MANUAL, MANUAL_SOURCE, NONE, RAT
class CompressedSpineTests(unittest.TestCase):
+ def test_a_face_left_of_the_cut_keeps_its_right_side(self):
+ face = {'cx': .5, 'cy': .2, 'w': .1, 'h': .2, 'score': .9}
+ box = jav_poster_crop.crop_record('STARS-350', 840, 563, [0.] * 840, face=face)['box']
+ self.assertEqual(box, {'x0': 0, 'y0': 0, 'x1': 840, 'y1': 563, 'method': NONE})
+
+ def test_blurred_padding_around_a_centered_front_is_excluded(self):
+ profile = jav_poster_crop.ColumnProfile([.02] * 224 + [.2] * 394 + [.02] * 222, [0.] * 840)
+ profile.seams[224] = profile.seams[618] = .95
+ face = {'cx': .487, 'cy': .231, 'w': .135, 'h': .242, 'score': .93}
+ box = jav_poster_crop.crop_record('HHL-018', 840, 563, profile, face=face)['box']
+ self.assertEqual(box, {'x0': 225, 'y0': 0, 'x1': 618, 'y1': 563, 'method': CENTER})
+
+ def test_busy_side_pictures_do_not_form_blurred_padding(self):
+ profile = jav_poster_crop.ColumnProfile([.2] * 840, [0.] * 840)
+ profile.seams[224] = profile.seams[618] = .95
+ self.assertIsNone(jav_poster_crop.padded_center_panel(840, 563, profile))
+
+ def test_both_boundaries_are_required_for_blurred_padding(self):
+ profile = jav_poster_crop.ColumnProfile([.02] * 224 + [.2] * 394 + [.02] * 222, [0.] * 840)
+ profile.seams[224] = .95
+ self.assertIsNone(jav_poster_crop.padded_center_panel(840, 563, profile))
+
def test_soft_spine_edge_is_separated_from_the_lettering(self):
record = json.loads((Path(__file__).parent / 'fixtures/cover-profiles/ipzz-477.json').read_text(encoding='utf-8'))
profile = jav_poster_crop.ColumnProfile(record['gradient'], record['seams'])