lukas.pupkalipinski/Aniworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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:
Lukas
2026-06-03 20:58:30 +02:00
parent 9d64241230
commit 9c3f03d610
25 changed files with 1080 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
tests/unit/test_folder_rename_service.py
View File

@@ -8,7 +8,7 @@ from unittest.mock import AsyncMock, MagicMock, patch
import pytest
from src.server.services.folder_rename_service import (
from src.server.services.scheduler.folder_rename_service import (
_cleanup_orphaned_folder,
_compute_expected_folder_name,
_is_series_being_downloaded,
@@ -163,7 +163,7 @@ class TestIsSeriesBeingDownloaded:
mock_service._active_download = None
mock_service._pending_queue = []
with patch(
"src.server.services.folder_rename_service.get_download_service",
"src.server.services.scheduler.folder_rename_service.get_download_service",
return_value=mock_service,
):
assert _is_series_being_downloaded("Some Show") is False
@@ -175,7 +175,7 @@ class TestIsSeriesBeingDownloaded:
mock_service._active_download = mock_item
mock_service._pending_queue = []
with patch(
"src.server.services.folder_rename_service.get_download_service",
"src.server.services.scheduler.folder_rename_service.get_download_service",
return_value=mock_service,
):
assert _is_series_being_downloaded("Some Show") is True
@@ -187,14 +187,14 @@ class TestIsSeriesBeingDownloaded:
mock_service._active_download = None
mock_service._pending_queue = [mock_item]
with patch(
"src.server.services.folder_rename_service.get_download_service",
"src.server.services.scheduler.folder_rename_service.get_download_service",
return_value=mock_service,
):
assert _is_series_being_downloaded("Some Show") is True
def test_exception_returns_true_for_safety(self) -> None:
with patch(
"src.server.services.folder_rename_service.get_download_service",
"src.server.services.scheduler.folder_rename_service.get_download_service",
side_effect=RuntimeError("boom"),
):
assert _is_series_being_downloaded("Some Show") is True
@@ -213,13 +213,13 @@ class TestUpdateDatabasePaths:
mock_series.folder = "Old Name"
with patch(
"src.server.services.folder_rename_service.get_db_session"
"src.server.services.scheduler.folder_rename_service.get_db_session"
) as mock_get_db, patch(
"src.server.services.folder_rename_service.AnimeSeriesService"
"src.server.services.scheduler.folder_rename_service.AnimeSeriesService"
) as mock_series_svc, patch(
"src.server.services.folder_rename_service.EpisodeService"
"src.server.services.scheduler.folder_rename_service.EpisodeService"
) as mock_episode_svc, patch(
"src.server.services.folder_rename_service.DownloadQueueService"
"src.server.services.scheduler.folder_rename_service.DownloadQueueService"
) as mock_queue_svc:
mock_db = AsyncMock()
@@ -254,13 +254,13 @@ class TestUpdateDatabasePaths:
mock_episode.file_path = str(old_path)
with patch(
"src.server.services.folder_rename_service.get_db_session"
"src.server.services.scheduler.folder_rename_service.get_db_session"
) as mock_get_db, patch(
"src.server.services.folder_rename_service.AnimeSeriesService"
"src.server.services.scheduler.folder_rename_service.AnimeSeriesService"
) as mock_series_svc, patch(
"src.server.services.folder_rename_service.EpisodeService"
"src.server.services.scheduler.folder_rename_service.EpisodeService"
) as mock_episode_svc, patch(
"src.server.services.folder_rename_service.DownloadQueueService"
"src.server.services.scheduler.folder_rename_service.DownloadQueueService"
) as mock_queue_svc:
mock_db = AsyncMock()
@@ -350,7 +350,7 @@ class TestValidateAndRenameSeriesFolders:
@pytest.mark.asyncio
async def test_no_anime_directory(self) -> None:
with patch(
"src.server.services.folder_rename_service.settings.anime_directory",
"src.server.services.scheduler.folder_rename_service.settings.anime_directory",
"",
):
stats = await validate_and_rename_series_folders()
@@ -367,13 +367,13 @@ class TestValidateAndRenameSeriesFolders:
)
with patch(
"src.server.services.folder_rename_service.settings.anime_directory",
"src.server.services.scheduler.folder_rename_service.settings.anime_directory",
str(anime_dir),
), patch(
"src.server.services.folder_rename_service._is_series_being_downloaded",
"src.server.services.scheduler.folder_rename_service._is_series_being_downloaded",
return_value=False,
), patch(
"src.server.services.folder_rename_service._update_database_paths",
"src.server.services.scheduler.folder_rename_service._update_database_paths",
new_callable=AsyncMock,
) as mock_update_db:
stats = await validate_and_rename_series_folders()
@@ -397,7 +397,7 @@ class TestValidateAndRenameSeriesFolders:
)
with patch(
"src.server.services.folder_rename_service.settings.anime_directory",
"src.server.services.scheduler.folder_rename_service.settings.anime_directory",
str(anime_dir),
):
stats = await validate_and_rename_series_folders()
@@ -419,7 +419,7 @@ class TestValidateAndRenameSeriesFolders:
)
with patch(
"src.server.services.folder_rename_service.settings.anime_directory",
"src.server.services.scheduler.folder_rename_service.settings.anime_directory",
str(anime_dir),
):
stats = await validate_and_rename_series_folders()
@@ -440,10 +440,10 @@ class TestValidateAndRenameSeriesFolders:
)
with patch(
"src.server.services.folder_rename_service.settings.anime_directory",
"src.server.services.scheduler.folder_rename_service.settings.anime_directory",
str(anime_dir),
), patch(
"src.server.services.folder_rename_service._is_series_being_downloaded",
"src.server.services.scheduler.folder_rename_service._is_series_being_downloaded",
return_value=True,
):
stats = await validate_and_rename_series_folders()
@@ -474,20 +474,20 @@ class TestValidateAndRenameSeriesFolders:
mock_db.__aexit__.return_value = None
with patch(
"src.server.services.folder_rename_service.settings.anime_directory",
"src.server.services.scheduler.folder_rename_service.settings.anime_directory",
str(anime_dir),
), patch(
"src.server.services.folder_rename_service._is_series_being_downloaded",
"src.server.services.scheduler.folder_rename_service._is_series_being_downloaded",
return_value=False,
), patch(
"src.server.services.folder_rename_service.get_db_session",
"src.server.services.scheduler.folder_rename_service.get_db_session",
return_value=mock_db,
), patch(
"src.server.services.folder_rename_service.AnimeSeriesService.get_by_key",
"src.server.services.scheduler.folder_rename_service.AnimeSeriesService.get_by_key",
new_callable=AsyncMock,
return_value=None,
), patch(
"src.server.services.folder_rename_service.AnimeSeriesService.get_all",
"src.server.services.scheduler.folder_rename_service.AnimeSeriesService.get_all",
new_callable=AsyncMock,
return_value=[],
):
@@ -527,13 +527,13 @@ class TestValidateAndRenameSeriesFolders:
(d3 / "tvshow.nfo").write_text("<tvshow><title>Show C</title></tvshow>")
with patch(
"src.server.services.folder_rename_service.settings.anime_directory",
"src.server.services.scheduler.folder_rename_service.settings.anime_directory",
str(anime_dir),
), patch(
"src.server.services.folder_rename_service._is_series_being_downloaded",
"src.server.services.scheduler.folder_rename_service._is_series_being_downloaded",
return_value=False,
), patch(
"src.server.services.folder_rename_service._update_database_paths",
"src.server.services.scheduler.folder_rename_service._update_database_paths",
new_callable=AsyncMock,
):
stats = await validate_and_rename_series_folders()
@@ -558,10 +558,10 @@ class TestValidateAndRenameSeriesFolders:
)
with patch(
"src.server.services.folder_rename_service.settings.anime_directory",
"src.server.services.scheduler.folder_rename_service.settings.anime_directory",
str(anime_dir),
), patch(
"src.server.services.folder_rename_service._is_series_being_downloaded",
"src.server.services.scheduler.folder_rename_service._is_series_being_downloaded",
return_value=False,
):
stats = await validate_and_rename_series_folders(dry_run=True)