Final commit of the automation-handler refactor. With this commit
every closure that used to live in
`web_server._register_automation_handlers` is now a top-level
function in `core/automation/handlers/`.
Handlers extracted in this commit:
- start_database_update + deep_scan_library
-> core/automation/handlers/database_update.py
Both share the db_update_state monitoring pattern (poll until
status flips, stall detection emits warning at 10 min, 2-hour
outer timeout). Lifted into a shared `_run_with_progress` helper
inside the module so the per-handler bodies stay tiny.
- run_duplicate_cleaner -> core/automation/handlers/duplicate_cleaner.py
- start_quality_scan -> core/automation/handlers/quality_scanner.py
- clear_quarantine, cleanup_wishlist, update_discovery_pool,
backup_database, refresh_beatport_cache
-> core/automation/handlers/maintenance.py
Grouped because each body is short (~20-50 lines) and they share
no state — splitting into per-handler files would just add import
noise.
- clean_search_history, clean_completed_downloads, full_cleanup
-> core/automation/handlers/download_cleanup.py
Grouped because all three reach the download orchestrator,
tasks_lock, and download_batches/download_tasks accessors. The
full_cleanup multi-step orchestration shares phase-detection
logic with clean_completed_downloads.
- run_script -> core/automation/handlers/run_script.py
- search_and_download -> core/automation/handlers/search_and_download.py
`AutomationDeps` grew with the new dependency surface:
- get_db_update_state + db_update_lock + db_update_executor +
run_db_update_task + run_deep_scan_task
- get_duplicate_cleaner_state + duplicate_cleaner_lock +
duplicate_cleaner_executor + run_duplicate_cleaner
- get_quality_scanner_state + quality_scanner_lock +
quality_scanner_executor + run_quality_scanner
- download_orchestrator + run_async + tasks_lock +
get_download_batches + get_download_tasks +
sweep_empty_download_directories + get_staging_path
- docker_resolve_path + get_current_profile_id +
get_watchlist_scanner + get_app + get_beatport_data_cache
- set_db_update_automation_id (writes the legacy global so the live
DB-update progress callbacks still living in web_server.py keep
emitting against the active automation card)
`web_server._register_automation_handlers` is now ~50 lines: build
deps once, call register_all. The 667-line block of remaining
closure definitions and engine register calls is gone.
The final orphan was the `_db_update_automation_id` module global —
the DB-update progress callbacks at line ~14080 still read it
directly, so the extracted database_update handler propagates the
automation id through `deps.set_db_update_automation_id` (a closure
in web_server that writes the global). When the legacy callbacks
get extracted in a future PR the setter goes away.
Tests:
- tests/automation/test_handlers_maintenance.py adds 21 boundary
tests covering every newly-extracted handler shape: guard
short-circuits (already-running returns skipped), deps wiring
(set_db_update_automation_id called with the right id),
exception swallow contract, status returns, path-traversal
blocked in run_script, source-mode skip in clean_search_history,
active-batch skip in clean_completed_downloads, etc.
- 3244 tests pass (was 3223 — 21 new), no regression.
web_server.py: 35,593 -> 34,220 lines (-1,373 net across 3 commits).
Issue #1 from the extraction punch list is now COMPLETE.
153 lines
5.8 KiB
Python
153 lines
5.8 KiB
Python
"""One-stop registration of every extracted automation handler.
|
|
|
|
``web_server`` builds the deps once at startup and calls
|
|
:func:`register_all` here. Each new handler module gets one line in
|
|
this file when it lands.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from core.automation.deps import AutomationDeps
|
|
from core.automation.handlers.process_wishlist import auto_process_wishlist
|
|
from core.automation.handlers.scan_watchlist import auto_scan_watchlist
|
|
from core.automation.handlers.scan_library import auto_scan_library
|
|
from core.automation.handlers.refresh_mirrored import auto_refresh_mirrored
|
|
from core.automation.handlers.sync_playlist import auto_sync_playlist
|
|
from core.automation.handlers.discover_playlist import auto_discover_playlist
|
|
from core.automation.handlers.playlist_pipeline import auto_playlist_pipeline
|
|
from core.automation.handlers.database_update import (
|
|
auto_start_database_update, auto_deep_scan_library,
|
|
)
|
|
from core.automation.handlers.duplicate_cleaner import auto_run_duplicate_cleaner
|
|
from core.automation.handlers.quality_scanner import auto_start_quality_scan
|
|
from core.automation.handlers.maintenance import (
|
|
auto_clear_quarantine,
|
|
auto_cleanup_wishlist,
|
|
auto_update_discovery_pool,
|
|
auto_backup_database,
|
|
auto_refresh_beatport_cache,
|
|
)
|
|
from core.automation.handlers.download_cleanup import (
|
|
auto_clean_search_history,
|
|
auto_clean_completed_downloads,
|
|
auto_full_cleanup,
|
|
)
|
|
from core.automation.handlers.run_script import auto_run_script
|
|
from core.automation.handlers.search_and_download import auto_search_and_download
|
|
|
|
|
|
def register_all(deps: AutomationDeps) -> None:
|
|
"""Wire every extracted handler to the engine.
|
|
|
|
Each ``register_action_handler`` call binds the action name (the
|
|
string the trigger uses to look up its action) to a thin lambda
|
|
that injects ``deps`` and forwards the engine-supplied config.
|
|
Guards stay alongside their handler so duplicate-run prevention
|
|
behaves identically to the pre-extraction code.
|
|
"""
|
|
engine = deps.engine
|
|
|
|
# Self-guards prevent duplicate runs of the SAME operation, but
|
|
# different operations can run concurrently — wishlist downloads
|
|
# use bandwidth, watchlist scans use API calls, library scans use
|
|
# media-server CPU. Different resources, no contention.
|
|
engine.register_action_handler(
|
|
'process_wishlist',
|
|
lambda config: auto_process_wishlist(config, deps),
|
|
guard_fn=deps.is_wishlist_actually_processing,
|
|
)
|
|
engine.register_action_handler(
|
|
'scan_watchlist',
|
|
lambda config: auto_scan_watchlist(config, deps),
|
|
guard_fn=deps.is_watchlist_actually_scanning,
|
|
)
|
|
engine.register_action_handler(
|
|
'scan_library',
|
|
lambda config: auto_scan_library(config, deps),
|
|
deps.state.is_scan_library_active,
|
|
)
|
|
|
|
# Playlist lifecycle handlers. The pipeline composes refresh +
|
|
# sync + discover (it imports them directly), so all four ship
|
|
# together. The pipeline guard prevents an in-flight pipeline
|
|
# from being re-triggered mid-run.
|
|
engine.register_action_handler(
|
|
'refresh_mirrored',
|
|
lambda config: auto_refresh_mirrored(config, deps),
|
|
)
|
|
engine.register_action_handler(
|
|
'sync_playlist',
|
|
lambda config: auto_sync_playlist(config, deps),
|
|
)
|
|
engine.register_action_handler(
|
|
'discover_playlist',
|
|
lambda config: auto_discover_playlist(config, deps),
|
|
)
|
|
engine.register_action_handler(
|
|
'playlist_pipeline',
|
|
lambda config: auto_playlist_pipeline(config, deps),
|
|
deps.state.is_pipeline_running,
|
|
)
|
|
|
|
# Database update + deep scan share the db_update_state guard —
|
|
# only one operation can mutate that state at a time.
|
|
engine.register_action_handler(
|
|
'start_database_update',
|
|
lambda config: auto_start_database_update(config, deps),
|
|
lambda: deps.get_db_update_state().get('status') == 'running',
|
|
)
|
|
engine.register_action_handler(
|
|
'deep_scan_library',
|
|
lambda config: auto_deep_scan_library(config, deps),
|
|
lambda: deps.get_db_update_state().get('status') == 'running',
|
|
)
|
|
engine.register_action_handler(
|
|
'run_duplicate_cleaner',
|
|
lambda config: auto_run_duplicate_cleaner(config, deps),
|
|
lambda: deps.get_duplicate_cleaner_state().get('status') == 'running',
|
|
)
|
|
engine.register_action_handler(
|
|
'clear_quarantine',
|
|
lambda config: auto_clear_quarantine(config, deps),
|
|
)
|
|
engine.register_action_handler(
|
|
'cleanup_wishlist',
|
|
lambda config: auto_cleanup_wishlist(config, deps),
|
|
)
|
|
engine.register_action_handler(
|
|
'update_discovery_pool',
|
|
lambda config: auto_update_discovery_pool(config, deps),
|
|
)
|
|
engine.register_action_handler(
|
|
'start_quality_scan',
|
|
lambda config: auto_start_quality_scan(config, deps),
|
|
lambda: deps.get_quality_scanner_state().get('status') == 'running',
|
|
)
|
|
engine.register_action_handler(
|
|
'backup_database',
|
|
lambda config: auto_backup_database(config, deps),
|
|
)
|
|
engine.register_action_handler(
|
|
'refresh_beatport_cache',
|
|
lambda config: auto_refresh_beatport_cache(config, deps),
|
|
)
|
|
engine.register_action_handler(
|
|
'clean_search_history',
|
|
lambda config: auto_clean_search_history(config, deps),
|
|
)
|
|
engine.register_action_handler(
|
|
'clean_completed_downloads',
|
|
lambda config: auto_clean_completed_downloads(config, deps),
|
|
)
|
|
engine.register_action_handler(
|
|
'full_cleanup',
|
|
lambda config: auto_full_cleanup(config, deps),
|
|
)
|
|
engine.register_action_handler(
|
|
'run_script',
|
|
lambda config: auto_run_script(config, deps),
|
|
)
|
|
engine.register_action_handler(
|
|
'search_and_download',
|
|
lambda config: auto_search_and_download(config, deps),
|
|
)
|