better db model
This commit is contained in:
@@ -15,7 +15,7 @@ from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from typing import Dict, List, Optional
|
||||
from typing import List, Optional
|
||||
|
||||
from sqlalchemy import delete, select, update
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
@@ -23,9 +23,7 @@ from sqlalchemy.orm import Session, selectinload
|
||||
|
||||
from src.server.database.models import (
|
||||
AnimeSeries,
|
||||
DownloadPriority,
|
||||
DownloadQueueItem,
|
||||
DownloadStatus,
|
||||
Episode,
|
||||
UserSession,
|
||||
)
|
||||
@@ -57,11 +55,6 @@ class AnimeSeriesService:
|
||||
name: str,
|
||||
site: str,
|
||||
folder: str,
|
||||
description: Optional[str] = None,
|
||||
status: Optional[str] = None,
|
||||
total_episodes: Optional[int] = None,
|
||||
cover_url: Optional[str] = None,
|
||||
episode_dict: Optional[Dict] = None,
|
||||
) -> AnimeSeries:
|
||||
"""Create a new anime series.
|
||||
|
||||
@@ -71,11 +64,6 @@ class AnimeSeriesService:
|
||||
name: Series name
|
||||
site: Provider site URL
|
||||
folder: Local filesystem path
|
||||
description: Optional series description
|
||||
status: Optional series status
|
||||
total_episodes: Optional total episode count
|
||||
cover_url: Optional cover image URL
|
||||
episode_dict: Optional episode dictionary
|
||||
|
||||
Returns:
|
||||
Created AnimeSeries instance
|
||||
@@ -88,11 +76,6 @@ class AnimeSeriesService:
|
||||
name=name,
|
||||
site=site,
|
||||
folder=folder,
|
||||
description=description,
|
||||
status=status,
|
||||
total_episodes=total_episodes,
|
||||
cover_url=cover_url,
|
||||
episode_dict=episode_dict,
|
||||
)
|
||||
db.add(series)
|
||||
await db.flush()
|
||||
@@ -262,7 +245,6 @@ class EpisodeService:
|
||||
episode_number: int,
|
||||
title: Optional[str] = None,
|
||||
file_path: Optional[str] = None,
|
||||
file_size: Optional[int] = None,
|
||||
is_downloaded: bool = False,
|
||||
) -> Episode:
|
||||
"""Create a new episode.
|
||||
@@ -274,7 +256,6 @@ class EpisodeService:
|
||||
episode_number: Episode number within season
|
||||
title: Optional episode title
|
||||
file_path: Optional local file path
|
||||
file_size: Optional file size in bytes
|
||||
is_downloaded: Whether episode is downloaded
|
||||
|
||||
Returns:
|
||||
@@ -286,9 +267,7 @@ class EpisodeService:
|
||||
episode_number=episode_number,
|
||||
title=title,
|
||||
file_path=file_path,
|
||||
file_size=file_size,
|
||||
is_downloaded=is_downloaded,
|
||||
download_date=datetime.now(timezone.utc) if is_downloaded else None,
|
||||
)
|
||||
db.add(episode)
|
||||
await db.flush()
|
||||
@@ -372,7 +351,6 @@ class EpisodeService:
|
||||
db: AsyncSession,
|
||||
episode_id: int,
|
||||
file_path: str,
|
||||
file_size: int,
|
||||
) -> Optional[Episode]:
|
||||
"""Mark episode as downloaded.
|
||||
|
||||
@@ -380,7 +358,6 @@ class EpisodeService:
|
||||
db: Database session
|
||||
episode_id: Episode primary key
|
||||
file_path: Local file path
|
||||
file_size: File size in bytes
|
||||
|
||||
Returns:
|
||||
Updated Episode instance or None if not found
|
||||
@@ -391,8 +368,6 @@ class EpisodeService:
|
||||
|
||||
episode.is_downloaded = True
|
||||
episode.file_path = file_path
|
||||
episode.file_size = file_size
|
||||
episode.download_date = datetime.now(timezone.utc)
|
||||
|
||||
await db.flush()
|
||||
await db.refresh(episode)
|
||||
@@ -427,17 +402,14 @@ class EpisodeService:
|
||||
class DownloadQueueService:
|
||||
"""Service for download queue CRUD operations.
|
||||
|
||||
Provides methods for managing the download queue with status tracking,
|
||||
priority management, and progress updates.
|
||||
Provides methods for managing the download queue.
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
async def create(
|
||||
db: AsyncSession,
|
||||
series_id: int,
|
||||
season: int,
|
||||
episode_number: int,
|
||||
priority: DownloadPriority = DownloadPriority.NORMAL,
|
||||
episode_id: int,
|
||||
download_url: Optional[str] = None,
|
||||
file_destination: Optional[str] = None,
|
||||
) -> DownloadQueueItem:
|
||||
@@ -446,9 +418,7 @@ class DownloadQueueService:
|
||||
Args:
|
||||
db: Database session
|
||||
series_id: Foreign key to AnimeSeries
|
||||
season: Season number
|
||||
episode_number: Episode number
|
||||
priority: Download priority
|
||||
episode_id: Foreign key to Episode
|
||||
download_url: Optional provider download URL
|
||||
file_destination: Optional target file path
|
||||
|
||||
@@ -457,10 +427,7 @@ class DownloadQueueService:
|
||||
"""
|
||||
item = DownloadQueueItem(
|
||||
series_id=series_id,
|
||||
season=season,
|
||||
episode_number=episode_number,
|
||||
status=DownloadStatus.PENDING,
|
||||
priority=priority,
|
||||
episode_id=episode_id,
|
||||
download_url=download_url,
|
||||
file_destination=file_destination,
|
||||
)
|
||||
@@ -468,8 +435,8 @@ class DownloadQueueService:
|
||||
await db.flush()
|
||||
await db.refresh(item)
|
||||
logger.info(
|
||||
f"Added to download queue: S{season:02d}E{episode_number:02d} "
|
||||
f"for series_id={series_id} with priority={priority}"
|
||||
f"Added to download queue: episode_id={episode_id} "
|
||||
f"for series_id={series_id}"
|
||||
)
|
||||
return item
|
||||
|
||||
@@ -493,68 +460,25 @@ class DownloadQueueService:
|
||||
return result.scalar_one_or_none()
|
||||
|
||||
@staticmethod
|
||||
async def get_by_status(
|
||||
async def get_by_episode(
|
||||
db: AsyncSession,
|
||||
status: DownloadStatus,
|
||||
limit: Optional[int] = None,
|
||||
) -> List[DownloadQueueItem]:
|
||||
"""Get download queue items by status.
|
||||
episode_id: int,
|
||||
) -> Optional[DownloadQueueItem]:
|
||||
"""Get download queue item by episode ID.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
status: Download status filter
|
||||
limit: Optional limit for results
|
||||
episode_id: Foreign key to Episode
|
||||
|
||||
Returns:
|
||||
List of DownloadQueueItem instances
|
||||
DownloadQueueItem instance or None if not found
|
||||
"""
|
||||
query = select(DownloadQueueItem).where(
|
||||
DownloadQueueItem.status == status
|
||||
)
|
||||
|
||||
# Order by priority (HIGH first) then creation time
|
||||
query = query.order_by(
|
||||
DownloadQueueItem.priority.desc(),
|
||||
DownloadQueueItem.created_at.asc(),
|
||||
)
|
||||
|
||||
if limit:
|
||||
query = query.limit(limit)
|
||||
|
||||
result = await db.execute(query)
|
||||
return list(result.scalars().all())
|
||||
|
||||
@staticmethod
|
||||
async def get_pending(
|
||||
db: AsyncSession,
|
||||
limit: Optional[int] = None,
|
||||
) -> List[DownloadQueueItem]:
|
||||
"""Get pending download queue items.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
limit: Optional limit for results
|
||||
|
||||
Returns:
|
||||
List of pending DownloadQueueItem instances ordered by priority
|
||||
"""
|
||||
return await DownloadQueueService.get_by_status(
|
||||
db, DownloadStatus.PENDING, limit
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
async def get_active(db: AsyncSession) -> List[DownloadQueueItem]:
|
||||
"""Get active download queue items.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
|
||||
Returns:
|
||||
List of downloading DownloadQueueItem instances
|
||||
"""
|
||||
return await DownloadQueueService.get_by_status(
|
||||
db, DownloadStatus.DOWNLOADING
|
||||
result = await db.execute(
|
||||
select(DownloadQueueItem).where(
|
||||
DownloadQueueItem.episode_id == episode_id
|
||||
)
|
||||
)
|
||||
return result.scalar_one_or_none()
|
||||
|
||||
@staticmethod
|
||||
async def get_all(
|
||||
@@ -576,7 +500,6 @@ class DownloadQueueService:
|
||||
query = query.options(selectinload(DownloadQueueItem.series))
|
||||
|
||||
query = query.order_by(
|
||||
DownloadQueueItem.priority.desc(),
|
||||
DownloadQueueItem.created_at.asc(),
|
||||
)
|
||||
|
||||
@@ -584,19 +507,17 @@ class DownloadQueueService:
|
||||
return list(result.scalars().all())
|
||||
|
||||
@staticmethod
|
||||
async def update_status(
|
||||
async def set_error(
|
||||
db: AsyncSession,
|
||||
item_id: int,
|
||||
status: DownloadStatus,
|
||||
error_message: Optional[str] = None,
|
||||
error_message: str,
|
||||
) -> Optional[DownloadQueueItem]:
|
||||
"""Update download queue item status.
|
||||
"""Set error message on download queue item.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
item_id: Item primary key
|
||||
status: New download status
|
||||
error_message: Optional error message for failed status
|
||||
error_message: Error description
|
||||
|
||||
Returns:
|
||||
Updated DownloadQueueItem instance or None if not found
|
||||
@@ -605,61 +526,11 @@ class DownloadQueueService:
|
||||
if not item:
|
||||
return None
|
||||
|
||||
item.status = status
|
||||
|
||||
# Update timestamps based on status
|
||||
if status == DownloadStatus.DOWNLOADING and not item.started_at:
|
||||
item.started_at = datetime.now(timezone.utc)
|
||||
elif status in (DownloadStatus.COMPLETED, DownloadStatus.FAILED):
|
||||
item.completed_at = datetime.now(timezone.utc)
|
||||
|
||||
# Set error message for failed downloads
|
||||
if status == DownloadStatus.FAILED and error_message:
|
||||
item.error_message = error_message
|
||||
item.retry_count += 1
|
||||
|
||||
await db.flush()
|
||||
await db.refresh(item)
|
||||
logger.debug(f"Updated download queue item {item_id} status to {status}")
|
||||
return item
|
||||
|
||||
@staticmethod
|
||||
async def update_progress(
|
||||
db: AsyncSession,
|
||||
item_id: int,
|
||||
progress_percent: float,
|
||||
downloaded_bytes: int,
|
||||
total_bytes: Optional[int] = None,
|
||||
download_speed: Optional[float] = None,
|
||||
) -> Optional[DownloadQueueItem]:
|
||||
"""Update download progress.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
item_id: Item primary key
|
||||
progress_percent: Progress percentage (0-100)
|
||||
downloaded_bytes: Bytes downloaded
|
||||
total_bytes: Optional total file size
|
||||
download_speed: Optional current speed (bytes/sec)
|
||||
|
||||
Returns:
|
||||
Updated DownloadQueueItem instance or None if not found
|
||||
"""
|
||||
item = await DownloadQueueService.get_by_id(db, item_id)
|
||||
if not item:
|
||||
return None
|
||||
|
||||
item.progress_percent = progress_percent
|
||||
item.downloaded_bytes = downloaded_bytes
|
||||
|
||||
if total_bytes is not None:
|
||||
item.total_bytes = total_bytes
|
||||
|
||||
if download_speed is not None:
|
||||
item.download_speed = download_speed
|
||||
item.error_message = error_message
|
||||
|
||||
await db.flush()
|
||||
await db.refresh(item)
|
||||
logger.debug(f"Set error on download queue item {item_id}")
|
||||
return item
|
||||
|
||||
@staticmethod
|
||||
@@ -682,57 +553,30 @@ class DownloadQueueService:
|
||||
return deleted
|
||||
|
||||
@staticmethod
|
||||
async def clear_completed(db: AsyncSession) -> int:
|
||||
"""Clear completed downloads from queue.
|
||||
async def delete_by_episode(
|
||||
db: AsyncSession,
|
||||
episode_id: int,
|
||||
) -> bool:
|
||||
"""Delete download queue item by episode ID.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
episode_id: Foreign key to Episode
|
||||
|
||||
Returns:
|
||||
Number of items cleared
|
||||
True if deleted, False if not found
|
||||
"""
|
||||
result = await db.execute(
|
||||
delete(DownloadQueueItem).where(
|
||||
DownloadQueueItem.status == DownloadStatus.COMPLETED
|
||||
DownloadQueueItem.episode_id == episode_id
|
||||
)
|
||||
)
|
||||
count = result.rowcount
|
||||
logger.info(f"Cleared {count} completed downloads from queue")
|
||||
return count
|
||||
|
||||
@staticmethod
|
||||
async def retry_failed(
|
||||
db: AsyncSession,
|
||||
max_retries: int = 3,
|
||||
) -> List[DownloadQueueItem]:
|
||||
"""Retry failed downloads that haven't exceeded max retries.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
max_retries: Maximum number of retry attempts
|
||||
|
||||
Returns:
|
||||
List of items marked for retry
|
||||
"""
|
||||
result = await db.execute(
|
||||
select(DownloadQueueItem).where(
|
||||
DownloadQueueItem.status == DownloadStatus.FAILED,
|
||||
DownloadQueueItem.retry_count < max_retries,
|
||||
deleted = result.rowcount > 0
|
||||
if deleted:
|
||||
logger.info(
|
||||
f"Deleted download queue item with episode_id={episode_id}"
|
||||
)
|
||||
)
|
||||
items = list(result.scalars().all())
|
||||
|
||||
for item in items:
|
||||
item.status = DownloadStatus.PENDING
|
||||
item.error_message = None
|
||||
item.progress_percent = 0.0
|
||||
item.downloaded_bytes = 0
|
||||
item.started_at = None
|
||||
item.completed_at = None
|
||||
|
||||
await db.flush()
|
||||
logger.info(f"Marked {len(items)} failed downloads for retry")
|
||||
return items
|
||||
return deleted
|
||||
|
||||
|
||||
# ============================================================================
|
||||
|
||||
Reference in New Issue
Block a user