Skip to content

armgit / peach

Public Imported from GitHub
0

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

fix(upgrade): 允许媒体问题保留并完成后继

zouyongheb34952a12802
diff --git a/src/peach/upgrade_repairs.py b/src/peach/upgrade_repairs.py
index de93ec47c..4393999b7 100644
--- a/src/peach/upgrade_repairs.py
+++ b/src/peach/upgrade_repairs.py
@@ -420,7 +420,7 @@ def _media_run(contract, key: str, handle) -> dict:
if not active():
raise JobPaused('服务重启后继续') from None
raise
- if result.get('status') not in ('complete', 'succeeded') or result.get('issue_count'):
+ if result.get('status') not in ('complete', 'succeeded') and result.get('outcome') != 'partial':
raise RuntimeError(result.get('error') or '影片升级补全未完成,请在任务中心查看后重试')
return {'outcome': '影片升级补全完成', 'name': title, 'asset_id': asset_id}
diff --git a/tests/test_upgrade_repairs.py b/tests/test_upgrade_repairs.py
index d8e99d5da..844904716 100644
--- a/tests/test_upgrade_repairs.py
+++ b/tests/test_upgrade_repairs.py
@@ -494,6 +494,16 @@ class UpgradeRepairTests(unittest.TestCase):
receipt['queued'] = {row.key: index for index, row in enumerate(batch)}
self.assertEqual(len(self.service._plan(receipt)), 6)
+ def test_media_handler_finishes_when_only_media_issues_remain(self):
+ from peach.settings_file import load_config
+ self.contract.upgrade_config = load_config(environ={'PEACH_DATA_ROOT': str(self.root)})
+ with patch('peach.library_processing.process_library', return_value={
+ 'status': 'failed', 'outcome': 'partial', 'issue_count': 2,
+ 'retryable_asset_ids': [1]}):
+ result = upgrade_repairs._media_run(
+ self.contract, 'upgrade-library:processing-v2:1', Mock())
+ self.assertEqual(result['outcome'], '影片升级补全完成')
+
def test_media_handler_resumes_its_own_checkpoint(self):
from peach.settings_file import load_config
self.contract.upgrade_config = load_config(environ={'PEACH_DATA_ROOT': str(self.root)})