Peach: Local-first video metadata scraper and media manager.
fix(upgrade): 文字补修只派发相关资产并保留延后范围
longmeidao0d9559a22f82
diff --git a/src/peach/upgrade_repairs.py b/src/peach/upgrade_repairs.pyindex 21625d030..b1beafaa2 100644--- a/src/peach/upgrade_repairs.py+++ b/src/peach/upgrade_repairs.py@@ -212,7 +212,11 @@ class UpgradeRepairs:'media_ids': sorted(set(failed + [row['id'] for row in plan['codes']]+ previous.get('media_ids', [])+ plan['text']['asset_ids'])),- 'queued': dict(previous.get('queued', {})), 'prior_revision': CATALOG_REVISION if prior else None}+ 'queued': dict(previous.get('queued', {})),+ 'deferred': list(previous.get('deferred', [])),+ 'dispatch_complete': bool(previous.get('dispatch_complete')) and not plan['text']['asset_ids'],+ 'text_only': prior is not None,+ 'prior_revision': CATALOG_REVISION if prior else None}connection.execute('INSERT INTO ledger_upgrade_repair(id,applied_at,result_json) VALUES(?,?,?)',(REVISION, str(time.time()), json.dumps(receipt, ensure_ascii=False)))atomic_write_text(self.receipt, json.dumps(receipt, ensure_ascii=False))@@ -254,7 +258,8 @@ class UpgradeRepairs:maximum = connection.execute('SELECT coalesce(max(id),0) FROM entity').fetchone()[0]planned = [row for row in seed_followup.plan(connection, since_entity_id=maximum) if row.key not in seen]planners = (performer_alias_followup, studio_followup, performer_profile_followup,- creator_identity_followup, avatar_followup) if _people_allowed(config) else ()+ creator_identity_followup, avatar_followup) if (+ not receipt.get('text_only') and _people_allowed(config)) else ()for planner in planners:remaining = MAX_FOLLOWUPS - len(planned)if remaining <= 0:diff --git a/tests/test_upgrade_repairs.py b/tests/test_upgrade_repairs.pyindex feb250fff..aff275f3b 100644--- a/tests/test_upgrade_repairs.py+++ b/tests/test_upgrade_repairs.py@@ -83,6 +83,31 @@ class UpgradeRepairTests(unittest.TestCase):planned=self.service._plan(receipt)self.assertEqual([row.key for row in planned],['upgrade-library:processing-v2:text-1:1'])+ def test_text_only_dispatch_does_not_plan_unrelated_people(self):+ from peach.settings_file import load_config+ self.service.config=load_config(environ={'PEACH_DATA_ROOT':str(self.root)})+ self.damaged_asset()+ receipt={'queued':{},'media_ids':[1],'text_media_ids':[1],'text_only':True}+ with patch('peach.library_processing._people_allowed',return_value=True), patch(+ 'peach.seed_followup.plan',return_value=[]), patch('peach.media_sources.cost_for',return_value='free'), patch(+ 'peach.performer_alias_followup.stock',side_effect=AssertionError('不能重放人物补修')):+ planned=self.service._plan(receipt)+ self.assertEqual([row.key for row in planned],['upgrade-library:processing-v2:text-1:1'])++ def test_completed_catalog_dispatch_preserves_deferred_work_across_text_revision(self):+ with patch.object(upgrade_repairs,'REVISION',upgrade_repairs.CATALOG_REVISION):+ self.service.prepare()+ receipt=upgrade_repairs._read(self.service.receipt)+ receipt.update(queued={'old-work':99},media_ids=[42],deferred=[42],dispatch_complete=True)+ self.service._save_receipt(receipt)+ self.service.prepare()+ receipt=upgrade_repairs._read(self.service.receipt)+ self.assertTrue(receipt['text_only'])+ self.assertTrue(receipt['dispatch_complete'])+ self.assertEqual(receipt['queued'],{'old-work':99})+ self.assertEqual(receipt['media_ids'],[42])+ self.assertEqual(receipt['deferred'],[42])+def test_text_rule_preserves_inherited_running_or_cancelled_media_work(self):from peach.settings_file import load_configself.service.config=load_config(environ={'PEACH_DATA_ROOT':str(self.root)})