Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| be9f2a4c0c | |||
| 53fe09351f | |||
| dc7d9ee5f7 | |||
| da3cae2812 |
@@ -1 +1 @@
|
||||
v1.4.3
|
||||
v1.4.5
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "aniworld-web",
|
||||
"version": "1.4.3",
|
||||
"version": "1.4.5",
|
||||
"description": "Aniworld Anime Download Manager - Web Frontend",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
@@ -165,7 +165,7 @@ async def _cleanup_legacy_key_files() -> int:
|
||||
db_folders: set[str] = {series.folder for series in all_series if series.folder}
|
||||
|
||||
for folder_name in db_folders:
|
||||
folder_path = settings.anime_directory / folder_name
|
||||
folder_path = Path(settings.anime_directory) / folder_name
|
||||
key_file = folder_path / "key"
|
||||
|
||||
if not key_file.exists():
|
||||
|
||||
@@ -378,6 +378,18 @@ class SetupService:
|
||||
)
|
||||
continue
|
||||
|
||||
# Also check if a series with this key already exists (different folder, same anime)
|
||||
existing_by_key = await AnimeSeriesService.get_by_key(db, resolved_key)
|
||||
if existing_by_key:
|
||||
logger.debug(
|
||||
"Series with key already exists, skipping",
|
||||
folder=folder_name,
|
||||
key=resolved_key,
|
||||
existing_folder=existing_by_key.folder
|
||||
)
|
||||
skipped_existing += 1
|
||||
continue
|
||||
|
||||
# Check filesystem properties
|
||||
props = cls._get_series_properties(folder)
|
||||
|
||||
|
||||
@@ -468,12 +468,43 @@
|
||||
|
||||
function showCompletion() {
|
||||
isComplete = true;
|
||||
document.getElementById('completionMessage').style.display = 'block';
|
||||
document.getElementById('connectionStatus').style.display = 'none';
|
||||
|
||||
if (ws) {
|
||||
ws.close();
|
||||
}
|
||||
|
||||
// Check for unresolved folders before showing completion
|
||||
checkUnresolvedAndProceed();
|
||||
}
|
||||
|
||||
async function checkUnresolvedAndProceed() {
|
||||
try {
|
||||
const token = localStorage.getItem('auth_token');
|
||||
if (!token) {
|
||||
// No token, go to login
|
||||
document.getElementById('completionMessage').style.display = 'block';
|
||||
return;
|
||||
}
|
||||
|
||||
const res = await fetch('/api/setup/unresolved', {
|
||||
headers: { 'Authorization': `Bearer ${token}` }
|
||||
});
|
||||
|
||||
if (res.ok) {
|
||||
const unresolved = await res.json();
|
||||
if (unresolved && unresolved.length > 0) {
|
||||
// Has unresolved folders - redirect to unresolved page
|
||||
window.location.href = '/setup/unresolved';
|
||||
return;
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error checking unresolved folders:', e);
|
||||
}
|
||||
|
||||
// No unresolved folders or error - show completion message
|
||||
document.getElementById('completionMessage').style.display = 'block';
|
||||
}
|
||||
|
||||
function showError(message) {
|
||||
|
||||
@@ -167,10 +167,16 @@ class TestSetupServiceRun:
|
||||
mock_get_db = MagicMock()
|
||||
mock_get_db.__aenter__.return_value = mock_db
|
||||
mock_get_db.__aexit__.return_value = None
|
||||
mock_series_app = AsyncMock()
|
||||
mock_series_app.search.return_value = []
|
||||
|
||||
with patch(
|
||||
'src.server.services.setup_service.settings'
|
||||
) as mock_settings, \
|
||||
patch(
|
||||
'src.server.services.setup_service.get_series_app',
|
||||
return_value=mock_series_app
|
||||
), \
|
||||
patch(
|
||||
'src.server.services.setup_service.get_db_session',
|
||||
return_value=mock_get_db
|
||||
@@ -179,6 +185,10 @@ class TestSetupServiceRun:
|
||||
'src.server.services.setup_service.AnimeSeriesService.get_by_folder',
|
||||
new_callable=AsyncMock, return_value=None
|
||||
), \
|
||||
patch(
|
||||
'src.server.services.setup_service.AnimeSeriesService.get_by_key',
|
||||
new_callable=AsyncMock, return_value=None
|
||||
), \
|
||||
patch(
|
||||
'src.server.services.setup_service.UnresolvedFolderService.get_by_folder_name',
|
||||
new_callable=AsyncMock, return_value=None
|
||||
@@ -258,10 +268,16 @@ class TestSetupServiceRun:
|
||||
mock_get_db = MagicMock()
|
||||
mock_get_db.__aenter__.return_value = mock_db
|
||||
mock_get_db.__aexit__.return_value = None
|
||||
mock_series_app = AsyncMock()
|
||||
mock_series_app.search.return_value = []
|
||||
|
||||
with patch(
|
||||
'src.server.services.setup_service.settings'
|
||||
) as mock_settings, \
|
||||
patch(
|
||||
'src.server.services.setup_service.get_series_app',
|
||||
return_value=mock_series_app
|
||||
), \
|
||||
patch(
|
||||
'src.server.services.setup_service.get_db_session',
|
||||
return_value=mock_get_db
|
||||
@@ -270,6 +286,10 @@ class TestSetupServiceRun:
|
||||
'src.server.services.setup_service.AnimeSeriesService.get_by_folder',
|
||||
new_callable=AsyncMock, return_value=None
|
||||
), \
|
||||
patch(
|
||||
'src.server.services.setup_service.AnimeSeriesService.get_by_key',
|
||||
new_callable=AsyncMock, return_value=None
|
||||
), \
|
||||
patch(
|
||||
'src.server.services.setup_service.UnresolvedFolderService.get_by_folder_name',
|
||||
new_callable=AsyncMock, return_value=None
|
||||
@@ -323,6 +343,10 @@ class TestSetupServiceRun:
|
||||
'src.server.services.setup_service.AnimeSeriesService.get_by_folder',
|
||||
new_callable=AsyncMock, return_value=None
|
||||
), \
|
||||
patch(
|
||||
'src.server.services.setup_service.AnimeSeriesService.get_by_key',
|
||||
new_callable=AsyncMock, return_value=None
|
||||
), \
|
||||
patch(
|
||||
'src.server.services.setup_service.UnresolvedFolderService.get_by_folder_name',
|
||||
new_callable=AsyncMock, return_value=None
|
||||
@@ -401,6 +425,10 @@ class TestSetupServiceRun:
|
||||
'src.server.services.setup_service.AnimeSeriesService.get_by_folder',
|
||||
new_callable=AsyncMock, return_value=None
|
||||
), \
|
||||
patch(
|
||||
'src.server.services.setup_service.AnimeSeriesService.get_by_key',
|
||||
new_callable=AsyncMock, return_value=None
|
||||
), \
|
||||
patch(
|
||||
'src.server.services.setup_service.UnresolvedFolderService.get_by_folder_name',
|
||||
new_callable=AsyncMock, return_value=None
|
||||
|
||||
Reference in New Issue
Block a user