Peach: Local-first video metadata scraper and media manager.
fix(media): 升级旧修复任务断点中的布局失败结论
longmeidaobfd9fb0de025
diff --git a/src/peach/web_media_repair.py b/src/peach/web_media_repair.pyindex ed218b890..555fd84ee 100644--- a/src/peach/web_media_repair.py+++ b/src/peach/web_media_repair.py@@ -144,7 +144,7 @@ def _survey(contract, job, job_id: str, rows, cache: dict[str, str]) -> list[tupfound.append((asset_id, raw, kind))cache[key] = kind or CLEAN_save_cache(contract, cache)- if not job.checkpoint(job_id, survey_checked=index, survey_cache=dict(cache)):+ if not job.checkpoint(job_id, survey_checked=index, survey_cache=dict(cache), survey_cache_version=2):raise InterruptedError('媒体检查已停止')_advance(job, job_id, index, skipped=False)return found@@ -268,9 +268,13 @@ def run_media_repair(contract, job_id: str, scope: tuple[str, list]) -> None:"""一轮完整的批量修复。异常由 `BackgroundJob` 变成可轮询的失败状态。"""job = contract.media_repair_jobcache = _load_cache(contract)- cache.update((job.snapshot() or {}).get('survey_cache') or {})- rows = _candidates(contract, scope)previous = job.snapshot() or {}+ resumed_cache = previous.get('survey_cache') or {}+ if previous.get('survey_cache_version', 1) == 1:+ resumed_cache = {key: LEGACY_UNAVAILABLE if value == UNAVAILABLE else value+ for key, value in resumed_cache.items()}+ cache.update(resumed_cache)+ rows = _candidates(contract, scope)job.update(job_id, stage="扫描", total=len(rows), checked=previous.get('survey_checked', 0))found = _survey(contract, job, job_id, rows, cache)_save_cache(contract, cache)diff --git a/tests/test_web_media_repair.py b/tests/test_web_media_repair.pyindex 7d4e35e50..49194d252 100644--- a/tests/test_web_media_repair.py+++ b/tests/test_web_media_repair.py@@ -300,6 +300,26 @@ class MediaRepairRunTests(unittest.TestCase):self.assertEqual(self.transcodes.asked, [])self.assertEqual(self.store.repaired, [])+ def test_a_resumed_old_checkpoint_rechecks_failed_tail_layouts(self):+ (self.media / 'favourite.mp4').write_bytes(tail_mp4())+ cache = {rm_repair._key(asset_id, self.media / name): rm_repair.CLEAN+ for asset_id, name in ((1, 'seldom.mp4'), (2, 'favourite.mp4'),+ (3, 'fine.mp4'), (6, 'cut.mp4'))}+ cache[rm_repair._key(2, self.media / 'favourite.mp4')] = rm_repair.UNAVAILABLE+ original = rm_repair.run_media_repair++ def resumed(contract, job_id, scope):+ contract.media_repair_job.update(job_id, survey_cache=cache)+ original(contract, job_id, scope)++ with mock.patch.object(rm_repair, 'run_media_repair', resumed):+ state = self.run_once()++ self.assertEqual(state['repaired'], 1)+ self.assertEqual(self.transcodes.asked, ['favourite.mp4'])+ self.assertEqual(self.store.repaired, [2])+ self.assertEqual(self.contract.media_repair_job.snapshot()['survey_cache_version'], 2)+def test_a_changed_file_is_judged_again(self):"""结论跟着文件的大小和改动时间走:换了内容,上一轮的结论就不作数。"""self.run_once()