Skip to content

armgit / peach

Public Imported from GitHub
0

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

fix(covers): 隔离来源故障并保留可重试封面状态

longmeidao1391af30afee
diff --git a/docs/REUSE.md b/docs/REUSE.md
index 379c9c88a..20a2c26c4 100644
--- a/docs/REUSE.md
+++ b/docs/REUSE.md
@@ -520,6 +520,12 @@ JAV 默认封面(官方封面/预览图)与视频默认大小(大图/
无快照的有码作品由封面入口复用现有 `DmmSource` 的 GraphQL 查询与精确身份核验;成功快照直接展开 DMM 图片候选,r18.dev 与 DMM 使用同一份目录证据。FC2 来源快照通过 `storage_original` 提取发行方存储原件,排除社区图床。目录查询沿用来源冷却,HTTP、网络与解析失败分别保留未取得状态。
+官方目录的连接与超时异常按 [HTTPX 异常层次](https://www.python-httpx.org/exceptions/)中的 `TransportError` 隔离,复用已固定的 `httpx 0.28.1`(BSD-3-Clause)与既有候选比较流程,不增加依赖或重试层。目录未作答时仍比较其他候选;没有可用图片时保留可重试状态,只有来源均有确定答复才记录无图。动作预算与编程错误继续向调用方传播。馆藏、库外新作与手动重探共用 `best_cover`,已安装图片和来源边车继续由原子安装入口管理。
+
+官方综合目录的聚合无图记忆按 `upgrade_rules.OFFICIAL_COVER_CATALOG_MISSES` 复用。规则版本不匹配的非 FC2 聚合记录在后续查询时重新核验;FC2 商品图记录、逐站无图记忆、有效图片、资料快照及个人记录保留。查询结果照常写回现有记忆文件,不启动额外全库采集。
+
+批量封面 CSV 用 `outcome` 区分 `not_found` 与 `unavailable`,`catalog_rules` 保存无图判据版本。续跑只跳过当前规则确认的目录无图记录;旧综合目录记录允许重探,FC2 的确定答复与成功来源记录继续复用。读取不改写原日志,实际执行时沿用原子日志写入。
+
MGS 专属发行先查自营商品目录,Prestige 番号复用 `metadata_routes.maker_sites` 路由后汇总集团官网与 MGS 图片;手上已有候选仍一起比较实际尺寸。专属目录未取得候选时才查综合目录,避免无关目录故障消耗整项预算。
正式封面和商品图以像素面积择优,同尺寸优先商品图,剧照预览保留末档;图片角色不让低清商品图覆盖更大的官方封面。
diff --git a/src/peach/jav_cover_fetch.py b/src/peach/jav_cover_fetch.py
index b744108ab..91a4df6f9 100644
--- a/src/peach/jav_cover_fetch.py
+++ b/src/peach/jav_cover_fetch.py
@@ -71,6 +71,7 @@ from peach.catalog_rules import (
normalise_code_key,
)
from peach.metadata_policy import SOURCE_SPECS
+from peach import upgrade_rules
AWS_LEGACY_DIGITAL = (
"https://awsimgsrc.dmm.co.jp/pics_dig/digital/video/{cid}/{cid}pl.jpg"
@@ -785,7 +786,7 @@ def _site_candidates(transport: HttpTransport, code: str, evidence: MetadataEvid
try:
live_evidence = dmm_evidence(transport, code, deadline=deadline)
candidates += list(live_evidence.candidates)
- except (Unavailable, SourcePaused):
+ except (Unavailable, SourcePaused, httpx.TransportError):
record('source_unanswered')
# 有成功快照时不重复打 r18;失败快照不算证据,仍允许联网刷新。
if ('r18dev' not in evidence.sources and not live_evidence.candidates
@@ -857,11 +858,16 @@ def best_cover(transport: HttpTransport, code: str, delay: float, *,
if not measured:
# 每张候选都回过话(404、太小、占位图、解不开)就是来源的确定答复,下次再问还是这几张:
# 交 `NotFound`,采集任务记下一周不问。有一张断在连接、5xx 或拒绝访问上才可能是这趟没问成。
- kind = Unavailable if diagnostics.get("unanswered") else NotFound
+ kind = Unavailable if diagnostics.get("unanswered") or diagnostics.get('source_unanswered') else NotFound
raise kind(_no_usable_official(diagnostics))
- return _download_best(transport, measured, record, minimum_width=minimum_width,
- minimum_quality=minimum_quality, minimum_pixels=minimum_pixels,
- deadline=deadline)
+ try:
+ return _download_best(transport, measured, record, minimum_width=minimum_width,
+ minimum_quality=minimum_quality, minimum_pixels=minimum_pixels,
+ deadline=deadline)
+ except NotFound as error:
+ if diagnostics.get('source_unanswered') or diagnostics.get('unanswered'):
+ raise Unavailable(str(error)) from error
+ raise
def _measure(transport: HttpTransport, candidates, record, *, minimum_width: int,
@@ -952,7 +958,7 @@ def _download_best(transport: HttpTransport, measured, record, *, minimum_width:
raise Unavailable("可用候选完整下载都失败")
-FIELDS = ("code", "result", "source", "width", "height", "kb", "url", "note")
+FIELDS = ("code", "result", "source", "width", "height", "kb", "url", "note", "outcome", "catalog_rules")
#: 判定为「所有渠道都没有」的落空,续跑时不必重来;连接类失败必须重试。
@@ -967,8 +973,20 @@ def settled_misses(log: Path) -> set[str]:
150 条落空,重探一遍就是好几个小时,而结论不会变。
"""
rows = logged_rows(log)
+
+ def confirmed(row):
+ outcome = str(row.get('outcome') or '')
+ if outcome not in ('', 'not_found'):
+ return False
+ if str(row.get('code') or '').strip().upper().startswith('FC2-PPV-'):
+ note = str(row.get('note') or '')
+ return not note.startswith(('Unavailable:', 'SourcePaused:', 'DeadlineExceeded:'))
+ return (outcome == 'not_found'
+ and str(row.get('catalog_rules')) == str(upgrade_rules.OFFICIAL_COVER_CATALOG_MISSES))
+
return {str(row.get("code") or "").strip() for row in rows
if row.get("result") == "未取得"
+ and confirmed(row)
and not TRANSIENT.search(str(row.get("note") or ""))
and str(row.get("code") or "").strip()}
@@ -1181,6 +1199,14 @@ def _replace_log_row(rows: list[dict], code: str, replacement: dict) -> None:
rows.append({field: replacement.get(field, "") for field in FIELDS})
+def failure_log_row(code: str, error: Exception) -> dict:
+ """批量封面的未取得记录,区分确定无图与本次未作答。"""
+ return {"code": code, "result": "未取得", "source": "", "width": "", "height": "",
+ "kb": "", "url": "", "note": f"{type(error).__name__}: {error}"[:80],
+ "outcome": 'not_found' if isinstance(error, NotFound) else 'unavailable',
+ "catalog_rules": upgrade_rules.OFFICIAL_COVER_CATALOG_MISSES}
+
+
def run(args: argparse.Namespace, handle: TaskRunHandle | None = None) -> int:
"""跑一趟封面抓取。`handle` 是任务中心的句柄,缺省时这一趟不登记。"""
handle = handle or inert_handle()
@@ -1307,9 +1333,7 @@ def run(args: argparse.Namespace, handle: TaskRunHandle | None = None) -> int:
print(f"[{index}/{len(todo)}] 保留 {code}:重探失败 "
f"{type(exc).__name__} {exc}", flush=True)
else:
- rows.append({"code": code, "result": "未取得", "source": "",
- "width": "", "height": "", "kb": "", "url": "",
- "note": f"{type(exc).__name__}: {exc}"[:80]})
+ rows.append(failure_log_row(code, exc))
print(f"[{index}/{len(todo)}] 未取得 {code}:"
f"{type(exc).__name__} {exc}", flush=True)
else:
diff --git a/src/peach/library_processing.py b/src/peach/library_processing.py
index be5fb7b21..122a7aa7a 100644
--- a/src/peach/library_processing.py
+++ b/src/peach/library_processing.py
@@ -1301,6 +1301,12 @@ class _MissCache:
if isinstance(codes, dict):
self._entries[source] = {code: float(stamp) for code, stamp in codes.items()
if isinstance(stamp, (int, float))}
+ if ('cover' in self._entries
+ and loaded.get('cover_catalog_rules') != upgrade_rules.OFFICIAL_COVER_CATALOG_MISSES):
+ # FC2 商品图不查询官方综合目录,单站答复与这一目录判据无关。
+ self._entries['cover'] = {
+ code: stamp for code, stamp in self._entries.get('cover', {}).items()
+ if code.upper().startswith('FC2-PPV-')}
def fresh(self, source, code, lineup=()):
"""`source` 对 `code` 说过「没有」且还在期内。`lineup` 是这条记忆当时应当问过的几站:
@@ -1314,6 +1320,7 @@ class _MissCache:
self._entries.setdefault(source, {})[code] = now
_save(self._path, {
'format': MISS_FORMAT, 'sites': self._sites,
+ 'cover_catalog_rules': upgrade_rules.OFFICIAL_COVER_CATALOG_MISSES,
'joined': {site: stamp for site, stamp in self._joined.items() if now - stamp < self._ttl},
'misses': {name: {key: stamp for key, stamp in codes.items() if now - stamp < self._ttl}
for name, codes in self._entries.items()}})
diff --git a/src/peach/upgrade_rules.py b/src/peach/upgrade_rules.py
index f9f513a5b..f383e6ce6 100644
--- a/src/peach/upgrade_rules.py
+++ b/src/peach/upgrade_rules.py
@@ -6,3 +6,4 @@ LOCAL_POSTERS = PREVIEWS + ':local'
PROCESSING = "processing-v2"
PUBLIC_SNAPSHOTS = 2
PROVIDER_EVIDENCE = 2
+OFFICIAL_COVER_CATALOG_MISSES = 1
diff --git a/tests/test_jav_covers.py b/tests/test_jav_covers.py
index bd893d3d0..07eb7a5da 100644
--- a/tests/test_jav_covers.py
+++ b/tests/test_jav_covers.py
@@ -91,6 +91,95 @@ class FetchRetryTests(unittest.TestCase):
self.assertNotIsInstance(raised.exception, covers.NotFound)
self.assertGreater(diagnostics.get('source_http_503', 0), 0)
+ def test_dmm_transport_failures_allow_other_official_candidates(self):
+ cached = covers.candidate_for('https://official.example/cached.jpg')
+ live = covers.candidate_for('https://official.example/live.jpg')
+ for error in (covers.httpx.ConnectError('TLS EOF'), covers.httpx.ReadTimeout('read timeout')):
+ for candidates in ((cached,), ()):
+ with self.subTest(error=type(error).__name__, cached=bool(candidates)):
+ diagnostics = {}
+ with patch.object(covers, 'dmm_evidence', side_effect=error), \
+ patch.object(covers, 'r18_evidence', return_value=covers.MetadataEvidence((live,))) as mirror:
+ winner, size, _ = covers.best_cover(
+ transport_for({cached.url: (200, jpeg(800, 540)), live.url: (200, jpeg(1600, 1080))}),
+ 'SSIS-057', 0, prior_candidates=candidates, diagnostics=diagnostics)
+ mirror.assert_called_once()
+ self.assertEqual((winner, size), (live, (1600, 1080)))
+ self.assertGreater(diagnostics.get('source_unanswered', 0), 0)
+
+ def test_catalog_failure_keeps_a_usable_cached_candidate(self):
+ cached = covers.candidate_for('https://official.example/cached.jpg')
+ with patch.object(covers, 'dmm_evidence', side_effect=covers.httpx.ConnectError('TLS EOF')), \
+ patch.object(covers, 'r18_evidence', return_value=covers.MetadataEvidence()):
+ winner, size, _ = covers.best_cover(transport_for({cached.url: (200, jpeg(800, 540))}),
+ 'SSIS-057', 0, prior_candidates=(cached,))
+ self.assertEqual((winner, size), (cached, (800, 540)))
+
+ def test_unanswered_catalogs_without_candidates_are_retryable(self):
+ diagnostics = {}
+ with patch.object(covers, 'dmm_evidence', side_effect=covers.httpx.ConnectError('TLS EOF')), \
+ patch.object(covers, 'r18_evidence', return_value=covers.MetadataEvidence()):
+ with self.assertRaises(covers.Unavailable) as caught:
+ covers.best_cover(transport_for({}), 'SSIS-057', 0, diagnostics=diagnostics)
+ self.assertNotIsInstance(caught.exception, covers.NotFound)
+ self.assertGreater(diagnostics.get('source_unanswered', 0), 0)
+
+ def test_unanswered_catalogs_with_rejected_candidates_are_retryable(self):
+ candidate = covers.candidate_for('https://official.example/missing.jpg')
+ for status in (403, 429, 503):
+ with self.subTest(status=status), \
+ patch.object(covers, 'dmm_evidence', side_effect=covers.Unavailable(f'HTTP {status}')), \
+ patch.object(covers, 'r18_evidence', return_value=covers.MetadataEvidence()):
+ with self.assertRaises(covers.Unavailable) as caught:
+ covers.best_cover(transport_for({}), 'SSIS-057', 0, prior_candidates=(candidate,))
+ self.assertNotIsInstance(caught.exception, covers.NotFound)
+
+ def test_unanswered_catalogs_with_only_animated_candidates_are_retryable(self):
+ candidate = covers.candidate_for('https://official.example/moving.gif')
+ frames = [Image.new('RGB', (800, 450), color) for color in ('red', 'blue')]
+ buffer = io.BytesIO()
+ frames[0].save(buffer, format='GIF', save_all=True, append_images=frames[1:])
+ with patch.object(covers, 'dmm_evidence', side_effect=covers.Unavailable('HTTP 503')), \
+ patch.object(covers, 'r18_evidence', return_value=covers.MetadataEvidence()):
+ with self.assertRaises(covers.Unavailable) as caught:
+ covers.best_cover(transport_for({candidate.url: (200, buffer.getvalue())}), 'SSIS-057', 0,
+ prior_candidates=(candidate,))
+ self.assertNotIsInstance(caught.exception, covers.NotFound)
+
+ def test_unanswered_image_probes_and_animated_candidates_are_retryable(self):
+ moving = covers.candidate_for('https://official.example/moving.gif')
+ offline = covers.candidate_for('https://official.example/offline.jpg')
+ frames = [Image.new('RGB', (800, 450), color) for color in ('red', 'blue')]
+ buffer = io.BytesIO()
+ frames[0].save(buffer, format='GIF', save_all=True, append_images=frames[1:])
+
+ def probe(_transport, candidate, **_options):
+ if candidate == offline:
+ raise covers.httpx.ConnectError('TLS EOF')
+ return (800, 450)
+
+ with patch.object(covers, 'probe_size', side_effect=probe):
+ with self.assertRaises(covers.Unavailable) as caught:
+ covers.best_cover(transport_for({moving.url: (200, buffer.getvalue())}), 'FC2-PPV-123456', 0,
+ prior_candidates=(moving, offline))
+ self.assertNotIsInstance(caught.exception, covers.NotFound)
+
+ def test_answered_catalogs_and_missing_candidates_are_definitive(self):
+ candidate = covers.candidate_for('https://official.example/missing.jpg')
+ with patch.object(covers, 'dmm_evidence', return_value=covers.MetadataEvidence()), \
+ patch.object(covers, 'r18_evidence', return_value=covers.MetadataEvidence()):
+ with self.assertRaises(covers.NotFound):
+ covers.best_cover(transport_for({}), 'SSIS-057', 0, prior_candidates=(candidate,))
+
+ def test_catalog_deadlines_and_programming_errors_propagate(self):
+ for error in (covers.DeadlineExceeded('deadline'), ValueError('invalid catalog state')):
+ with self.subTest(error=type(error).__name__), \
+ patch.object(covers, 'dmm_evidence', side_effect=error), \
+ patch.object(covers, 'r18_evidence') as mirror:
+ with self.assertRaises(type(error)):
+ covers.best_cover(transport_for({}), 'SSIS-057', 0)
+ mirror.assert_not_called()
+
def test_official_catalog_probe_preserves_source_cooldown_writes(self):
from unittest.mock import Mock
transport = Mock(return_value=_Response(429, b''))
@@ -873,11 +962,42 @@ class SettledMissTests(unittest.TestCase):
def test_a_confirmed_absence_is_not_retried(self):
self._log([{"code": "HEYZO-1380", "result": "未取得",
- "note": "所有渠道都没有候选"},
+ "note": "所有渠道都没有候选", "outcome": "not_found",
+ "catalog_rules": covers.upgrade_rules.OFFICIAL_COVER_CATALOG_MISSES},
{"code": "ABW-220", "result": "未取得",
- "note": "候选都不是可用封套"}])
+ "note": "候选都不是可用封套", "outcome": "not_found",
+ "catalog_rules": covers.upgrade_rules.OFFICIAL_COVER_CATALOG_MISSES}])
self.assertEqual(covers.settled_misses(self.log), {"HEYZO-1380", "ABW-220"})
+ def test_catalog_absence_logs_use_the_current_rules_and_preserve_fc2_memories(self):
+ self._log([{'code': 'SSIS-057', 'result': '未取得', 'note': 'NotFound: 所有渠道都没有候选'},
+ {'code': 'SSIS-058', 'result': '未取得', 'outcome': 'not_found', 'catalog_rules': 0},
+ {'code': 'FC2-PPV-1', 'result': '未取得', 'note': 'NotFound: 所有渠道都没有候选'},
+ {'code': 'FC2-PPV-2', 'result': '未取得', 'note': 'Unavailable: 官方封面地址都没有取到图片'},
+ {'code': 'FC2-PPV-3', 'result': '未取得', 'outcome': 'unavailable'}])
+ before = self.log.read_bytes()
+ self.assertEqual(covers.settled_misses(self.log), {'FC2-PPV-1'})
+ self.assertEqual(self.log.read_bytes(), before)
+
+ def test_unanswered_catalogs_are_not_settled_misses(self):
+ self._log([{'code': 'SSIS-057', 'result': '未取得', 'note': 'Unavailable: 官方目录查询未完成',
+ 'outcome': 'unavailable', 'catalog_rules': covers.upgrade_rules.OFFICIAL_COVER_CATALOG_MISSES}])
+ self.assertEqual(covers.settled_misses(self.log), set())
+
+ def test_legacy_csv_headers_keep_successes_and_fc2_absences_readable(self):
+ with self.log.open('w', encoding='utf-8-sig', newline='') as handle:
+ writer = csv.DictWriter(handle, fieldnames=('code', 'result', 'source', 'url', 'note'))
+ writer.writeheader()
+ writer.writerows([
+ {'code': 'SSIS-057', 'result': '未取得', 'note': 'NotFound: 所有渠道都没有候选'},
+ {'code': 'FC2-PPV-1', 'result': '未取得', 'note': 'NotFound: 所有渠道都没有候选'},
+ {'code': 'SSIS-058', 'result': '取得', 'source': 'official.example', 'url': 'https://official.example/cover.jpg'},
+ ])
+ before = self.log.read_bytes()
+ self.assertEqual(covers.settled_misses(self.log), {'FC2-PPV-1'})
+ self.assertEqual(covers.logged_rows(self.log)[2]['source'], 'official.example')
+ self.assertEqual(self.log.read_bytes(), before)
+
def test_a_transport_failure_is_always_retried(self):
"""一次超时不等于确认没有,不能靠它把番号永久踢出队列。"""
self._log([{"code": "SSNI-001", "result": "未取得",
@@ -1048,6 +1168,34 @@ class PendingCoverTests(unittest.TestCase):
class UpgradeExistingTests(unittest.TestCase):
+ def test_batch_logs_distinguish_unanswered_catalogs_from_confirmed_absence(self):
+ with tempfile.TemporaryDirectory() as tmp:
+ root = Path(tmp).resolve()
+ database, output, log = root / 'ledger.db', root / 'covers', root / 'covers.csv'
+ connection = sqlite3.connect(database)
+ connection.execute('CREATE TABLE asset(code TEXT, medium TEXT, location TEXT)')
+ connection.executemany('INSERT INTO asset VALUES(?,?,?)',
+ [('AAA-001', 'video', '115'), ('BBB-002', 'video', '115')])
+ connection.commit()
+ connection.close()
+ args = covers.build_parser().parse_args([
+ '--db', str(database), '--out', str(output), '--log', str(log), '--delay', '0', '--min-free', '0'])
+
+ def unavailable_or_missing(_transport, code, *_args, **_options):
+ if code == 'AAA-001':
+ raise covers.Unavailable('官方目录查询未完成')
+ raise covers.NotFound('所有渠道都没有候选')
+
+ with patch.object(covers, 'HttpxTransport'), \
+ patch.object(covers, 'best_cover', side_effect=unavailable_or_missing), \
+ patch.object(covers, 'system_volume', return_value=root), \
+ patch.object(covers.DiskGuard, 'check', return_value=100.0):
+ self.assertEqual(covers.run(args), 0)
+ rows = {row['code']: row for row in covers.logged_rows(log)}
+ self.assertEqual(rows['AAA-001']['outcome'], 'unavailable')
+ self.assertEqual(rows['BBB-002']['outcome'], 'not_found')
+ self.assertEqual(covers.settled_misses(log), {'BBB-002'})
+
def test_only_a_larger_candidate_replaces_the_cover_and_success_log(self):
with tempfile.TemporaryDirectory() as tmp:
root = Path(tmp)
diff --git a/tests/test_metadata_library.py b/tests/test_metadata_library.py
index 4e60f3dd6..b82d37585 100644
--- a/tests/test_metadata_library.py
+++ b/tests/test_metadata_library.py
@@ -1524,6 +1524,32 @@ class LibraryNfoTests(unittest.TestCase):
self.assertRaises(NotFound):
provider.cover('ORETD-618', covers)
+ def test_catalog_connection_failure_preserves_installed_cover_and_provenance(self):
+ from peach import jav_cover_fetch
+ from peach.library_processing import LibraryMetadataProvider
+ provider = LibraryMetadataProvider.__new__(LibraryMetadataProvider)
+ provider.transport = Mock(return_value=Mock(status=404, body=b''))
+ candidate = jav_cover_fetch.candidate_for('https://official.example/missing.jpg')
+ provider._official_candidates = Mock(return_value=(candidate,))
+ provider.community = Mock(side_effect=NotFound('社区来源都没有这个番号'))
+ covers = self.root / 'covers'
+ covers.mkdir()
+ target = covers / 'SSIS-057.jpg'
+ buffer = io.BytesIO()
+ Image.new('RGB', (800, 540), 'gray').save(buffer, format='JPEG')
+ target.write_bytes(buffer.getvalue())
+ provenance = target.with_suffix('.scraping.json')
+ saved = json.dumps({'source_url': 'https://official.example/installed.jpg', 'checked_at': 1})
+ provenance.write_text(saved, encoding='utf-8')
+ with patch.object(jav_cover_fetch, 'dmm_evidence', side_effect=jav_cover_fetch.httpx.ConnectError('TLS EOF')), \
+ patch.object(jav_cover_fetch, 'r18_evidence', return_value=jav_cover_fetch.MetadataEvidence()):
+ with self.assertRaises(jav_cover_fetch.Unavailable) as caught:
+ provider.cover('SSIS-057', covers)
+ self.assertNotIsInstance(caught.exception, NotFound)
+ provider.community.assert_called_once()
+ self.assertEqual(target.read_bytes(), buffer.getvalue())
+ self.assertEqual(provenance.read_text(encoding='utf-8'), saved)
+
def test_a_thumbnail_on_disk_is_asked_again_and_only_a_wider_cover_replaces_it(self):
"""缩略图不算有了封面:发行方那里常常还留着原图,问来的更宽才换。"""
from peach.jav_cover_fetch import Candidate
@@ -2386,13 +2412,37 @@ class LibraryNfoTests(unittest.TestCase):
'cover': {'STP-26232': stamp}, 'fc2cmadb-cast': {'FC2-PPV-1': stamp}}}), encoding='utf-8')
cache = _MissCache(path)
self.assertTrue(cache.fresh('r18dev', 'STP-26232'))
- self.assertTrue(cache.fresh('cover', 'STP-26232', ('mgstage', 'javdb', 'r18dev')))
+ self.assertFalse(cache.fresh('cover', 'STP-26232', ('mgstage', 'javdb', 'r18dev')))
self.assertTrue(cache.fresh('fc2cmadb-cast', 'FC2-PPV-1'), 'FC2 演员复核脚本记的键照旧作数')
self.assertFalse(cache.fresh('community', 'STP-26232'))
path.write_text(json.dumps({'r18dev': {'STP-26232': stamp}}), encoding='utf-8')
self.assertFalse(_MissCache(path).fresh('r18dev', 'STP-26232'))
+ def test_official_cover_catalog_misses_use_the_current_rule_generation(self):
+ from peach import upgrade_rules
+ from peach.library_processing import MISS_FORMAT, _MissCache
+ path = self.root / 'cover-misses.json'
+ old = {'format': MISS_FORMAT, 'sites': ['dmm', 'r18dev', 'fc2'], 'joined': {},
+ 'misses': {'cover': {'SSIS-057': 1000.0, 'FC2-PPV-1': 1000.0},
+ 'dmm': {'SSIS-057': 1000.0}, 'r18dev': {'SSIS-057': 1000.0}}}
+ for generation in (None, upgrade_rules.OFFICIAL_COVER_CATALOG_MISSES - 1):
+ with self.subTest(generation=generation):
+ path.write_text(json.dumps({**old, 'cover_catalog_rules': generation}), encoding='utf-8')
+ cache = _MissCache(path, now=lambda: 1100.0)
+ self.assertFalse(cache.fresh('cover', 'SSIS-057'))
+ self.assertTrue(cache.fresh('cover', 'FC2-PPV-1'))
+ self.assertTrue(cache.fresh('dmm', 'SSIS-057'))
+ self.assertTrue(cache.fresh('r18dev', 'SSIS-057'))
+ self.assertEqual(json.loads(path.read_text(encoding='utf-8'))['misses'], old['misses'])
+ cache.record('cover', 'SSIS-057')
+ restored = _MissCache(path, now=lambda: 1200.0)
+ self.assertTrue(restored.fresh('cover', 'SSIS-057'))
+ self.assertTrue(restored.fresh('cover', 'FC2-PPV-1'))
+ self.assertTrue(restored.fresh('dmm', 'SSIS-057'))
+ saved = json.loads(path.read_text(encoding='utf-8'))
+ self.assertEqual(saved['cover_catalog_rules'], upgrade_rules.OFFICIAL_COVER_CATALOG_MISSES)
+
@windows_ledger_roots
def test_a_stage_asks_only_the_sites_that_have_not_said_no(self):
"""综合索引那一档里 AVBase 与 JavBus 说过没有,javdb 没说过:这一档只问 javdb。"""