Peach: Local-first video metadata scraper and media manager.
fix(library): 从带片名的文件名识别番号
longmeidao508b55825684
diff --git a/src/peach/catalog_rules.py b/src/peach/catalog_rules.pyindex 8bf9ffb8a..af94dae93 100644--- a/src/peach/catalog_rules.py+++ b/src/peach/catalog_rules.py@@ -391,6 +391,19 @@ _KOREAN_MIB_CODE = re.compile(r"^([A-Z]{2,4})-\d+$")#: `_CODE_BODY` 认不出。只对 MIB 前缀开这条路,前缀之外的仍走通用规则。_KOREAN_MIB_FILENAME = re.compile(r"^(?:\[K-?MIB\]\s*)?([A-Za-z]{2,4})[-_](\d{3,4})(?=$|[\s(\[._-])", re.I)+#: 带片名的文件名里,番号是一段连续的半角字母数字,中间只夹 `-`、`_`、`.`。+#: 中日文、空白、括号和 `+` 都是边界:`CAWD-987いいなり`、`GVH-520【中文字幕】`+#: 切出来就是番号本身。+_TITLE_TOKEN = re.compile(r"[A-Za-z0-9](?:[A-Za-z0-9._-]*[A-Za-z0-9])?")+_QUALITY_TOKEN = re.compile(r"^(?:hd|fhd|sd|uhd|4k|2160p?|1080p?|720p?)$", re.I)+#: 片名前的番号必须用 `-` 把厂牌和序号隔开。连写(`Nanshu969`、`LOOKS199`)和下划线+#: (`photo_83439`、`@yszl_0107`)在片名里多半是创作者账号或相机编号,不是番号。+#: 序号至少三位:两位的(`ShinoAoi-15`、`miru-10`)是创作者的分集号;后面紧跟月日的+#: (`TG-2025-01-27`)是日期。只取词元开头这一段,紧跟的版次和分卷(`-C`、`-CD1`、+#: `_part1`)不影响番号。+_HYPHENATED_CODE = re.compile(r"^(?:\d{3})?[A-Za-z]{2,8}-\d{3,5}(?![0-9]|-\d{2}-\d)")+#: 名字中段的 FC2 商品号:`FC2` 前面不能紧贴字母数字,商品号后面不能再接数字。+_FC2_IN_TITLE = re.compile(r"(?i)(?<![A-Z0-9])FC2[-_ ]*(?:PPV[-_ ]*)?(\d{5,8})(?!\d)")DUPLICATE_TOLERANCE = 0.005DUPLICATE_FLOOR_SECONDS = 15.0@@ -813,6 +826,24 @@ def release_code_from_filename(name: str | None) -> str | None:mib = _KOREAN_MIB_FILENAME.match(stem)if mib and mib.group(1).upper() in KOREAN_MIB_PREFIXES:return normalise_code_key(f"{mib.group(1)}-{mib.group(2)}")+ return _titled_release_code(stem)+++def _titled_release_code(stem: str) -> str | None:+ """「番号 + 片名」:番号是名字里第一段半角字母数字,后面跟片名、女优或说明。++ `FC2` 商品号自带站名,写在名字哪里都认。其余番号只看第一段:再往后就是片名,+ 片名里的 `Rena n1042 clip`、`Part 18` 不是番号。中日文(`【中文字幕】`、女优名)+ 不成段,画质词跳过去接着看。+ """+ fc2 = _FC2_IN_TITLE.search(stem)+ if fc2:+ return normalise_code_key(f"FC2-PPV-{fc2.group(1)}")+ for token in _TITLE_TOKEN.findall(strip_promo_markers(stem)):+ if _QUALITY_TOKEN.match(token):+ continue+ head = _HYPHENATED_CODE.match(token)+ return release_code_from_text(head.group(0)) if head else Nonereturn Nonediff --git a/tests/test_jav_code_domain.py b/tests/test_jav_code_domain.pyindex c2eeb85e5..ecafa6f81 100644--- a/tests/test_jav_code_domain.py+++ b/tests/test_jav_code_domain.py@@ -332,6 +332,48 @@ class DeliveryFilenameTests(unittest.TestCase):self.assertIsNone(release_code_from_filename("heyzo.mp4"))+class TitledFilenameTests(unittest.TestCase):+ """片库自有的命名:番号后面跟片名、女优、字幕说明,前面可能有装饰符号。++ 2026-10-22 用本机账本 78520 段文件名对比:新认出且与已有 code 一致 463 段、冲突 0 段;+ code 为空的新认出 233 段,按前缀逐类核过未见误识别。两位序号与连写形态放进来时,+ `ShinoAoi-15`、`Nanshu969` 这类创作者名占了新增的三成。+ """++ def test_a_title_after_the_code_does_not_hide_it(self):+ for name, code in (("CAWD-987 片名と女優名.mp4", "CAWD-987"),+ ("GVH-520【中文字幕】片名.mp4", "GVH-520"),+ ("SSIS-001-C 片名.mp4", "SSIS-001"),+ ("ABW-358-CD1 片名.mp4", "ABW-358"),+ ("[FHD] MIDV-999 片名.mp4", "MIDV-999"),+ ("女優名 @DASD-409.mp4", "DASD-409"),+ ("300MIUM-1239 片名.mp4", "300MIUM-1239")):+ self.assertEqual(release_code_from_filename(name), code, name)++ def test_an_fc2_number_is_read_anywhere_in_the_name(self):+ for name in ("+++ FC2-PPV-1234567 片名 前編.mp4",+ "+++ FC2-PPV-1234567_part1.mp4",+ "【個人撮影】FC2PPV 1234567 片名.mp4",+ "片名 fc2-ppv-1234567.mp4"):+ self.assertEqual(release_code_from_filename(name), "FC2-PPV-1234567", name)++ def test_only_the_first_ascii_run_may_be_the_code(self):+ # 第一段之后就是片名:片名里的字母数字不是番号。+ self.assertIsNone(release_code_from_filename("Rena n1042 clip.mp4"))+ self.assertIsNone(release_code_from_filename("Morning ABP-123 talk.mp4"))++ def test_a_glued_or_underscored_handle_in_a_title_is_not_a_code(self):+ for name in ("南叔(Nanshu969)片名.zip", "推特网黄「LOOKS199」片名.mp4",+ "photo_83439@14-09-2021_07-01-18.jpg", "片名@yszl_0107.mp4",+ "片名....vip1129.mp4"):+ self.assertIsNone(release_code_from_filename(name), name)++ def test_a_short_episode_or_a_date_after_a_name_is_not_a_code(self):+ for name in ("ShinoAoi-15-1080p.mp4", "miru-10--Vccd67yz.mp4",+ "美女【Daidai-77】片名.mp4", "TG-2025-01-27-232751475.mp4"):+ self.assertIsNone(release_code_from_filename(name), name)++class WesternDateShapeTests(unittest.TestCase):"""西片是「厂牌/系列 + 发行日」,没有番号。diff --git a/tests/test_metadata_kmib.py b/tests/test_metadata_kmib.pyindex b9f98e414..0d26a8e39 100644--- a/tests/test_metadata_kmib.py+++ b/tests/test_metadata_kmib.py@@ -103,7 +103,9 @@ class KmibCatalogRuleTests(unittest.TestCase):self.assertEqual(release_code_from_filename(name), code, name)def test_the_mib_filename_rule_stays_inside_mib_prefixes(self):- self.assertIsNone(release_code_from_filename("ABC-123 some title.mp4"))+ # 下划线写法只对 MIB 前缀开放;「厂牌-序号 + 片名」的通用形态归片名规则。+ self.assertEqual(release_code_from_filename("YUJ_103 some title.mp4"), "YUJ-103")+ self.assertIsNone(release_code_from_filename("ABC_123 some title.mp4"))self.assertIsNone(release_code_from_filename("MIB.mp4"))def test_official_catalogue_prefixes_are_korean_mib(self):