Peach: Local-first video metadata scraper and media manager.
fix(review): 素人片的片中称呼在认人 Wiki 给出艺名时不算证据
longmeidao59816f574f37
diff --git a/docs/adr/0144-amateur-chain-asks-the-name-wikis-for-the-cast.md b/docs/adr/0144-amateur-chain-asks-the-name-wikis-for-the-cast.mdindex 3370abbae..7829950d5 100644--- a/docs/adr/0144-amateur-chain-asks-the-name-wikis-for-the-cast.md+++ b/docs/adr/0144-amateur-chain-asks-the-name-wikis-for-the-cast.md@@ -26,7 +26,7 @@ Seesaa 上的素人系総合 Wiki 与 av_neme 就是把素人作品对到艺名**二、只在缺演员时问。** 这一行缺演员、链上有 Wiki 时,MGStage 把标量给齐了也不停(`settles(..., wants_cast=True)`),接着问 Wiki;一个 Wiki 给出演员就不再问另一个。两个都没给(没有这部片、连不上),MGStage 给的字段已经够了就停,不为此落到综合索引——javdb 那条全进程共用的 3 秒队列正是要省的。已有演员的行不问 Wiki。-**三、演员栏上两个 Wiki 排在官方档前面。** `FIELD_SOURCE_PRIORITY["performers"]` 在 fc2cmadb、fc2ppvdb 之后加上 sougouwiki、av_neme。只有素人番号问得到它们,提前不影响别的类型;标题、厂牌、日期仍听 MGStage。+**三、演员栏上两个 Wiki 排在官方档前面。** `FIELD_SOURCE_PRIORITY["performers"]` 在 fc2cmadb、fc2ppvdb 之后加上 sougouwiki、av_neme。只有素人番号问得到它们,提前不影响别的类型;标题、厂牌、日期仍听 MGStage。称呼里一个艺名都剪不出的(`早見さん`),在别家给出艺名时不算证据,沿用 ADR-0079 对 FC2 的同一处理(`_without_descriptive_performers`,记进 note 的 `descriptive_dropped`);没有别家给艺名时照旧交人工。**四、取页走正式链的传输。** `LibraryMetadataProvider.wiki` 用资料处理那一份 `HostLimitedTransport`(Peach 代理设置、全进程主机间隔 2 秒),页缓存放在数据根 `sources/library-metadata/seesaa-pages`,同厂牌的下一部片直接读缓存里的厂牌表。每站请求上限 2000 次,每取一页前看这部片的动作预算(90 秒)。没找到(含站内搜索翻完仍未命中的 `incomplete_search`)记成「没有」,7 天内不再问;连不上记成来源失败,下一轮重试。diff --git a/src/peach/metadata_auto_apply.py b/src/peach/metadata_auto_apply.pyindex 9e0c1d4f0..eb2318282 100644--- a/src/peach/metadata_auto_apply.py+++ b/src/peach/metadata_auto_apply.py@@ -58,6 +58,7 @@ from .metadata_policy import (CHAIN_OFFICIAL, FALLBACK_SOURCES, LOCAL_NFO_SOURCE, SOURCE_SPECS,blacklisted, chain_rank, preferred_tag_source, source_tier,)+from .metadata_routes import classifyfrom .review_csv import read_candidatesfrom .javdb_identity import current_candidate as current_javdb_candidatefrom .sources import fc2@@ -438,6 +439,9 @@ def _without_descriptive_performers(code: str, field: str, candidates: list[dictresolve=None) -> tuple[list[dict], list[dict]]:"""FC2 出演者候选里一个艺名都没有的那些不算证据(ADR-0079),剩下的照常比。+ 素人番号同理(ADR-0144):MGStage、r18.dev 写 `早見さん`、`Mana(23)` 这类片中称呼,认人 Wiki+ 给出艺名时,不该让称呼把整行拖进人工。+返回 `(留下的候选, 被剔掉的候选)`。全都剔光时原样返回:那一行交给自动否决判,不在这里把它变成「没有候选」。@@ -446,7 +450,7 @@ def _without_descriptive_performers(code: str, field: str, candidates: list[dict两家各执一词的行交人工,不因为少了一家就替人认了。`飛鳥ちゃん` 与 `飛鳥` 到这里之前已由 `_with_honorific_echoes` 折成两家一致。"""- if field != "performers" or not _FC2_CODE.match(code):+ if field != "performers" or not (_FC2_CODE.match(code) or classify(code) == "amateur"):return candidates, []dropped = [c for c in candidates if _names_nobody(c, resolve)]kept = [c for c in candidates if not _names_nobody(c, resolve)]diff --git a/tests/test_web_review.py b/tests/test_web_review.pyindex 5dd6849d0..3db9e8ffd 100644--- a/tests/test_web_review.py+++ b/tests/test_web_review.py@@ -1011,6 +1011,55 @@ class ReviewQueueTests(unittest.TestCase):con.close()self.assertEqual(note["rule"], "adr-0038-chain-mgstage")+ def _landed_cast(self, asset_id, item_key):+ con = sqlite3.connect(self.db_path)+ try:+ landed = [row[0] for row in con.execute(+ "SELECT e.canonical_name FROM entity e JOIN asset_entity ae ON ae.entity_id=e.id "+ "WHERE ae.asset_id=? AND ae.role='performer'", (asset_id,))]+ row = con.execute("SELECT note FROM review_decision WHERE item_key=?", (item_key,)).fetchone()+ finally:+ con.close()+ return landed, json.loads(row[0]) if row else None++ def test_the_name_wiki_names_the_amateur_cast_over_the_store_nickname(self):+ """素人片 MGStage 写片中称呼、认人 Wiki 写艺名:落艺名,称呼记进被压下的取值(ADR-0144)。"""+ self._asset(130, "300NTK-619", "300NTK-619.mp4")+ self.write_metadata_rows([+ {"item_key": "NTK", "field": "performers", "current": "", "code": "300NTK-619",+ "candidates": [{"source": "mgstage", "value": [{"name": "まいな"}], "display": "まいな"},+ {"source": "sougouwiki", "value": [{"name": "優梨まいな"}], "display": "優梨まいな"}]},+ ])+ self.assertEqual(self._auto()["applied"], 1)+ landed, note = self._landed_cast(130, "NTK")+ self.assertEqual(landed, ["優梨まいな"])+ self.assertEqual(note["rule"], "adr-0038-chain-sougouwiki")+ self.assertEqual(note["overruled"], [{"source": "mgstage", "value": "まいな"}])++ def test_the_name_wiki_names_the_cast_over_an_honorific_from_r18dev(self):+ """r18.dev 写 `早見さん` 这种带称谓的片中称呼时,同样落 Wiki 给的艺名(ADR-0144)。"""+ self._asset(131, "230ORETD-615", "230ORETD-615.mp4")+ self.write_metadata_rows([+ {"item_key": "ORETD", "field": "performers", "current": "", "code": "230ORETD-615",+ "candidates": [{"source": "r18dev", "value": [{"name": "早見さん"}], "display": "早見さん"},+ {"source": "av_neme", "value": [{"name": "早美れむ"}], "display": "早美れむ"}]},+ ])+ self._auto()+ landed, note = self._landed_cast(131, "ORETD")+ self.assertEqual(landed, ["早美れむ"])+ self.assertEqual(note["source"], "av_neme")+ self.assertEqual(note["descriptive_dropped"], [{"source": "r18dev", "value": "早見さん"}])++ def test_a_store_nickname_without_a_wiki_name_still_goes_to_review(self):+ """没有别家给艺名时,片中称呼照旧交人工,不替人认(ADR-0144 只在有艺名时剔掉称呼)。"""+ self._asset(132, "230ORETD-615", "230ORETD-615.mp4")+ self.write_metadata_rows([+ {"item_key": "ORETD", "field": "performers", "current": "", "code": "230ORETD-615",+ "candidates": [{"source": "r18dev", "value": [{"name": "早見さん"}], "display": "早見さん"}]},+ ])+ self.assertEqual(self._auto()["applied"], 0)+ self.assertEqual(self.queue_keys("metadata_fields"), ["ORETD"])+def test_a_fallback_source_does_not_challenge_a_value_the_ledger_has(self):"""兜底来源改不动账本已有的值,也不必让人看一眼(ADR-0038)。"""