1fe7392063
This commit adds comprehensive Sonarr webhook integration and implements critical security improvements identified in code review. ## Sonarr Integration - Full webhook support for Grab, Download, Rename, Delete, and Test events - HMAC SHA256 signature verification for webhook authentication - Series mapping system (Sonarr TVDB ID → Anime Provider URL) - 11 new API endpoints for configuration, mappings, search, and downloads - Comprehensive test suite (31 tests, all passing) - Complete documentation in docs/SONARR_INTEGRATION.md ## Security Enhancements - CORS restricted to specific origins (user's IP: 192.168.1.204:3000) - Path traversal prevention via sanitize_filename() and is_safe_filename() - Structured logging infrastructure (replaced all print() statements) - Environment-based configuration with .env support - Filename sanitization prevents malicious path attacks ## New Features - Lpayer and Sibnet downloader support - Kitsu API integration for anime metadata - Recommendation engine based on download history - Latest releases endpoint for new anime - Modular web interface with component-based templates ## Configuration - Centralized settings via app/config.py with pydantic-settings - Sonarr config auto-created in config/ directory - Example configurations provided for easy setup ## Tests - 31 Sonarr integration tests (23 functionality + 9 security) - 100+ tests passing in core test files - Security utilities fully tested ## Documentation - Updated CLAUDE.md with Sonarr and testing info - Added IMPROVEMENTS_2024-01-24.md analysis - Added SONARR_IMPLEMENTATION.md technical summary Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: Happy <yesreply@happy.engineering>
347 lines
13 KiB
Python
347 lines
13 KiB
Python
"""Fetch latest anime releases from external APIs"""
|
|
import httpx
|
|
from datetime import datetime, timedelta
|
|
from typing import List, Dict, Optional
|
|
import asyncio
|
|
import logging
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class AnimeReleasesFetcher:
|
|
"""Fetch latest anime releases from Jikan (MAL) and other sources"""
|
|
|
|
def __init__(self):
|
|
self.jikan_base = "https://api.jikan.moe/v4"
|
|
self.client = httpx.AsyncClient(timeout=30.0, follow_redirects=True)
|
|
self._cache = {}
|
|
self._cache_time = {}
|
|
self._cache_duration = timedelta(hours=1) # Cache for 1 hour
|
|
|
|
async def _get_cached(self, key: str, fetcher):
|
|
"""Get cached result or fetch new data"""
|
|
now = datetime.now()
|
|
|
|
if key in self._cache and key in self._cache_time:
|
|
if now - self._cache_time[key] < self._cache_duration:
|
|
return self._cache[key]
|
|
|
|
# Fetch new data
|
|
result = await fetcher()
|
|
self._cache[key] = result
|
|
self._cache_time[key] = now
|
|
return result
|
|
|
|
async def get_seasonal_anime(self, year: Optional[int] = None, season: Optional[str] = None) -> List[Dict]:
|
|
"""
|
|
Get current season anime from Jikan API
|
|
|
|
Args:
|
|
year: Year (defaults to current year)
|
|
season: Season (winter, spring, summer, fall)
|
|
"""
|
|
async def fetch():
|
|
nonlocal local_year, local_season
|
|
try:
|
|
url = f"{self.jikan_base}/seasons/{local_year}/{local_season}"
|
|
response = await self.client.get(url)
|
|
data = response.json()
|
|
|
|
anime_list = []
|
|
for anime in data.get('data', [])[:20]:
|
|
anime_list.append({
|
|
'title': anime.get('title', ''),
|
|
'title_japanese': anime.get('title_japanese', ''),
|
|
'episodes': anime.get('episodes'),
|
|
'status': anime.get('status', ''),
|
|
'rating': anime.get('rating', ''),
|
|
'score': anime.get('score', 0),
|
|
'genres': [g.get('name') for g in anime.get('genres', [])],
|
|
'synopsis': anime.get('synopsis', ''),
|
|
'images': anime.get('images', {}),
|
|
'url': anime.get('url', ''),
|
|
'mal_id': anime.get('mal_id')
|
|
})
|
|
|
|
return anime_list
|
|
|
|
except Exception as e:
|
|
logger.error(f"Error fetching seasonal anime: {e}", exc_info=True)
|
|
return []
|
|
|
|
# Initialize local variables
|
|
local_year = year if year else datetime.now().year
|
|
local_season = season
|
|
|
|
if not local_season:
|
|
month = datetime.now().month
|
|
if month in [12, 1, 2]:
|
|
local_season = "winter"
|
|
elif month in [3, 4, 5]:
|
|
local_season = "spring"
|
|
elif month in [6, 7, 8]:
|
|
local_season = "summer"
|
|
else:
|
|
local_season = "fall"
|
|
|
|
return await self._get_cached(f"seasonal_{local_year}_{local_season}", fetch)
|
|
|
|
async def get_scheduled_anime(self, day: Optional[str] = None) -> List[Dict]:
|
|
"""
|
|
Get anime scheduled for a specific day
|
|
|
|
Args:
|
|
day: Day of the week (monday, tuesday, etc.)
|
|
"""
|
|
async def fetch():
|
|
nonlocal local_day
|
|
try:
|
|
url = f"{self.jikan_base}/schedules/{local_day}"
|
|
response = await self.client.get(url)
|
|
data = response.json()
|
|
|
|
anime_list = []
|
|
for anime in data.get('data', [])[:15]:
|
|
anime_list.append({
|
|
'title': anime.get('title', ''),
|
|
'episodes': anime.get('episodes'),
|
|
'score': anime.get('score', 0),
|
|
'genres': [g.get('name') for g in anime.get('genres', [])],
|
|
'synopsis': anime.get('synopsis', ''),
|
|
'broadcast': anime.get('broadcast', {}),
|
|
'url': anime.get('url', ''),
|
|
'mal_id': anime.get('mal_id')
|
|
})
|
|
|
|
return anime_list
|
|
|
|
except Exception as e:
|
|
logger.error(f"Error fetching scheduled anime: {e}", exc_info=True)
|
|
return []
|
|
|
|
# Initialize local variable
|
|
local_day = day
|
|
if not local_day:
|
|
days = ['monday', 'tuesday', 'wednesday', 'thursday',
|
|
'friday', 'saturday', 'sunday']
|
|
local_day = days[datetime.now().weekday()]
|
|
|
|
return await self._get_cached(f"scheduled_{local_day}", fetch)
|
|
|
|
async def get_top_anime(self, type: str = "tv", limit: int = 15) -> List[Dict]:
|
|
"""
|
|
Get top anime
|
|
|
|
Args:
|
|
type: Type of anime (tv, movie, etc.)
|
|
limit: Number of results
|
|
"""
|
|
async def fetch():
|
|
try:
|
|
url = f"{self.jikan_base}/top/anime?type={type}&limit={limit}"
|
|
response = await self.client.get(url)
|
|
data = response.json()
|
|
|
|
anime_list = []
|
|
for anime in data.get('data', []):
|
|
anime_list.append({
|
|
'title': anime.get('title', ''),
|
|
'episodes': anime.get('episodes'),
|
|
'status': anime.get('status', ''),
|
|
'score': anime.get('score', 0),
|
|
'rank': anime.get('rank', 0),
|
|
'genres': [g.get('name') for g in anime.get('genres', [])],
|
|
'synopsis': anime.get('synopsis', ''),
|
|
'images': anime.get('images', {}),
|
|
'url': anime.get('url', ''),
|
|
'mal_id': anime.get('mal_id')
|
|
})
|
|
|
|
return anime_list
|
|
|
|
except Exception as e:
|
|
print(f"Error fetching top anime: {e}")
|
|
return []
|
|
|
|
return await self._get_cached(f"top_{type}_{limit}", fetch)
|
|
|
|
async def search_anime(self, query: str, limit: int = 10) -> List[Dict]:
|
|
"""
|
|
Search for anime by name
|
|
|
|
Args:
|
|
query: Search query
|
|
limit: Number of results
|
|
"""
|
|
async def fetch():
|
|
try:
|
|
url = f"{self.jikan_base}/anime?q={query}&limit={limit}"
|
|
response = await self.client.get(url)
|
|
data = response.json()
|
|
|
|
anime_list = []
|
|
for anime in data.get('data', []):
|
|
anime_list.append({
|
|
'title': anime.get('title', ''),
|
|
'episodes': anime.get('episodes'),
|
|
'status': anime.get('status', ''),
|
|
'score': anime.get('score', 0),
|
|
'genres': [g.get('name') for g in anime.get('genres', [])],
|
|
'synopsis': anime.get('synopsis', ''),
|
|
'images': anime.get('images', {}),
|
|
'url': anime.get('url', ''),
|
|
'mal_id': anime.get('mal_id')
|
|
})
|
|
|
|
return anime_list
|
|
|
|
except Exception as e:
|
|
print(f"Error searching anime: {e}")
|
|
return []
|
|
|
|
# Don't cache searches
|
|
return await fetch()
|
|
|
|
async def get_anime_details(self, mal_id: int) -> Optional[Dict]:
|
|
"""
|
|
Get full details of an anime including related anime
|
|
|
|
Args:
|
|
mal_id: MyAnimeList ID of the anime
|
|
|
|
Returns:
|
|
Dict with anime details and related anime
|
|
"""
|
|
async def fetch():
|
|
try:
|
|
# Get anime details
|
|
url = f"{self.jikan_base}/anime/{mal_id}/full"
|
|
response = await self.client.get(url)
|
|
data = response.json()
|
|
|
|
if 'data' not in data:
|
|
return None
|
|
|
|
anime = data['data']
|
|
|
|
# Extract basic info
|
|
anime_details = {
|
|
'mal_id': anime.get('mal_id'),
|
|
'title': anime.get('title'),
|
|
'title_japanese': anime.get('title_japanese'),
|
|
'title_english': anime.get('title_english'),
|
|
'episodes': anime.get('episodes'),
|
|
'status': anime.get('status'),
|
|
'rating': anime.get('rating'),
|
|
'score': anime.get('score'),
|
|
'scored_by': anime.get('scored_by'),
|
|
'rank': anime.get('rank'),
|
|
'popularity': anime.get('popularity'),
|
|
'members': anime.get('members'),
|
|
'favorites': anime.get('favorites'),
|
|
'synopsis': anime.get('synopsis', ''),
|
|
'background': anime.get('background', ''),
|
|
'genres': [g.get('name') for g in anime.get('genres', [])],
|
|
'themes': [t.get('name') for t in anime.get('themes', [])],
|
|
'studios': [s.get('name') for s in anime.get('studios', [])],
|
|
'producers': [p.get('name') for p in anime.get('producers', [])],
|
|
'source': anime.get('source'),
|
|
'duration': anime.get('duration'),
|
|
'season': anime.get('season'),
|
|
'year': anime.get('year'),
|
|
'broadcast': anime.get('broadcast', {}),
|
|
'images': anime.get('images', {}),
|
|
'trailer': anime.get('trailer', {}),
|
|
'url': anime.get('url', ''),
|
|
'related': []
|
|
}
|
|
|
|
# Extract related anime
|
|
relations = anime.get('relations', [])
|
|
for relation in relations:
|
|
relation_type = relation.get('relation', '')
|
|
related_entries = []
|
|
|
|
for entry in relation.get('entry', []):
|
|
related_entries.append({
|
|
'mal_id': entry.get('mal_id'),
|
|
'title': entry.get('title'),
|
|
'type': entry.get('type'),
|
|
'url': entry.get('url')
|
|
})
|
|
|
|
if related_entries:
|
|
anime_details['related'].append({
|
|
'type': relation_type,
|
|
'entries': related_entries
|
|
})
|
|
|
|
return anime_details
|
|
|
|
except Exception as e:
|
|
logger.error(f"Error fetching anime details for MAL ID {mal_id}: {e}", exc_info=True)
|
|
return None
|
|
|
|
return await self._get_cached(f"anime_details_{mal_id}", fetch)
|
|
|
|
async def close(self):
|
|
"""Close the HTTP client"""
|
|
await self.client.aclose()
|
|
|
|
|
|
async def get_latest_releases_with_info(limit: int = 20) -> List[Dict]:
|
|
"""
|
|
Get latest anime releases with detailed information
|
|
|
|
Combines seasonal anime and scheduled anime for current week
|
|
"""
|
|
fetcher = AnimeReleasesFetcher()
|
|
|
|
try:
|
|
# Get current season anime
|
|
seasonal = await fetcher.get_seasonal_anime()
|
|
logger.info(f"Found {len(seasonal)} seasonal anime")
|
|
|
|
# Get anime scheduled for today
|
|
scheduled = await fetcher.get_scheduled_anime()
|
|
logger.info(f"Found {len(scheduled)} scheduled anime")
|
|
|
|
# Combine and deduplicate
|
|
all_anime = {}
|
|
|
|
for anime in seasonal:
|
|
all_anime[anime['mal_id']] = {
|
|
**anime,
|
|
'source': 'seasonal',
|
|
'release_type': 'current_season'
|
|
}
|
|
|
|
for anime in scheduled:
|
|
if anime['mal_id'] not in all_anime:
|
|
all_anime[anime['mal_id']] = {
|
|
**anime,
|
|
'source': 'scheduled',
|
|
'release_type': 'weekly_schedule'
|
|
}
|
|
|
|
# Convert to list and sort by score (handle None scores)
|
|
releases = sorted(
|
|
all_anime.values(),
|
|
key=lambda x: x.get('score') or 0,
|
|
reverse=True
|
|
)
|
|
|
|
# If no releases found, try top anime as fallback
|
|
if not releases:
|
|
logger.warning("No releases found, trying top anime")
|
|
releases = await fetcher.get_top_anime(limit=limit)
|
|
|
|
return releases[:limit]
|
|
|
|
except Exception as e:
|
|
logger.error(f"Error getting latest releases: {e}", exc_info=True)
|
|
# Return empty list on error
|
|
return []
|
|
finally:
|
|
await fetcher.close()
|