Skip to content

armgit / peach

Public Imported from GitHub
0

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

fix(jav): 只出无码的厂牌番号走无码来源链并显示无码徽章

longmeidao1c9d44ff2b83
diff --git a/src/peach/catalog_rules.py b/src/peach/catalog_rules.py
index 11d43c59d..d5a95df77 100644
--- a/src/peach/catalog_rules.py
+++ b/src/peach/catalog_rules.py
@@ -1090,6 +1090,16 @@ UNCENSORED_CODE_SHAPES = (
re.compile(r"^HEYZO-\d{2,5}$", re.I),
_TOKYO_HOT_BODY,
)
+#: 番号形状和有码一样、片商只出无码的厂牌字母段:S Model(`SMBD`/`SMD`/`SMDV`/`S2M`)、
+#: スカイハイ(`SKY`/`SKYHD`)、キャットウォーク(`CWP`/`CWPBD`),以及 `DRG`、`LAF` 两个系列
+#: 与各自的 `BD` 版。取 amane `parsing/file_info.py` 与 mdcz `67bb8bc5` 两份前缀表的交集,
+#: 本机账本 2026-11-04 只读核过 `SMBD`、`CWPBD`、`SKY` 都挂在这几家无码片商名下。
+#: 两表里的两字母段(`BT`、`KP`、`PT`…)和 `JAV`、`RED`、`TS` 会撞有码番号,不收;
+#: `MCDV` 一个字母段两家共用(ADR-0133);KIRARI 只认带 `S` 的序号(`_KIRARI_CODE`)。
+#: 这一类只决定来源链与「无码」徽章,不进 `UNCENSORED_CODE_SHAPES`:它们的封面是常规封套,
+#: 取景照旧按有码裁。
+_UNCENSORED_LABEL_CODE = re.compile(
+ r"^(?:SMBD|SMD|SMDV|S2M|S2MBD|SKY|SKYHD|CWP|CWPBD|DRG|DRGBD|LAF|LAFBD)-\d{2,5}$", re.I)
#: 文件名里的发行站标记。番号形状认不出来时,这是另一条本机就能核验的证据。
_UNCENSORED_SITE = re.compile(
r"(?i)(?<![A-Z0-9])(?:"
@@ -1107,6 +1117,11 @@ def is_uncensored_code(code: str | None) -> bool:
return any(shape.fullmatch(value) for shape in UNCENSORED_CODE_SHAPES)
+def is_uncensored_label_code(code: str | None) -> bool:
+ """有码形状、但字母段属于只出无码的片商(`_UNCENSORED_LABEL_CODE`)。"""
+ return bool(_UNCENSORED_LABEL_CODE.fullmatch(str(code or "").strip()))
+
+
def code_release_date(code: str | None) -> str | None:
"""日期式番号自己写着发行日:`092415_001` 是 2015-09-24。别的形状返回 None。
@@ -1125,7 +1140,8 @@ def is_uncensored_release(name: str | None, code: str | None) -> bool:
这两条都是本机可核验的证据,不依赖抓取结果——`040221-001` 这类番号在
r18.dev 永远 404,等元数据到齐再判,徽章就永远不会出现。
"""
- return is_uncensored_code(code) or bool(_UNCENSORED_SITE.search(str(name or "")))
+ return (is_uncensored_code(code) or is_uncensored_label_code(code)
+ or bool(_UNCENSORED_SITE.search(str(name or ""))))
def jav_edition_badges(name: str | None, code: str | None,
diff --git a/src/peach/metadata_routes.py b/src/peach/metadata_routes.py
index e7628d5dc..7e3e720bc 100644
--- a/src/peach/metadata_routes.py
+++ b/src/peach/metadata_routes.py
@@ -23,7 +23,7 @@ from __future__ import annotations
import re
from typing import Iterable, Mapping, Sequence
-from .catalog_rules import is_amateur_code, is_korean_mib_code, is_uncensored_code
+from .catalog_rules import is_amateur_code, is_korean_mib_code, is_uncensored_code, is_uncensored_label_code
from .metadata_policy import SOURCE_SPECS
@@ -184,7 +184,7 @@ def classify(code: str | None, *hints: str | None) -> str:
# `FC2-PPV-…`;没归一的短写法按 `_FC2_SHORT` 认。
if value.upper().startswith("FC2") or _FC2_SHORT.match(value):
return "fc2"
- if is_uncensored_code(value):
+ if is_uncensored_code(value) or is_uncensored_label_code(value):
return "uncensored"
if is_amateur_code(value) or _MGS_AMATEUR.match(value.upper()):
return "amateur"
diff --git a/tests/test_jav_code_domain.py b/tests/test_jav_code_domain.py
index 74f5abfb1..763a30977 100644
--- a/tests/test_jav_code_domain.py
+++ b/tests/test_jav_code_domain.py
@@ -420,6 +420,12 @@ class TokyoHotShapeTests(unittest.TestCase):
'edition_badges': ['中字', '无码']})
self.assertEqual(jav_fallback_title('MKD-S118.mp4', 'MKD-S118'), '')
+ def test_uncensored_only_labels_get_the_uncensored_badge(self):
+ for name, code in (('SMBD-120.mp4', 'SMBD-120'), ('SKYHD-050-C.mp4', 'SKYHD-050')):
+ with self.subTest(code=code):
+ self.assertIn('无码', jav_display_metadata(name, code)['edition_badges'])
+ self.assertEqual(jav_display_metadata('MCDV-024.mp4', 'MCDV-024')['edition_badges'], [])
+
def test_a_bare_number_is_read_only_at_the_head_of_the_name(self):
self.assertEqual(release_code_from_filename("n1032.mkv"), "n1032")
self.assertEqual(release_code_from_filename("n0762.mkv"), "n0762")
diff --git a/tests/test_metadata_routes.py b/tests/test_metadata_routes.py
index 001834ecc..6bb0d5d49 100644
--- a/tests/test_metadata_routes.py
+++ b/tests/test_metadata_routes.py
@@ -24,6 +24,8 @@ class ClassifyTests(unittest.TestCase):
('SIRO-3508', 'amateur'), ('STP-26232', 'amateur'),
('092415_001', 'uncensored'), ('040221-001', 'uncensored'),
('HEYZO-1380', 'uncensored'), ('n0780', 'uncensored'),
+ ('SMBD-120', 'uncensored'), ('SKYHD-050', 'uncensored'), ('CWPBD-79', 'uncensored'),
+ ('S2MBD-023', 'uncensored'), ('BT-123', 'censored'), ('MCDV-024', 'censored'),
('FC2-PPV-1812235', 'fc2'), ('fc2-ppv-1233719', 'fc2'),
('AIN-203', 'kmib'), ('NOAH-101', 'kmib'),
('', 'unknown'), (None, 'unknown')):