Peach: Local-first video metadata scraper and media manager.
fix(covers): 统一无模型时的大封版式识别
longmeidao924601f01433
diff --git a/src/peach/cover_artwork.py b/src/peach/cover_artwork.pyindex d55af7ceb..410b8f5e9 100644--- a/src/peach/cover_artwork.py+++ b/src/peach/cover_artwork.py@@ -17,6 +17,7 @@ from .jav_cover_fetch import Unavailable, is_javdb_imageFRONT_START = 0.468MIN_FACE_Y, MAX_FACE_Y = 0.05, 0.60FACE_ALGORITHM_VERSION = 'cover-face-v4'+PROMOTIONAL_ASPECTS = (4 / 3, 2 ** .5)_INSTALL_LOCK = threading.RLock()@@ -65,7 +66,7 @@ def _dominant_left_face(image, largest, faces, *, code, title):def _promotional_canvas(image, *, code, title):"""4:3 与纸张比例的画布没有可辨书脊时保留整幅。"""height, width = image.shape[:2]- if (min(abs(width / height - ratio) for ratio in (4 / 3, 2 ** .5)) >= .015+ if (min(abs(width / height - ratio) for ratio in PROMOTIONAL_ASPECTS) >= .015or not jav_poster_crop.crops_to_portrait(code, title)):return Falsebox = jav_poster_crop.front_panel_box(width, height, lambda: jav_poster_crop.column_gradient(image), code, title)@@ -133,7 +134,7 @@ 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+ if (face is None and min(abs(size[0] / size[1] - ratio) for ratio in PROMOTIONAL_ASPECTS) < .015and 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')diff --git a/tests/test_jav_cover_artwork.py b/tests/test_jav_cover_artwork.pyindex bd3b02896..d81c6af62 100644--- a/tests/test_jav_cover_artwork.py+++ b/tests/test_jav_cover_artwork.py@@ -127,13 +127,15 @@ class CoverArtworkTests(unittest.TestCase):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)))+ for size in ((800, 600), (840, 594)):+ with self.subTest(size=size), patch('peach.cover_artwork._default_detector',+ side_effect=FaceModelUnavailable('未取得')):+ cover_artwork.install_cover(self.target, 'CAWD-186', jpeg((80, 90, 100), size), size)+ 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()