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

fix: prevent folder scan during NFO processing on startup

Browse Source 
- Modified SeriesManagerService to create SerieList with skip_load=True
- Changed scan_and_process_nfo() to load series from database instead of filesystem
- Fixed database transaction issue by creating separate session per task
- Verified scans only run once during initial setup, not on normal startup
This commit is contained in:
Lukas
2026-01-21 20:07:19 +01:00
parent 88c00b761c
commit 61c86dc698
2 changed files with 87 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
src/core/services/series_manager_service.py
View File

@@ -58,7 +58,8 @@ class SeriesManagerService:
image_size: Image size to download image_size: Image size to download
""" """
self.anime_directory = anime_directory self.anime_directory = anime_directory
self.serie_list = SerieList(anime_directory) # Skip automatic folder scanning - we load from database instead
self.serie_list = SerieList(anime_directory, skip_load=True)
# NFO configuration # NFO configuration
self.auto_create_nfo = auto_create_nfo self.auto_create_nfo = auto_create_nfo
@@ -107,8 +108,7 @@ class SeriesManagerService:
serie_folder: str, serie_folder: str,
serie_name: str, serie_name: str,
serie_key: str, serie_key: str,
year: Optional[int] = None, year: Optional[int] = None
db=None
): ):
"""Process NFO file for a series (create or update). """Process NFO file for a series (create or update).
@@ -117,7 +117,6 @@ class SeriesManagerService:
serie_name: Series display name serie_name: Series display name
serie_key: Series unique identifier for database updates serie_key: Series unique identifier for database updates
year: Release year (helps with TMDB matching) year: Release year (helps with TMDB matching)
db: Optional database session for updating IDs
""" """
if not self.nfo_service: if not self.nfo_service:
return return
@@ -128,56 +127,60 @@ class SeriesManagerService:
nfo_exists = await self.nfo_service.check_nfo_exists(serie_folder) nfo_exists = await self.nfo_service.check_nfo_exists(serie_folder)
# If NFO exists, parse IDs and update database # If NFO exists, parse IDs and update database
if nfo_exists and db: if nfo_exists:
logger.debug(f"Parsing IDs from existing NFO for '{serie_name}'") logger.debug(f"Parsing IDs from existing NFO for '{serie_name}'")
ids = self.nfo_service.parse_nfo_ids(nfo_path) ids = self.nfo_service.parse_nfo_ids(nfo_path)
if ids["tmdb_id"] or ids["tvdb_id"]: if ids["tmdb_id"] or ids["tvdb_id"]:
# Update database with extracted IDs # Create database session for this task
from datetime import datetime, timezone from datetime import datetime, timezone
from sqlalchemy import select from sqlalchemy import select
from src.server.database.connection import get_db_session
from src.server.database.models import AnimeSeries from src.server.database.models import AnimeSeries
result = await db.execute( async with get_db_session() as db:
select(AnimeSeries).filter(AnimeSeries.key == serie_key) result = await db.execute(
) select(AnimeSeries).filter(
series = result.scalars().first() AnimeSeries.key == serie_key
if series:
now = datetime.now(timezone.utc)
series.has_nfo = True
if series.nfo_created_at is None:
series.nfo_created_at = now
series.nfo_updated_at = now
if ids["tmdb_id"] is not None:
series.tmdb_id = ids["tmdb_id"]
logger.debug(
f"Updated TMDB ID for '{serie_name}': "
f"{ids['tmdb_id']}"
) )
)
series = result.scalars().first()
if ids["tvdb_id"] is not None: if series:
series.tvdb_id = ids["tvdb_id"] now = datetime.now(timezone.utc)
logger.debug( series.has_nfo = True
f"Updated TVDB ID for '{serie_name}': "
f"{ids['tvdb_id']}" if series.nfo_created_at is None:
series.nfo_created_at = now
series.nfo_updated_at = now
if ids["tmdb_id"] is not None:
series.tmdb_id = ids["tmdb_id"]
logger.debug(
f"Updated TMDB ID for '{serie_name}': "
f"{ids['tmdb_id']}"
)
if ids["tvdb_id"] is not None:
series.tvdb_id = ids["tvdb_id"]
logger.debug(
f"Updated TVDB ID for '{serie_name}': "
f"{ids['tvdb_id']}"
)
await db.commit()
logger.info(
f"Updated database with IDs from NFO for "
f"'{serie_name}' - TMDB: {ids['tmdb_id']}, "
f"TVDB: {ids['tvdb_id']}"
)
else:
logger.warning(
f"Series not found in database for NFO ID "
f"update: {serie_key}"
) )
await db.commit()
logger.info(
f"Updated database with IDs from NFO for "
f"'{serie_name}' - TMDB: {ids['tmdb_id']}, "
f"TVDB: {ids['tvdb_id']}"
)
else:
logger.warning(
f"Series not found in database for NFO ID update: "
f"{serie_key}"
)
# Create or update NFO file if configured # Create or update NFO file if configured
if not nfo_exists and self.auto_create_nfo: if not nfo_exists and self.auto_create_nfo:
@@ -218,8 +221,9 @@ class SeriesManagerService:
"""Scan all series and process NFO files based on configuration. """Scan all series and process NFO files based on configuration.
This method: This method:
1. Uses SerieList to scan series folders 1. Loads series from database (avoiding filesystem scan)
2. For each series with existing NFO, reads TMDB/TVDB IDs and updates database 2. For each series with existing NFO, reads TMDB/TVDB IDs
and updates database
3. For each series without NFO (if auto_create=True), creates one 3. For each series without NFO (if auto_create=True), creates one
4. For each series with NFO (if update_on_scan=True), updates it 4. For each series with NFO (if update_on_scan=True), updates it
5. Runs operations concurrently for better performance 5. Runs operations concurrently for better performance
@@ -228,51 +232,46 @@ class SeriesManagerService:
logger.info("NFO service not enabled, skipping NFO processing") logger.info("NFO service not enabled, skipping NFO processing")
return return
# Get all series from SerieList # Import database dependencies
all_series = self.serie_list.get_all() from src.server.database.connection import get_db_session
from src.server.database.service import AnimeSeriesService
if not all_series: # Load series from database (not from filesystem)
logger.info("No series found to process") async with get_db_session() as db:
anime_series_list = await AnimeSeriesService.get_all(
db, with_episodes=False
)
if not anime_series_list:
logger.info("No series found in database to process")
return return
logger.info(f"Processing NFO for {len(all_series)} series...") logger.info(f"Processing NFO for {len(anime_series_list)} series...")
# Import database session # Create tasks for concurrent processing
from src.server.database.connection import get_db_session # Each task creates its own database session
tasks = []
for anime_series in anime_series_list:
# Extract year if available
year = getattr(anime_series, 'year', None)
# Create database session for ID updates task = self.process_nfo_for_series(
async with get_db_session() as db: serie_folder=anime_series.folder,
# Create tasks for concurrent processing serie_name=anime_series.name,
tasks = [] serie_key=anime_series.key,
for serie in all_series: year=year
# Extract year from first air date if available )
year = None tasks.append(task)
if hasattr(serie, 'year') and serie.year:
year = serie.year
task = self.process_nfo_for_series( # Process in batches to avoid overwhelming TMDB API
serie_folder=serie.folder, batch_size = 5
serie_name=serie.name, for i in range(0, len(tasks), batch_size):
serie_key=serie.key, batch = tasks[i:i + batch_size]
year=year, await asyncio.gather(*batch, return_exceptions=True)
db=db
)
tasks.append(task)
# Process in batches to avoid overwhelming TMDB API # Small delay between batches to respect rate limits
batch_size = 5 if i + batch_size < len(tasks):
for i in range(0, len(tasks), batch_size): await asyncio.sleep(2)
batch = tasks[i:i + batch_size]
await asyncio.gather(*batch, return_exceptions=True)
# Small delay between batches to respect rate limits
if i + batch_size < len(tasks):
await asyncio.sleep(2)
logger.info("NFO processing complete")
def get_serie_list(self) -> SerieList:
"""Get the underlying SerieList instance.
Returns: Returns:
SerieList instance SerieList instance