refactor(scheduler): separate scheduler logic from scan/rescan logic

- Extract rescan logic into new RescanService (src/server/services/rescan_service.py)
- SchedulerService now only handles APScheduler cron scheduling
- Move scheduler sub-services (folder_rename, folder_scan, key_resolution) to scheduler/ folder
- Keep RescanOrchestrator as backward-compatible alias
- Update all imports across api/, server/, and test files
This commit is contained in:
2026-06-03 20:58:30 +02:00
parent 9d64241230
commit 9c3f03d610
25 changed files with 1080 additions and 578 deletions

View File

@@ -5,7 +5,7 @@ from unittest.mock import AsyncMock, MagicMock, patch
import pytest
from src.server.services.key_resolution_service import (
from src.server.services.scheduler.key_resolution_service import (
_extract_key_from_link,
_extract_year_from_folder,
_normalize_for_comparison,
@@ -104,7 +104,7 @@ class TestResolveKeyForFolder:
]
with patch(
"src.server.services.key_resolution_service._search_provider",
"src.server.services.scheduler.key_resolution_service._search_provider",
return_value=search_results,
):
key = await resolve_key_for_folder("Rent-A-Girlfriend (2020)")
@@ -114,7 +114,7 @@ class TestResolveKeyForFolder:
async def test_no_results_returns_none(self):
"""When provider returns no results, returns None."""
with patch(
"src.server.services.key_resolution_service._search_provider",
"src.server.services.scheduler.key_resolution_service._search_provider",
return_value=[],
):
key = await resolve_key_for_folder("Unknown Anime (2020)")
@@ -129,7 +129,7 @@ class TestResolveKeyForFolder:
]
with patch(
"src.server.services.key_resolution_service._search_provider",
"src.server.services.scheduler.key_resolution_service._search_provider",
return_value=search_results,
):
key = await resolve_key_for_folder("My Anime (2022)")
@@ -144,7 +144,7 @@ class TestResolveKeyForFolder:
]
with patch(
"src.server.services.key_resolution_service._search_provider",
"src.server.services.scheduler.key_resolution_service._search_provider",
return_value=search_results,
):
key = await resolve_key_for_folder("Rent-A-Girlfriend (2020)")
@@ -158,7 +158,7 @@ class TestResolveKeyForFolder:
]
with patch(
"src.server.services.key_resolution_service._search_provider",
"src.server.services.scheduler.key_resolution_service._search_provider",
return_value=search_results,
):
key = await resolve_key_for_folder("Naruto (2002)")
@@ -168,7 +168,7 @@ class TestResolveKeyForFolder:
async def test_provider_error_returns_none(self):
"""When provider search raises an exception, returns None gracefully."""
with patch(
"src.server.services.key_resolution_service._search_provider",
"src.server.services.scheduler.key_resolution_service._search_provider",
side_effect=RuntimeError("Network error"),
):
key = await resolve_key_for_folder("Some Anime (2020)")
@@ -182,7 +182,7 @@ class TestResolveKeyForFolder:
]
with patch(
"src.server.services.key_resolution_service._search_provider",
"src.server.services.scheduler.key_resolution_service._search_provider",
return_value=search_results,
):
key = await resolve_key_for_folder("One Piece (1999)")
@@ -196,7 +196,7 @@ class TestResolveKeyForFolder:
]
with patch(
"src.server.services.key_resolution_service._search_provider",
"src.server.services.scheduler.key_resolution_service._search_provider",
return_value=search_results,
):
key = await resolve_key_for_folder("Naruto")
@@ -211,7 +211,7 @@ class TestResolveKeyForFolder:
]
with patch(
"src.server.services.key_resolution_service._search_provider",
"src.server.services.scheduler.key_resolution_service._search_provider",
return_value=search_results,
):
key = await resolve_key_for_folder("Dororo (2019)")