Skip to content

armgit / peach

Public Imported from GitHub
0

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

fix(web): 社区源对官方自动落库值的异议不占复核队列

peach-patcher9bc3ba05f91d
diff --git a/src/peach/web_review.py b/src/peach/web_review.py
index bdd3feae7..e69d2e85e 100644
--- a/src/peach/web_review.py
+++ b/src/peach/web_review.py
@@ -36,6 +36,7 @@ from .metadata_auto_apply import (
METADATA_FIELD_COLUMNS,
REVIEW_APPLY_LIMIT,
_apply_metadata_candidate,
+ _codes_matching,
_entity_identity_key,
_fold_genre_decisions,
_landing_scope,
@@ -50,7 +51,13 @@ from .metadata_auto_apply import (
overwrite_requires_review,
refresh_current_values,
)
-from .metadata_policy import FALLBACK_SOURCES, SOURCE_SPECS, preferred_tag_source
+from .metadata_policy import (
+ CHAIN_OFFICIAL,
+ FALLBACK_SOURCES,
+ SOURCE_SPECS,
+ preferred_tag_source,
+ source_tier,
+)
from .previews import logo_key
from .review_csv import CANDIDATE_PREFIX, read_candidates
@@ -341,7 +348,9 @@ def _metadata_queue_rows(connection, rows: list[dict],
overrides = {row['item_key'] for row in rows if overwrite_requires_review(connection, row)}
filtered = _drop_community_challenges_to_official(connection, rows)
filtered = _drop_fallback_challenges(_drop_shop_side_dissent(filtered))
- kept = {row['item_key'] for row in filtered} | overrides
+ # 社区源对 official 自动落库值的异议,连 NFO 核查的覆盖复核标记也不放行。
+ dismissed = _community_challenges_to_official_owner(connection, rows)
+ kept = ({row['item_key'] for row in filtered} | overrides) - dismissed
return [row for row in rows if row['item_key'] in kept], genre_decisions
@@ -553,6 +562,47 @@ def _drop_community_challenges_to_official(connection, rows: list[dict]) -> list
return [row for row in rows if keep(row)]
+def _official_owner(owner: str) -> bool:
+ """归属串是不是 official 来源的自动落库:`auto:<来源>` 且来源在链上属 official 档。"""
+ kind, _, source = str(owner or "").partition(":")
+ return kind == "auto" and bool(source) and source_tier(source) == CHAIN_OFFICIAL
+
+
+def _community_challenges_to_official_owner(connection, rows: list[dict]) -> set[str]:
+ """只有社区源异议、而现值由 official 源自动写入的行,不占复核队列。
+
+ `_drop_community_challenges_to_official` 只认 `review_decision` note 里记下的取值,
+ NFO 核查(ADR-0108)标了 `requires_review` 的行会经 `overrides` 绕过它。本函数认
+ `asset.field_owners`:目标资产的这一格全部归 `auto:<official 来源>`,候选全部来自
+ official 之下的来源(javdb、avbase、javbus……),就按 `SOURCE_SPECS` 的信任次序视为
+ 已定,不交给人。只读判断,不写 `review_decision`。归属为 user/review/空、
+ 没有字段归属的多值字段(出演者、标签)、或任一候选是 official/本地 NFO 的,仍进队列。
+ """
+ dismissed: set[str] = set()
+ for row in rows:
+ field = str(row.get("field") or "").strip()
+ column = METADATA_FIELD_COLUMNS.get(field)
+ if not column or not str(row.get("current_value") or "").strip():
+ continue
+ sources = {str(c.get("source") or "").strip() for c in row.get("candidates") or []}
+ if not sources or any(source_tier(source) <= CHAIN_OFFICIAL for source in sources):
+ continue
+ asset_id = str(row.get("asset_id") or "").strip()
+ if row.get("asset_path") and asset_id.isdigit():
+ found = connection.execute(
+ "SELECT id,field_owners FROM asset WHERE id=?", (int(asset_id),)).fetchall()
+ else:
+ code = str(row.get("code") or "").strip()
+ found = _codes_matching(connection, [code, str(row.get("query") or code)],
+ "id,code,field_owners") if code else []
+ if not found:
+ continue
+ if all(_official_owner(owner_of(asset["field_owners"], column)) for asset in found):
+ dismissed.add(str(row.get("item_key") or ""))
+ dismissed.discard("")
+ return dismissed
+
+
#: MGS 是转售店。同一部片它的商品页跟片商自己那份有三处系统性差异:标题尾巴上缀着
#: 店铺加赠(`【MGSだけのおまけ映像付き+5分】`),发行日期写的是它自己的先行配信日
#: (本机实测早 8 天上下),系列写的是店内货架名(`しろうと女子のAV初体験`,片商那边
diff --git a/tests/test_web_review.py b/tests/test_web_review.py
index 2062c8b7f..ae717811f 100644
--- a/tests/test_web_review.py
+++ b/tests/test_web_review.py
@@ -28,7 +28,9 @@ from peach.field_owners import (
EXPECTED_REVISION_FIELD,
USER_MANUAL,
RevisionConflict,
+ auto_owner,
owner_of,
+ review_owner,
write_owned_fields,
)
@@ -227,6 +229,22 @@ class ReviewQueueTests(unittest.TestCase):
"VALUES(?,'local',?,?,'video',?)", (aid, f"{folder}/{name}", name, code))
con.commit(); con.close()
+ def _owned(self, aid, code, owner, value="官方厂牌", field="studio", name=None):
+ self._asset(aid, code, name or f"{code}.mp4")
+ con = sqlite3.connect(self.db_path)
+ with con:
+ write_owned_fields(con, [aid], {field: value}, owner)
+ con.close()
+
+ def _challenge(self, code, field="studio", current="官方厂牌", candidates=None):
+ key = f"{code}:{field}"
+ self.write_metadata_rows([{
+ "item_key": key, "code": code, "field": field, "current": current,
+ "candidates": candidates or [
+ {"source": "javdb", "value": "社区写法", "requires_review": True}],
+ }])
+ return key
+
def _auto(self):
return auto_apply_metadata(self.contract.database, self.candidates)
@@ -2194,6 +2212,73 @@ class ReviewQueueTests(unittest.TestCase):
])
self.assertEqual(self.queue_keys("metadata_fields"), ["GGG"])
+ def test_javdb_only_challenge_to_official_auto_value_is_dismissed(self):
+ """现值归 official 源自动写入时,社区源异议不进队列,也不写决定。"""
+ self._owned(500, "OFF-001", auto_owner("r18dev"))
+ self._challenge("OFF-001")
+ self.assertEqual(self.queue_keys("metadata_fields"), [])
+ con = sqlite3.connect(self.db_path)
+ try:
+ self.assertEqual(con.execute("SELECT count(*) FROM review_decision").fetchone()[0], 0)
+ finally:
+ con.close()
+
+ def test_release_date_from_makers_is_dismissed_too(self):
+ self._owned(501, "OFF-002", auto_owner("makers"), value="2024-01-02", field="release_date")
+ self._challenge("OFF-002", field="release_date", current="2024-01-02", candidates=[
+ {"source": "javdb", "value": "2024-01-05", "requires_review": True}])
+ self.assertEqual(self.queue_keys("metadata_fields"), [])
+
+ def test_user_review_community_and_unowned_values_stay_in_the_queue(self):
+ cases = (("OWN-001", USER_MANUAL), ("OWN-002", review_owner("javdb")),
+ ("OWN-003", auto_owner("avbase")))
+ keys = []
+ for index, (code, owner) in enumerate(cases):
+ self._owned(510 + index, code, owner)
+ keys.append(f"{code}:studio")
+ self._asset(513, "OWN-004", "OWN-004.mp4")
+ con = sqlite3.connect(self.db_path)
+ with con:
+ con.execute("UPDATE asset SET studio='官方厂牌' WHERE id=513")
+ con.close()
+ keys.append("OWN-004:studio")
+ self.write_metadata_rows([{
+ "item_key": key, "code": key.split(":")[0], "field": "studio", "current": "官方厂牌",
+ "candidates": [{"source": "javdb", "value": "社区写法", "requires_review": True}],
+ } for key in keys])
+ self.assertEqual(sorted(self.queue_keys("metadata_fields")), sorted(keys))
+
+ def test_official_candidate_in_the_row_keeps_it_for_review(self):
+ self._owned(520, "OFF-003", auto_owner("r18dev"))
+ key = self._challenge("OFF-003", candidates=[
+ {"source": "javdb", "value": "社区写法", "requires_review": True},
+ {"source": "dmm", "value": "另一官方写法", "requires_review": True}])
+ self.assertEqual(self.queue_keys("metadata_fields"), [key])
+
+ def test_fields_without_owner_tracking_are_untouched(self):
+ self._asset(530, "OFF-004", "OFF-004.mp4")
+ key = self._challenge("OFF-004", field="performers", current="某人", candidates=[
+ {"source": "javdb", "value": "别人", "requires_review": True}])
+ self.assertIn(key, self.queue_keys("metadata_fields"))
+
+ def test_library_rows_check_the_owner_of_their_own_asset(self):
+ self._owned(540, "LIB-001", auto_owner("r18dev"), name="LIB-001 A.mp4")
+ self._owned(541, "LIB-001", USER_MANUAL, name="LIB-001 B.mp4")
+ rows = []
+ for aid in (540, 541):
+ key = f"asset:{aid}:studio"
+ rows.append({"item_key": key, "code": "LIB-001", "query": "LIB-001",
+ "asset_id": str(aid), "asset_path": f"/x/{aid}.mp4", "field": "studio",
+ "field_label": "studio", "current_value": "官方厂牌",
+ "candidates_json": json.dumps([self._candidate(
+ {"item_key": key, "code": "LIB-001"}, 0, "javdb",
+ {"source": "javdb", "value": "社区写法", "requires_review": True})],
+ ensure_ascii=False),
+ "source_count": "1", "source_profile": "library", "status": "candidate",
+ "size_gb": "", "videos": "1", "fetched_at": ""})
+ self.write_metadata_candidates(rows)
+ self.assertEqual(self.queue_keys("metadata_fields"), ["asset:541:studio"])
+
def test_metadata_candidates_that_repeat_the_current_value_never_queue(self):
"""复核的成本是注意力:和现值一模一样的行会把真正要判的淹掉。