Peach: Local-first video metadata scraper and media manager.
refactor(processing): 复用任务档位选择与估算投影
longmeidao06ebab392bea
diff --git a/src/peach/library_processing.py b/src/peach/library_processing.pyindex ce6d7a391..64d1287a7 100644--- a/src/peach/library_processing.py+++ b/src/peach/library_processing.py@@ -2920,13 +2920,9 @@ def process_library(config, db_path, candidate_root, cover_root, *, location='copath.parent.mkdir(parents=True, exist_ok=True)retrying = retry_ids is not Nonescope_ids, initial_ids = _initial_processing_scope(db_path, selected_ids, retry_ids, incremental, resume_state)+ from .processing_control import execution_modefrom .task_control import CURRENT as TASK_CONTROL- task = TASK_CONTROL.get()- if task is not None:- speed_mode = task.mode- elif speed_mode is None:- from .web_settings import task_speed_mode- speed_mode = task_speed_mode(judgement_database)+ speed_mode = execution_mode(judgement_database, speed_mode, control=TASK_CONTROL.get())control = task_control(config, state_file)identity = job_id or uuid.uuid4().hexfrom .processing_inventory import recent_rowsdiff --git a/src/peach/processing_control.py b/src/peach/processing_control.pyindex b713258d7..99e94d7ee 100644--- a/src/peach/processing_control.py+++ b/src/peach/processing_control.py@@ -114,6 +114,16 @@ def current_control():return CURRENT.get() or TASK_CONTROL.get()+def execution_mode(database, requested=None, *, control):+ """执行中的任务沿用本轮档位,独立调用选择显式档位或设置默认值。"""+ if control is not None:+ return control.mode+ if requested is not None:+ return valid_mode(requested)+ from .web_settings import task_speed_mode+ return task_speed_mode(database)++def low_mode():control = current_control()return control is not None and control.mode == 'low'@@ -359,12 +369,9 @@ def user_cancelled(db_path, job_id):def initial_estimate(config, db_path, stage, asset_ids=None, mode=None):"""仅使用账本统计,不在启动 HTTP 请求里遍历媒体目录。"""- if mode is None and current_control() is not None:- mode = current_control().modeif mode is None:from .repository import LedgerDatabase- from .web_settings import task_speed_mode- mode = task_speed_mode(LedgerDatabase(db_path))+ mode = execution_mode(LedgerDatabase(db_path), control=current_control())query = "SELECT COUNT(*), COALESCE(SUM(size),0) FROM asset WHERE medium='video' AND disposal IS NULL"parameters = []if asset_ids is not None:diff --git a/src/peach/web_library_processing.py b/src/peach/web_library_processing.pyindex aec9b2778..49009035e 100644--- a/src/peach/web_library_processing.py+++ b/src/peach/web_library_processing.py@@ -66,6 +66,35 @@ def _active_run(contract, state):return runs[0] if runs else None+def _speed_fields(previous, mode):+ """切换档位时同步公开速度和估算范围。"""+ fields = dict(speed_mode=mode, eta_initial=True)+ if previous.get('speed_mode') != mode:+ ratio = mode_ratio(mode, previous.get('speed_mode') or 'standard')+ for key in ('eta_seconds_min', 'eta_seconds_max'):+ if isinstance(previous.get(key), (int, float)):+ fields[key] = max(0, int(previous[key] * ratio))+ return fields+++def _project_speed(contract, state, run, control):+ """读取本轮档位及旧状态,空闲时展示下一轮待选值。"""+ previous_mode = state.get('speed_mode')+ if run is not None:+ from .task_control import speed_mode+ mode = speed_mode(contract.db_path, run.id, (run.parent_run_id, run.root_run_id),+ default=previous_mode or control.mode)+ elif state.get('status') in ACTIVE:+ mode = control.mode+ else:+ from .web_settings import task_speed_mode+ from .repository import LedgerDatabase+ mode = control.next_mode or task_speed_mode(LedgerDatabase(contract.db_path))+ if state.get('status') in ACTIVE and previous_mode and previous_mode != mode:+ state.update(_speed_fields(state, mode))+ state['speed_mode'] = mode++def q_library_processing(contract, _args):if _args.get('estimate') == '1':config = settings_file.active()@@ -94,23 +123,7 @@ def q_library_processing(contract, _args):state = decorate(state)control = control_for(settings_file.active())control.refresh(force=True)- previous_mode = state.get('speed_mode')- if run is not None:- from .task_control import speed_mode- state['speed_mode'] = speed_mode(contract.db_path, run.id, (run.parent_run_id, run.root_run_id),- default=previous_mode or control.mode)- elif state.get('status') in ACTIVE:- state['speed_mode'] = control.mode- else:- from .web_settings import task_speed_mode- from .repository import LedgerDatabase- state['speed_mode'] = control.next_mode or task_speed_mode(LedgerDatabase(contract.db_path))- if state.get('status') in ACTIVE and previous_mode and previous_mode != state['speed_mode']:- ratio = mode_ratio(state['speed_mode'], previous_mode)- for key in ('eta_seconds_min', 'eta_seconds_max'):- if isinstance(state.get(key), (int, float)):- state[key] = max(0, int(state[key] * ratio))- state['eta_initial'] = True+ _project_speed(contract, state, run, control)state['skip_requested'] = (state.get('status') == 'running' and state.get('current_asset_id') is not Noneand control.skip_asset_id == state.get('current_asset_id'))from .media_processing_policy import metadata_only@@ -189,13 +202,7 @@ def _set_processing_speed(contract, control, previous, body):return q_library_processing(contract, {})control.request('set_speed', mode=mode)if previous.get('status') in ACTIVE:- ratio = mode_ratio(mode, previous.get('speed_mode') or 'standard')- fields = dict(speed_mode=mode, eta_initial=True)- if previous.get('speed_mode') != mode:- for key in ('eta_seconds_min', 'eta_seconds_max'):- if isinstance(previous.get(key), (int, float)):- fields[key] = max(0, int(previous[key] * ratio))- contract.library_processing_job.update(previous['job_id'], **fields)+ contract.library_processing_job.update(previous['job_id'], **_speed_fields(previous, mode))return q_library_processing(contract, {})@@ -404,6 +411,22 @@ def retry_after_network_recovery(contract, sync=None):return None+def _initial_speed(contract, control, previous, body, *, resume):+ """恢复沿用任务及旧记录的档位,新任务消费显式选择、待选值或默认值。"""+ from .web_settings import task_speed_mode+ from .repository import LedgerDatabase+ control.refresh(force=True)+ if resume:+ run = _active_run(contract, previous)+ if run is not None:+ from .task_control import speed_mode+ return speed_mode(contract.db_path, run.id, (run.parent_run_id, run.root_run_id),+ default=previous.get('speed_mode') or (body or {}).get('speed_mode') or control.mode)+ return valid_mode(control.mode)+ return valid_mode((body or {}).get('speed_mode') or control.next_mode+ or task_speed_mode(LedgerDatabase(contract.db_path)))++def w_library_processing(contract, body, *, resume=False):config = settings_file.active()if (body or {}).get('action'):@@ -420,20 +443,9 @@ def w_library_processing(contract, body, *, resume=False):remember(contract.db_path, asset_ids)if retry_ids is not None and not retry_ids:return public_state(previous)- from .web_settings import task_speed_mode- from .repository import LedgerDatabasecontrol = control_for(config)- control.refresh(force=True)- run = _active_run(contract, previous) if resume else None- if run is not None:- from .task_control import speed_mode- mode = speed_mode(contract.db_path, run.id, (run.parent_run_id, run.root_run_id),- default=previous.get('speed_mode') or (body or {}).get('speed_mode') or control.mode)- else:- mode = valid_mode(control.mode if resume else- (body or {}).get('speed_mode') or control.next_mode- or task_speed_mode(LedgerDatabase(contract.db_path)))- control_for(config).request('set_speed', mode=mode)+ mode = _initial_speed(contract, control, previous, body, resume=resume)+ control.request('set_speed', mode=mode)def work(job_id):try:result = process_library(config, contract.db_path, contract.candidate_root, contract.cover_root,diff --git a/tests/test_processing_control.py b/tests/test_processing_control.pyindex e45b00525..692d2c7c7 100644--- a/tests/test_processing_control.py+++ b/tests/test_processing_control.py@@ -722,7 +722,7 @@ class ProcessingControlTests(unittest.TestCase):database=runs.database, candidate_root=self.root / 'candidates',cover_root=self.root / 'covers', cache_bust=lambda: None)observed = []- def process(*_args, **kwargs):+ def process(*_args, observed=observed, **kwargs):observed.append((kwargs['speed_mode'], task_control.CURRENT.get().mode,kwargs['resume_state']['completed_metadata']))return {'status': 'complete'}