Skip to content

armgit / peach

Public Imported from GitHub
0

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

fix(upgrade): 补全后继遇来源冷却暂缓时仍按失败等重试

longmeidao825108de61bd
diff --git a/src/peach/upgrade_repairs.py b/src/peach/upgrade_repairs.py
index 4393999b7..2632131f1 100644
--- a/src/peach/upgrade_repairs.py
+++ b/src/peach/upgrade_repairs.py
@@ -420,7 +420,11 @@ def _media_run(contract, key: str, handle) -> dict:
if not active():
raise JobPaused('服务重启后继续') from None
raise
- if result.get('status') not in ('complete', 'succeeded') and result.get('outcome') != 'partial':
+ # 走完全程只剩这部片自己的问题(坏文件探不出时长、抽不出帧)算完成;有来源冷却暂缓的
+ # 还要等来源放开再补,留成失败交给后继重试。
+ finished = result.get('status') in ('complete', 'succeeded') or (
+ result.get('outcome') == 'partial' and not result.get('paused_count'))
+ if not finished:
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 844904716..9e503699e 100644
--- a/tests/test_upgrade_repairs.py
+++ b/tests/test_upgrade_repairs.py
@@ -504,6 +504,15 @@ class UpgradeRepairTests(unittest.TestCase):
self.contract, 'upgrade-library:processing-v2:1', Mock())
self.assertEqual(result['outcome'], '影片升级补全完成')
+ def test_media_handler_retries_later_when_a_source_was_cooling_down(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, 'paused_count': 1,
+ 'error': '2 项需要处理,其中 1 项是来源限流', 'retryable_asset_ids': [1]}), \
+ self.assertRaisesRegex(RuntimeError, '来源限流'):
+ upgrade_repairs._media_run(self.contract, 'upgrade-library:processing-v2:1', Mock())
+
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)})