Compare commits
9 Commits
251261817
...
fe0c108363
| Author | SHA1 | Date | |
|---|---|---|---|
| fe0c108363 | |||
| 9e8d22ba85 | |||
| 7863658a19 | |||
| 7c97934bb9 | |||
| 3f51e24181 | |||
| ab27ebfadf | |||
| b93b41713a | |||
| ceb8c1c9eb | |||
| 86ca3bdeb2 |
@@ -1 +1 @@
|
||||
251261817
|
||||
271261202
|
||||
|
||||
@@ -24,6 +24,92 @@ def _connect() -> sqlite3.Connection:
|
||||
return sqlite3.connect(_db_path())
|
||||
|
||||
|
||||
def _normalize_title_value(title: Optional[str]) -> Optional[str]:
|
||||
if not isinstance(title, str):
|
||||
return None
|
||||
trimmed = title.strip()
|
||||
return trimmed if trimmed else None
|
||||
|
||||
|
||||
def _normalize_year_value(year: Optional[Any]) -> Optional[int]:
|
||||
if isinstance(year, int):
|
||||
return year
|
||||
if isinstance(year, str):
|
||||
trimmed = year.strip()
|
||||
if trimmed.isdigit():
|
||||
return int(trimmed)
|
||||
return None
|
||||
|
||||
|
||||
def _is_placeholder_title(title: Optional[str], request_id: Optional[int]) -> bool:
|
||||
if not isinstance(title, str):
|
||||
return True
|
||||
normalized = title.strip().lower()
|
||||
if not normalized:
|
||||
return True
|
||||
if normalized == "untitled":
|
||||
return True
|
||||
if request_id and normalized == f"request {request_id}":
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def _extract_title_year_from_payload(payload_json: Optional[str]) -> tuple[Optional[str], Optional[int]]:
|
||||
if not payload_json:
|
||||
return None, None
|
||||
try:
|
||||
payload = json.loads(payload_json)
|
||||
except json.JSONDecodeError:
|
||||
return None, None
|
||||
if not isinstance(payload, dict):
|
||||
return None, None
|
||||
media = payload.get("media") or {}
|
||||
title = None
|
||||
year = None
|
||||
if isinstance(media, dict):
|
||||
title = media.get("title") or media.get("name")
|
||||
year = media.get("year")
|
||||
if not title:
|
||||
title = payload.get("title") or payload.get("name")
|
||||
if year is None:
|
||||
year = payload.get("year")
|
||||
return _normalize_title_value(title), _normalize_year_value(year)
|
||||
|
||||
|
||||
def _extract_tmdb_from_payload(payload_json: Optional[str]) -> tuple[Optional[int], Optional[str]]:
|
||||
if not payload_json:
|
||||
return None, None
|
||||
try:
|
||||
payload = json.loads(payload_json)
|
||||
except (TypeError, json.JSONDecodeError):
|
||||
return None, None
|
||||
if not isinstance(payload, dict):
|
||||
return None, None
|
||||
media = payload.get("media") or {}
|
||||
if not isinstance(media, dict):
|
||||
media = {}
|
||||
tmdb_id = (
|
||||
media.get("tmdbId")
|
||||
or payload.get("tmdbId")
|
||||
or payload.get("tmdb_id")
|
||||
or media.get("externalServiceId")
|
||||
or payload.get("externalServiceId")
|
||||
)
|
||||
media_type = (
|
||||
media.get("mediaType")
|
||||
or payload.get("mediaType")
|
||||
or payload.get("media_type")
|
||||
or payload.get("type")
|
||||
)
|
||||
try:
|
||||
tmdb_id = int(tmdb_id) if tmdb_id is not None else None
|
||||
except (TypeError, ValueError):
|
||||
tmdb_id = None
|
||||
if isinstance(media_type, str):
|
||||
media_type = media_type.strip().lower() or None
|
||||
return tmdb_id, media_type
|
||||
|
||||
|
||||
def init_db() -> None:
|
||||
with _connect() as conn:
|
||||
conn.execute(
|
||||
@@ -93,6 +179,21 @@ def init_db() -> None:
|
||||
)
|
||||
"""
|
||||
)
|
||||
conn.execute(
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS artwork_cache_status (
|
||||
request_id INTEGER PRIMARY KEY,
|
||||
tmdb_id INTEGER,
|
||||
media_type TEXT,
|
||||
poster_path TEXT,
|
||||
backdrop_path TEXT,
|
||||
has_tmdb INTEGER NOT NULL DEFAULT 0,
|
||||
poster_cached INTEGER NOT NULL DEFAULT 0,
|
||||
backdrop_cached INTEGER NOT NULL DEFAULT 0,
|
||||
updated_at TEXT NOT NULL
|
||||
)
|
||||
"""
|
||||
)
|
||||
conn.execute(
|
||||
"""
|
||||
CREATE INDEX IF NOT EXISTS idx_requests_cache_created_at
|
||||
@@ -105,6 +206,12 @@ def init_db() -> None:
|
||||
ON requests_cache (requested_by_norm)
|
||||
"""
|
||||
)
|
||||
conn.execute(
|
||||
"""
|
||||
CREATE INDEX IF NOT EXISTS idx_artwork_cache_status_updated_at
|
||||
ON artwork_cache_status (updated_at)
|
||||
"""
|
||||
)
|
||||
conn.execute(
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS user_activity (
|
||||
@@ -603,7 +710,34 @@ def upsert_request_cache(
|
||||
updated_at: Optional[str],
|
||||
payload_json: str,
|
||||
) -> None:
|
||||
normalized_title = _normalize_title_value(title)
|
||||
normalized_year = _normalize_year_value(year)
|
||||
derived_title = None
|
||||
derived_year = None
|
||||
if not normalized_title or normalized_year is None:
|
||||
derived_title, derived_year = _extract_title_year_from_payload(payload_json)
|
||||
if _is_placeholder_title(normalized_title, request_id):
|
||||
normalized_title = None
|
||||
if derived_title and not normalized_title:
|
||||
normalized_title = derived_title
|
||||
if normalized_year is None and derived_year is not None:
|
||||
normalized_year = derived_year
|
||||
with _connect() as conn:
|
||||
existing_title = None
|
||||
existing_year = None
|
||||
if normalized_title is None or normalized_year is None:
|
||||
row = conn.execute(
|
||||
"SELECT title, year FROM requests_cache WHERE request_id = ?",
|
||||
(request_id,),
|
||||
).fetchone()
|
||||
if row:
|
||||
existing_title, existing_year = row[0], row[1]
|
||||
if _is_placeholder_title(existing_title, request_id):
|
||||
existing_title = None
|
||||
if normalized_title is None and existing_title:
|
||||
normalized_title = existing_title
|
||||
if normalized_year is None and existing_year is not None:
|
||||
normalized_year = existing_year
|
||||
conn.execute(
|
||||
"""
|
||||
INSERT INTO requests_cache (
|
||||
@@ -637,8 +771,8 @@ def upsert_request_cache(
|
||||
media_id,
|
||||
media_type,
|
||||
status,
|
||||
title,
|
||||
year,
|
||||
normalized_title,
|
||||
normalized_year,
|
||||
requested_by,
|
||||
requested_by_norm,
|
||||
created_at,
|
||||
@@ -741,22 +875,11 @@ def get_cached_requests(
|
||||
title = row[4]
|
||||
year = row[5]
|
||||
if (not title or not year) and row[8]:
|
||||
try:
|
||||
payload = json.loads(row[8])
|
||||
if isinstance(payload, dict):
|
||||
media = payload.get("media") or {}
|
||||
if not title:
|
||||
title = (
|
||||
(media.get("title") if isinstance(media, dict) else None)
|
||||
or (media.get("name") if isinstance(media, dict) else None)
|
||||
or payload.get("title")
|
||||
or payload.get("name")
|
||||
)
|
||||
if not year:
|
||||
year = media.get("year") if isinstance(media, dict) else None
|
||||
year = year or payload.get("year")
|
||||
except json.JSONDecodeError:
|
||||
pass
|
||||
derived_title, derived_year = _extract_title_year_from_payload(row[8])
|
||||
if not title:
|
||||
title = derived_title
|
||||
if not year:
|
||||
year = derived_year
|
||||
results.append(
|
||||
{
|
||||
"request_id": row[0],
|
||||
@@ -788,18 +911,8 @@ def get_request_cache_overview(limit: int = 50) -> list[Dict[str, Any]]:
|
||||
for row in rows:
|
||||
title = row[4]
|
||||
if not title and row[9]:
|
||||
try:
|
||||
payload = json.loads(row[9])
|
||||
if isinstance(payload, dict):
|
||||
media = payload.get("media") or {}
|
||||
title = (
|
||||
(media.get("title") if isinstance(media, dict) else None)
|
||||
or (media.get("name") if isinstance(media, dict) else None)
|
||||
or payload.get("title")
|
||||
or payload.get("name")
|
||||
)
|
||||
except json.JSONDecodeError:
|
||||
title = row[4]
|
||||
derived_title, _ = _extract_title_year_from_payload(row[9])
|
||||
title = derived_title or row[4]
|
||||
results.append(
|
||||
{
|
||||
"request_id": row[0],
|
||||
@@ -816,16 +929,160 @@ def get_request_cache_overview(limit: int = 50) -> list[Dict[str, Any]]:
|
||||
return results
|
||||
|
||||
|
||||
def get_request_cache_missing_titles(limit: int = 200) -> list[Dict[str, Any]]:
|
||||
limit = max(1, min(limit, 500))
|
||||
with _connect() as conn:
|
||||
rows = conn.execute(
|
||||
"""
|
||||
SELECT request_id, payload_json
|
||||
FROM requests_cache
|
||||
WHERE title IS NULL OR TRIM(title) = '' OR LOWER(title) = 'untitled'
|
||||
ORDER BY updated_at DESC, request_id DESC
|
||||
LIMIT ?
|
||||
""",
|
||||
(limit,),
|
||||
).fetchall()
|
||||
results: list[Dict[str, Any]] = []
|
||||
for row in rows:
|
||||
payload_json = row[1]
|
||||
tmdb_id, media_type = _extract_tmdb_from_payload(payload_json)
|
||||
results.append(
|
||||
{
|
||||
"request_id": row[0],
|
||||
"payload_json": payload_json,
|
||||
"tmdb_id": tmdb_id,
|
||||
"media_type": media_type,
|
||||
}
|
||||
)
|
||||
return results
|
||||
|
||||
|
||||
def get_request_cache_count() -> int:
|
||||
with _connect() as conn:
|
||||
row = conn.execute("SELECT COUNT(*) FROM requests_cache").fetchone()
|
||||
return int(row[0] or 0)
|
||||
|
||||
|
||||
def upsert_artwork_cache_status(
|
||||
request_id: int,
|
||||
tmdb_id: Optional[int],
|
||||
media_type: Optional[str],
|
||||
poster_path: Optional[str],
|
||||
backdrop_path: Optional[str],
|
||||
has_tmdb: bool,
|
||||
poster_cached: bool,
|
||||
backdrop_cached: bool,
|
||||
) -> None:
|
||||
updated_at = datetime.now(timezone.utc).isoformat()
|
||||
with _connect() as conn:
|
||||
conn.execute(
|
||||
"""
|
||||
INSERT INTO artwork_cache_status (
|
||||
request_id,
|
||||
tmdb_id,
|
||||
media_type,
|
||||
poster_path,
|
||||
backdrop_path,
|
||||
has_tmdb,
|
||||
poster_cached,
|
||||
backdrop_cached,
|
||||
updated_at
|
||||
)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
ON CONFLICT(request_id) DO UPDATE SET
|
||||
tmdb_id = excluded.tmdb_id,
|
||||
media_type = excluded.media_type,
|
||||
poster_path = excluded.poster_path,
|
||||
backdrop_path = excluded.backdrop_path,
|
||||
has_tmdb = excluded.has_tmdb,
|
||||
poster_cached = excluded.poster_cached,
|
||||
backdrop_cached = excluded.backdrop_cached,
|
||||
updated_at = excluded.updated_at
|
||||
""",
|
||||
(
|
||||
request_id,
|
||||
tmdb_id,
|
||||
media_type,
|
||||
poster_path,
|
||||
backdrop_path,
|
||||
1 if has_tmdb else 0,
|
||||
1 if poster_cached else 0,
|
||||
1 if backdrop_cached else 0,
|
||||
updated_at,
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
def get_artwork_cache_status_count() -> int:
|
||||
with _connect() as conn:
|
||||
row = conn.execute("SELECT COUNT(*) FROM artwork_cache_status").fetchone()
|
||||
return int(row[0] or 0)
|
||||
|
||||
|
||||
def get_artwork_cache_missing_count() -> int:
|
||||
with _connect() as conn:
|
||||
row = conn.execute(
|
||||
"""
|
||||
SELECT COUNT(*)
|
||||
FROM artwork_cache_status
|
||||
WHERE (
|
||||
(poster_path IS NULL AND has_tmdb = 1)
|
||||
OR (poster_path IS NOT NULL AND poster_cached = 0)
|
||||
OR (backdrop_path IS NULL AND has_tmdb = 1)
|
||||
OR (backdrop_path IS NOT NULL AND backdrop_cached = 0)
|
||||
)
|
||||
"""
|
||||
).fetchone()
|
||||
return int(row[0] or 0)
|
||||
|
||||
|
||||
def update_artwork_cache_stats(
|
||||
cache_bytes: Optional[int] = None,
|
||||
cache_files: Optional[int] = None,
|
||||
missing_count: Optional[int] = None,
|
||||
total_requests: Optional[int] = None,
|
||||
) -> None:
|
||||
updated_at = datetime.now(timezone.utc).isoformat()
|
||||
if cache_bytes is not None:
|
||||
set_setting("artwork_cache_bytes", str(int(cache_bytes)))
|
||||
if cache_files is not None:
|
||||
set_setting("artwork_cache_files", str(int(cache_files)))
|
||||
if missing_count is not None:
|
||||
set_setting("artwork_cache_missing", str(int(missing_count)))
|
||||
if total_requests is not None:
|
||||
set_setting("artwork_cache_total_requests", str(int(total_requests)))
|
||||
set_setting("artwork_cache_updated_at", updated_at)
|
||||
|
||||
|
||||
def get_artwork_cache_stats() -> Dict[str, Any]:
|
||||
def _get_int(key: str) -> int:
|
||||
value = get_setting(key)
|
||||
if value is None:
|
||||
return 0
|
||||
try:
|
||||
return int(value)
|
||||
except (TypeError, ValueError):
|
||||
return 0
|
||||
|
||||
return {
|
||||
"cache_bytes": _get_int("artwork_cache_bytes"),
|
||||
"cache_files": _get_int("artwork_cache_files"),
|
||||
"missing_artwork": _get_int("artwork_cache_missing"),
|
||||
"total_requests": _get_int("artwork_cache_total_requests"),
|
||||
"updated_at": get_setting("artwork_cache_updated_at"),
|
||||
}
|
||||
|
||||
|
||||
def get_request_cache_stats() -> Dict[str, Any]:
|
||||
return get_artwork_cache_stats()
|
||||
|
||||
|
||||
def update_request_cache_title(
|
||||
request_id: int, title: str, year: Optional[int] = None
|
||||
) -> None:
|
||||
if not title:
|
||||
normalized_title = _normalize_title_value(title)
|
||||
normalized_year = _normalize_year_value(year)
|
||||
if not normalized_title:
|
||||
return
|
||||
with _connect() as conn:
|
||||
conn.execute(
|
||||
@@ -834,10 +1091,38 @@ def update_request_cache_title(
|
||||
SET title = ?, year = COALESCE(?, year)
|
||||
WHERE request_id = ?
|
||||
""",
|
||||
(title, year, request_id),
|
||||
(normalized_title, normalized_year, request_id),
|
||||
)
|
||||
|
||||
|
||||
def repair_request_cache_titles() -> int:
|
||||
updated = 0
|
||||
with _connect() as conn:
|
||||
rows = conn.execute(
|
||||
"""
|
||||
SELECT request_id, title, year, payload_json
|
||||
FROM requests_cache
|
||||
"""
|
||||
).fetchall()
|
||||
for row in rows:
|
||||
request_id, title, year, payload_json = row
|
||||
if not _is_placeholder_title(title, request_id):
|
||||
continue
|
||||
derived_title, derived_year = _extract_title_year_from_payload(payload_json)
|
||||
if not derived_title:
|
||||
continue
|
||||
conn.execute(
|
||||
"""
|
||||
UPDATE requests_cache
|
||||
SET title = ?, year = COALESCE(?, year)
|
||||
WHERE request_id = ?
|
||||
""",
|
||||
(derived_title, derived_year, request_id),
|
||||
)
|
||||
updated += 1
|
||||
return updated
|
||||
|
||||
|
||||
def prune_duplicate_requests_cache() -> int:
|
||||
with _connect() as conn:
|
||||
cursor = conn.execute(
|
||||
@@ -880,6 +1165,39 @@ def get_request_cache_payloads(limit: int = 200, offset: int = 0) -> list[Dict[s
|
||||
return results
|
||||
|
||||
|
||||
def get_request_cache_payloads_missing(limit: int = 200, offset: int = 0) -> list[Dict[str, Any]]:
|
||||
limit = max(1, min(limit, 1000))
|
||||
offset = max(0, offset)
|
||||
with _connect() as conn:
|
||||
rows = conn.execute(
|
||||
"""
|
||||
SELECT rc.request_id, rc.payload_json
|
||||
FROM requests_cache rc
|
||||
JOIN artwork_cache_status acs
|
||||
ON rc.request_id = acs.request_id
|
||||
WHERE (
|
||||
(acs.poster_path IS NULL AND acs.has_tmdb = 1)
|
||||
OR (acs.poster_path IS NOT NULL AND acs.poster_cached = 0)
|
||||
OR (acs.backdrop_path IS NULL AND acs.has_tmdb = 1)
|
||||
OR (acs.backdrop_path IS NOT NULL AND acs.backdrop_cached = 0)
|
||||
)
|
||||
ORDER BY rc.request_id ASC
|
||||
LIMIT ? OFFSET ?
|
||||
""",
|
||||
(limit, offset),
|
||||
).fetchall()
|
||||
results: list[Dict[str, Any]] = []
|
||||
for row in rows:
|
||||
payload = None
|
||||
if row[1]:
|
||||
try:
|
||||
payload = json.loads(row[1])
|
||||
except json.JSONDecodeError:
|
||||
payload = None
|
||||
results.append({"request_id": row[0], "payload": payload})
|
||||
return results
|
||||
|
||||
|
||||
def get_cached_requests_since(since_iso: str) -> list[Dict[str, Any]]:
|
||||
with _connect() as conn:
|
||||
rows = conn.execute(
|
||||
|
||||
@@ -9,6 +9,8 @@ from ..db import (
|
||||
delete_setting,
|
||||
get_all_users,
|
||||
get_request_cache_overview,
|
||||
get_request_cache_missing_titles,
|
||||
get_request_cache_stats,
|
||||
get_settings_overrides,
|
||||
get_user_by_username,
|
||||
set_setting,
|
||||
@@ -21,6 +23,7 @@ from ..db import (
|
||||
clear_history,
|
||||
cleanup_history,
|
||||
update_request_cache_title,
|
||||
repair_request_cache_titles,
|
||||
)
|
||||
from ..runtime import get_runtime_settings
|
||||
from ..clients.sonarr import SonarrClient
|
||||
@@ -99,6 +102,38 @@ def _normalize_root_folders(folders: Any) -> List[Dict[str, Any]]:
|
||||
return results
|
||||
|
||||
|
||||
async def _hydrate_cache_titles_from_jellyseerr(limit: int) -> int:
|
||||
runtime = get_runtime_settings()
|
||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||
if not client.configured():
|
||||
return 0
|
||||
missing = get_request_cache_missing_titles(limit)
|
||||
if not missing:
|
||||
return 0
|
||||
hydrated = 0
|
||||
for row in missing:
|
||||
tmdb_id = row.get("tmdb_id")
|
||||
media_type = row.get("media_type")
|
||||
request_id = row.get("request_id")
|
||||
if not tmdb_id or not media_type or not request_id:
|
||||
continue
|
||||
try:
|
||||
title, year = await requests_router._hydrate_title_from_tmdb(
|
||||
client, media_type, tmdb_id
|
||||
)
|
||||
except Exception:
|
||||
logger.warning(
|
||||
"Requests cache title hydrate failed: request_id=%s tmdb_id=%s",
|
||||
request_id,
|
||||
tmdb_id,
|
||||
)
|
||||
continue
|
||||
if title:
|
||||
update_request_cache_title(request_id, title, year)
|
||||
hydrated += 1
|
||||
return hydrated
|
||||
|
||||
|
||||
def _normalize_quality_profiles(profiles: Any) -> List[Dict[str, Any]]:
|
||||
if not isinstance(profiles, list):
|
||||
return []
|
||||
@@ -243,10 +278,12 @@ async def requests_sync_delta() -> Dict[str, Any]:
|
||||
|
||||
|
||||
@router.post("/requests/artwork/prefetch")
|
||||
async def requests_artwork_prefetch() -> Dict[str, Any]:
|
||||
async def requests_artwork_prefetch(only_missing: bool = False) -> Dict[str, Any]:
|
||||
runtime = get_runtime_settings()
|
||||
state = await requests_router.start_artwork_prefetch(
|
||||
runtime.jellyseerr_base_url, runtime.jellyseerr_api_key
|
||||
runtime.jellyseerr_base_url,
|
||||
runtime.jellyseerr_api_key,
|
||||
only_missing=only_missing,
|
||||
)
|
||||
logger.info("Admin triggered artwork prefetch: status=%s", state.get("status"))
|
||||
return {"status": "ok", "prefetch": state}
|
||||
@@ -256,6 +293,25 @@ async def requests_artwork_prefetch() -> Dict[str, Any]:
|
||||
async def requests_artwork_status() -> Dict[str, Any]:
|
||||
return {"status": "ok", "prefetch": requests_router.get_artwork_prefetch_state()}
|
||||
|
||||
@router.get("/requests/artwork/summary")
|
||||
async def requests_artwork_summary() -> Dict[str, Any]:
|
||||
runtime = get_runtime_settings()
|
||||
cache_mode = (runtime.artwork_cache_mode or "remote").lower()
|
||||
stats = get_request_cache_stats()
|
||||
if cache_mode != "cache":
|
||||
stats["cache_bytes"] = 0
|
||||
stats["cache_files"] = 0
|
||||
stats["missing_artwork"] = 0
|
||||
summary = {
|
||||
"cache_mode": cache_mode,
|
||||
"cache_bytes": stats.get("cache_bytes", 0),
|
||||
"cache_files": stats.get("cache_files", 0),
|
||||
"missing_artwork": stats.get("missing_artwork", 0),
|
||||
"total_requests": stats.get("total_requests", 0),
|
||||
"updated_at": stats.get("updated_at"),
|
||||
}
|
||||
return {"status": "ok", "summary": summary}
|
||||
|
||||
|
||||
@router.get("/requests/sync/status")
|
||||
async def requests_sync_status() -> Dict[str, Any]:
|
||||
@@ -282,27 +338,13 @@ async def read_logs(lines: int = 200) -> Dict[str, Any]:
|
||||
|
||||
@router.get("/requests/cache")
|
||||
async def requests_cache(limit: int = 50) -> Dict[str, Any]:
|
||||
repaired = repair_request_cache_titles()
|
||||
if repaired:
|
||||
logger.info("Requests cache titles repaired via settings view: %s", repaired)
|
||||
hydrated = await _hydrate_cache_titles_from_jellyseerr(limit)
|
||||
if hydrated:
|
||||
logger.info("Requests cache titles hydrated via Jellyseerr: %s", hydrated)
|
||||
rows = get_request_cache_overview(limit)
|
||||
missing_titles = [row for row in rows if not row.get("title")]
|
||||
if missing_titles:
|
||||
runtime = get_runtime_settings()
|
||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||
if client.configured():
|
||||
for row in missing_titles:
|
||||
request_id = row.get("request_id")
|
||||
if not isinstance(request_id, int):
|
||||
continue
|
||||
details = await requests_router._get_request_details(client, request_id)
|
||||
if not isinstance(details, dict):
|
||||
continue
|
||||
payload = requests_router._parse_request_payload(details)
|
||||
title = payload.get("title")
|
||||
if not title:
|
||||
continue
|
||||
row["title"] = title
|
||||
if payload.get("year"):
|
||||
row["year"] = payload.get("year")
|
||||
update_request_cache_title(request_id, title, payload.get("year"))
|
||||
return {"rows": rows}
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import os
|
||||
import re
|
||||
import mimetypes
|
||||
from typing import Optional
|
||||
from fastapi import APIRouter, HTTPException, Response
|
||||
from fastapi.responses import FileResponse, RedirectResponse
|
||||
import httpx
|
||||
@@ -19,13 +20,24 @@ def _safe_filename(path: str) -> str:
|
||||
safe = re.sub(r"[^A-Za-z0-9_.-]", "_", trimmed)
|
||||
return safe or "image"
|
||||
|
||||
|
||||
async def cache_tmdb_image(path: str, size: str = "w342") -> bool:
|
||||
def tmdb_cache_path(path: str, size: str) -> Optional[str]:
|
||||
if not path or "://" in path or ".." in path:
|
||||
return False
|
||||
return None
|
||||
if not path.startswith("/"):
|
||||
path = f"/{path}"
|
||||
if size not in _ALLOWED_SIZES:
|
||||
return None
|
||||
cache_dir = os.path.join(os.getcwd(), "data", "artwork", "tmdb", size)
|
||||
return os.path.join(cache_dir, _safe_filename(path))
|
||||
|
||||
|
||||
def is_tmdb_cached(path: str, size: str) -> bool:
|
||||
file_path = tmdb_cache_path(path, size)
|
||||
return bool(file_path and os.path.exists(file_path))
|
||||
|
||||
|
||||
async def cache_tmdb_image(path: str, size: str = "w342") -> bool:
|
||||
if not path or "://" in path or ".." in path:
|
||||
return False
|
||||
|
||||
runtime = get_runtime_settings()
|
||||
@@ -33,9 +45,10 @@ async def cache_tmdb_image(path: str, size: str = "w342") -> bool:
|
||||
if cache_mode != "cache":
|
||||
return False
|
||||
|
||||
cache_dir = os.path.join(os.getcwd(), "data", "artwork", "tmdb", size)
|
||||
os.makedirs(cache_dir, exist_ok=True)
|
||||
file_path = os.path.join(cache_dir, _safe_filename(path))
|
||||
file_path = tmdb_cache_path(path, size)
|
||||
if not file_path:
|
||||
return False
|
||||
os.makedirs(os.path.dirname(file_path), exist_ok=True)
|
||||
if os.path.exists(file_path):
|
||||
return True
|
||||
|
||||
@@ -64,9 +77,10 @@ async def tmdb_image(path: str, size: str = "w342"):
|
||||
if cache_mode != "cache":
|
||||
return RedirectResponse(url=url)
|
||||
|
||||
cache_dir = os.path.join(os.getcwd(), "data", "artwork", "tmdb", size)
|
||||
os.makedirs(cache_dir, exist_ok=True)
|
||||
file_path = os.path.join(cache_dir, _safe_filename(path))
|
||||
file_path = tmdb_cache_path(path, size)
|
||||
if not file_path:
|
||||
raise HTTPException(status_code=400, detail="Invalid image path")
|
||||
os.makedirs(os.path.dirname(file_path), exist_ok=True)
|
||||
headers = {"Cache-Control": "public, max-age=86400"}
|
||||
if os.path.exists(file_path):
|
||||
media_type = mimetypes.guess_type(file_path)[0] or "image/jpeg"
|
||||
|
||||
@@ -3,6 +3,7 @@ import asyncio
|
||||
import httpx
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import time
|
||||
from urllib.parse import quote
|
||||
from datetime import datetime, timezone, timedelta
|
||||
@@ -17,7 +18,7 @@ from ..clients.prowlarr import ProwlarrClient
|
||||
from ..ai.triage import triage_snapshot
|
||||
from ..auth import get_current_user
|
||||
from ..runtime import get_runtime_settings
|
||||
from .images import cache_tmdb_image
|
||||
from .images import cache_tmdb_image, is_tmdb_cached
|
||||
from ..db import (
|
||||
save_action,
|
||||
get_recent_actions,
|
||||
@@ -30,10 +31,16 @@ from ..db import (
|
||||
get_request_cache_last_updated,
|
||||
get_request_cache_count,
|
||||
get_request_cache_payloads,
|
||||
get_request_cache_payloads_missing,
|
||||
repair_request_cache_titles,
|
||||
prune_duplicate_requests_cache,
|
||||
upsert_request_cache,
|
||||
upsert_artwork_cache_status,
|
||||
get_artwork_cache_missing_count,
|
||||
get_artwork_cache_status_count,
|
||||
get_setting,
|
||||
set_setting,
|
||||
update_artwork_cache_stats,
|
||||
cleanup_history,
|
||||
)
|
||||
from ..models import Snapshot, TriageResult, RequestType
|
||||
@@ -64,6 +71,7 @@ _artwork_prefetch_state: Dict[str, Any] = {
|
||||
"processed": 0,
|
||||
"total": 0,
|
||||
"message": "",
|
||||
"only_missing": False,
|
||||
"started_at": None,
|
||||
"finished_at": None,
|
||||
}
|
||||
@@ -226,6 +234,108 @@ def _extract_artwork_paths(item: Dict[str, Any]) -> tuple[Optional[str], Optiona
|
||||
backdrop_path = item.get("backdropPath") or item.get("backdrop_path")
|
||||
return poster_path, backdrop_path
|
||||
|
||||
def _extract_tmdb_lookup(payload: Dict[str, Any]) -> tuple[Optional[int], Optional[str]]:
|
||||
media = payload.get("media") or {}
|
||||
if not isinstance(media, dict):
|
||||
media = {}
|
||||
tmdb_id = media.get("tmdbId") or payload.get("tmdbId")
|
||||
media_type = (
|
||||
media.get("mediaType")
|
||||
or payload.get("mediaType")
|
||||
or payload.get("type")
|
||||
)
|
||||
try:
|
||||
tmdb_id = int(tmdb_id) if tmdb_id is not None else None
|
||||
except (TypeError, ValueError):
|
||||
tmdb_id = None
|
||||
if isinstance(media_type, str):
|
||||
media_type = media_type.strip().lower() or None
|
||||
else:
|
||||
media_type = None
|
||||
return tmdb_id, media_type
|
||||
|
||||
|
||||
def _artwork_missing_for_payload(payload: Dict[str, Any]) -> bool:
|
||||
poster_path, backdrop_path = _extract_artwork_paths(payload)
|
||||
tmdb_id, media_type = _extract_tmdb_lookup(payload)
|
||||
can_hydrate = bool(tmdb_id and media_type)
|
||||
if poster_path:
|
||||
if not is_tmdb_cached(poster_path, "w185") or not is_tmdb_cached(poster_path, "w342"):
|
||||
return True
|
||||
elif can_hydrate:
|
||||
return True
|
||||
if backdrop_path:
|
||||
if not is_tmdb_cached(backdrop_path, "w780"):
|
||||
return True
|
||||
elif can_hydrate:
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def _compute_cached_flags(
|
||||
poster_path: Optional[str],
|
||||
backdrop_path: Optional[str],
|
||||
cache_mode: str,
|
||||
poster_cached: Optional[bool] = None,
|
||||
backdrop_cached: Optional[bool] = None,
|
||||
) -> tuple[bool, bool]:
|
||||
if cache_mode != "cache":
|
||||
return True, True
|
||||
poster = poster_cached
|
||||
backdrop = backdrop_cached
|
||||
if poster is None:
|
||||
poster = bool(poster_path) and is_tmdb_cached(poster_path, "w185") and is_tmdb_cached(
|
||||
poster_path, "w342"
|
||||
)
|
||||
if backdrop is None:
|
||||
backdrop = bool(backdrop_path) and is_tmdb_cached(backdrop_path, "w780")
|
||||
return bool(poster), bool(backdrop)
|
||||
|
||||
|
||||
def _upsert_artwork_status(
|
||||
payload: Dict[str, Any],
|
||||
cache_mode: str,
|
||||
poster_cached: Optional[bool] = None,
|
||||
backdrop_cached: Optional[bool] = None,
|
||||
) -> None:
|
||||
parsed = _parse_request_payload(payload)
|
||||
request_id = parsed.get("request_id")
|
||||
if not isinstance(request_id, int):
|
||||
return
|
||||
tmdb_id, media_type = _extract_tmdb_lookup(payload)
|
||||
poster_path, backdrop_path = _extract_artwork_paths(payload)
|
||||
has_tmdb = bool(tmdb_id and media_type)
|
||||
poster_cached_flag, backdrop_cached_flag = _compute_cached_flags(
|
||||
poster_path, backdrop_path, cache_mode, poster_cached, backdrop_cached
|
||||
)
|
||||
upsert_artwork_cache_status(
|
||||
request_id=request_id,
|
||||
tmdb_id=tmdb_id,
|
||||
media_type=media_type,
|
||||
poster_path=poster_path,
|
||||
backdrop_path=backdrop_path,
|
||||
has_tmdb=has_tmdb,
|
||||
poster_cached=poster_cached_flag,
|
||||
backdrop_cached=backdrop_cached_flag,
|
||||
)
|
||||
|
||||
|
||||
def _collect_artwork_cache_disk_stats() -> tuple[int, int]:
|
||||
cache_root = os.path.join(os.getcwd(), "data", "artwork")
|
||||
total_bytes = 0
|
||||
total_files = 0
|
||||
if not os.path.isdir(cache_root):
|
||||
return 0, 0
|
||||
for root, _, files in os.walk(cache_root):
|
||||
for name in files:
|
||||
path = os.path.join(root, name)
|
||||
try:
|
||||
total_bytes += os.path.getsize(path)
|
||||
total_files += 1
|
||||
except OSError:
|
||||
continue
|
||||
return total_bytes, total_files
|
||||
|
||||
|
||||
async def _get_request_details(client: JellyseerrClient, request_id: int) -> Optional[Dict[str, Any]]:
|
||||
cache_key = f"request:{request_id}"
|
||||
@@ -471,6 +581,8 @@ async def _sync_all_requests(client: JellyseerrClient) -> int:
|
||||
updated_at=payload.get("updated_at"),
|
||||
payload_json=payload_json,
|
||||
)
|
||||
if isinstance(item, dict):
|
||||
_upsert_artwork_status(item, cache_mode)
|
||||
stored += 1
|
||||
_sync_state["stored"] = stored
|
||||
if len(items) < take:
|
||||
@@ -490,6 +602,11 @@ async def _sync_all_requests(client: JellyseerrClient) -> int:
|
||||
)
|
||||
set_setting(_sync_last_key, datetime.now(timezone.utc).isoformat())
|
||||
_refresh_recent_cache_from_db()
|
||||
if cache_mode == "cache":
|
||||
update_artwork_cache_stats(
|
||||
missing_count=get_artwork_cache_missing_count(),
|
||||
total_requests=get_request_cache_count(),
|
||||
)
|
||||
return stored
|
||||
|
||||
|
||||
@@ -601,6 +718,8 @@ async def _sync_delta_requests(client: JellyseerrClient) -> int:
|
||||
updated_at=payload.get("updated_at"),
|
||||
payload_json=payload_json,
|
||||
)
|
||||
if isinstance(item, dict):
|
||||
_upsert_artwork_status(item, cache_mode)
|
||||
stored += 1
|
||||
page_changed = True
|
||||
_sync_state["stored"] = stored
|
||||
@@ -628,10 +747,20 @@ async def _sync_delta_requests(client: JellyseerrClient) -> int:
|
||||
)
|
||||
set_setting(_sync_last_key, datetime.now(timezone.utc).isoformat())
|
||||
_refresh_recent_cache_from_db()
|
||||
if cache_mode == "cache":
|
||||
update_artwork_cache_stats(
|
||||
missing_count=get_artwork_cache_missing_count(),
|
||||
total_requests=get_request_cache_count(),
|
||||
)
|
||||
return stored
|
||||
|
||||
|
||||
async def _prefetch_artwork_cache(client: JellyseerrClient) -> None:
|
||||
async def _prefetch_artwork_cache(
|
||||
client: JellyseerrClient,
|
||||
only_missing: bool = False,
|
||||
total: Optional[int] = None,
|
||||
use_missing_query: bool = False,
|
||||
) -> None:
|
||||
runtime = get_runtime_settings()
|
||||
cache_mode = (runtime.artwork_cache_mode or "remote").lower()
|
||||
if cache_mode != "cache":
|
||||
@@ -644,74 +773,100 @@ async def _prefetch_artwork_cache(client: JellyseerrClient) -> None:
|
||||
)
|
||||
return
|
||||
|
||||
total = get_request_cache_count()
|
||||
total = total if total is not None else get_request_cache_count()
|
||||
_artwork_prefetch_state.update(
|
||||
{
|
||||
"status": "running",
|
||||
"processed": 0,
|
||||
"total": total,
|
||||
"message": "Starting artwork prefetch",
|
||||
"message": "Starting missing artwork prefetch"
|
||||
if only_missing
|
||||
else "Starting artwork prefetch",
|
||||
"only_missing": only_missing,
|
||||
"started_at": datetime.now(timezone.utc).isoformat(),
|
||||
"finished_at": None,
|
||||
}
|
||||
)
|
||||
if only_missing and total == 0:
|
||||
_artwork_prefetch_state.update(
|
||||
{
|
||||
"status": "completed",
|
||||
"processed": 0,
|
||||
"message": "No missing artwork to cache.",
|
||||
"finished_at": datetime.now(timezone.utc).isoformat(),
|
||||
}
|
||||
)
|
||||
return
|
||||
offset = 0
|
||||
limit = 200
|
||||
processed = 0
|
||||
while True:
|
||||
batch = get_request_cache_payloads(limit=limit, offset=offset)
|
||||
if use_missing_query:
|
||||
batch = get_request_cache_payloads_missing(limit=limit, offset=offset)
|
||||
else:
|
||||
batch = get_request_cache_payloads(limit=limit, offset=offset)
|
||||
if not batch:
|
||||
break
|
||||
for row in batch:
|
||||
payload = row.get("payload")
|
||||
if not isinstance(payload, dict):
|
||||
processed += 1
|
||||
if not only_missing:
|
||||
processed += 1
|
||||
continue
|
||||
if only_missing and not use_missing_query and not _artwork_missing_for_payload(payload):
|
||||
continue
|
||||
poster_path, backdrop_path = _extract_artwork_paths(payload)
|
||||
if not (poster_path or backdrop_path) and client.configured():
|
||||
tmdb_id, media_type = _extract_tmdb_lookup(payload)
|
||||
if (not poster_path or not backdrop_path) and client.configured() and tmdb_id and media_type:
|
||||
media = payload.get("media") or {}
|
||||
tmdb_id = media.get("tmdbId") or payload.get("tmdbId")
|
||||
media_type = media.get("mediaType") or payload.get("type")
|
||||
if tmdb_id and media_type:
|
||||
hydrated_poster, hydrated_backdrop = await _hydrate_artwork_from_tmdb(
|
||||
client, media_type, tmdb_id
|
||||
)
|
||||
poster_path = poster_path or hydrated_poster
|
||||
backdrop_path = backdrop_path or hydrated_backdrop
|
||||
if hydrated_poster or hydrated_backdrop:
|
||||
media = dict(media) if isinstance(media, dict) else {}
|
||||
if hydrated_poster:
|
||||
media["posterPath"] = hydrated_poster
|
||||
if hydrated_backdrop:
|
||||
media["backdropPath"] = hydrated_backdrop
|
||||
payload["media"] = media
|
||||
parsed = _parse_request_payload(payload)
|
||||
request_id = parsed.get("request_id")
|
||||
if isinstance(request_id, int):
|
||||
upsert_request_cache(
|
||||
request_id=request_id,
|
||||
media_id=parsed.get("media_id"),
|
||||
media_type=parsed.get("media_type"),
|
||||
status=parsed.get("status"),
|
||||
title=parsed.get("title"),
|
||||
year=parsed.get("year"),
|
||||
requested_by=parsed.get("requested_by"),
|
||||
requested_by_norm=parsed.get("requested_by_norm"),
|
||||
created_at=parsed.get("created_at"),
|
||||
updated_at=parsed.get("updated_at"),
|
||||
payload_json=json.dumps(payload, ensure_ascii=True),
|
||||
)
|
||||
hydrated_poster, hydrated_backdrop = await _hydrate_artwork_from_tmdb(
|
||||
client, media_type, tmdb_id
|
||||
)
|
||||
poster_path = poster_path or hydrated_poster
|
||||
backdrop_path = backdrop_path or hydrated_backdrop
|
||||
if hydrated_poster or hydrated_backdrop:
|
||||
media = dict(media) if isinstance(media, dict) else {}
|
||||
if hydrated_poster:
|
||||
media["posterPath"] = hydrated_poster
|
||||
if hydrated_backdrop:
|
||||
media["backdropPath"] = hydrated_backdrop
|
||||
payload["media"] = media
|
||||
parsed = _parse_request_payload(payload)
|
||||
request_id = parsed.get("request_id")
|
||||
if isinstance(request_id, int):
|
||||
upsert_request_cache(
|
||||
request_id=request_id,
|
||||
media_id=parsed.get("media_id"),
|
||||
media_type=parsed.get("media_type"),
|
||||
status=parsed.get("status"),
|
||||
title=parsed.get("title"),
|
||||
year=parsed.get("year"),
|
||||
requested_by=parsed.get("requested_by"),
|
||||
requested_by_norm=parsed.get("requested_by_norm"),
|
||||
created_at=parsed.get("created_at"),
|
||||
updated_at=parsed.get("updated_at"),
|
||||
payload_json=json.dumps(payload, ensure_ascii=True),
|
||||
)
|
||||
poster_cached_flag = False
|
||||
backdrop_cached_flag = False
|
||||
if poster_path:
|
||||
try:
|
||||
await cache_tmdb_image(poster_path, "w185")
|
||||
await cache_tmdb_image(poster_path, "w342")
|
||||
poster_cached_flag = bool(
|
||||
await cache_tmdb_image(poster_path, "w185")
|
||||
) and bool(await cache_tmdb_image(poster_path, "w342"))
|
||||
except httpx.HTTPError:
|
||||
pass
|
||||
poster_cached_flag = False
|
||||
if backdrop_path:
|
||||
try:
|
||||
await cache_tmdb_image(backdrop_path, "w780")
|
||||
backdrop_cached_flag = bool(await cache_tmdb_image(backdrop_path, "w780"))
|
||||
except httpx.HTTPError:
|
||||
pass
|
||||
backdrop_cached_flag = False
|
||||
_upsert_artwork_status(
|
||||
payload,
|
||||
cache_mode,
|
||||
poster_cached=poster_cached_flag if poster_path else None,
|
||||
backdrop_cached=backdrop_cached_flag if backdrop_path else None,
|
||||
)
|
||||
processed += 1
|
||||
if processed % 25 == 0:
|
||||
_artwork_prefetch_state.update(
|
||||
@@ -719,6 +874,15 @@ async def _prefetch_artwork_cache(client: JellyseerrClient) -> None:
|
||||
)
|
||||
offset += limit
|
||||
|
||||
total_requests = get_request_cache_count()
|
||||
missing_count = get_artwork_cache_missing_count()
|
||||
cache_bytes, cache_files = _collect_artwork_cache_disk_stats()
|
||||
update_artwork_cache_stats(
|
||||
cache_bytes=cache_bytes,
|
||||
cache_files=cache_files,
|
||||
missing_count=missing_count,
|
||||
total_requests=total_requests,
|
||||
)
|
||||
_artwork_prefetch_state.update(
|
||||
{
|
||||
"status": "completed",
|
||||
@@ -729,25 +893,52 @@ async def _prefetch_artwork_cache(client: JellyseerrClient) -> None:
|
||||
)
|
||||
|
||||
|
||||
async def start_artwork_prefetch(base_url: Optional[str], api_key: Optional[str]) -> Dict[str, Any]:
|
||||
async def start_artwork_prefetch(
|
||||
base_url: Optional[str], api_key: Optional[str], only_missing: bool = False
|
||||
) -> Dict[str, Any]:
|
||||
global _artwork_prefetch_task
|
||||
if _artwork_prefetch_task and not _artwork_prefetch_task.done():
|
||||
return dict(_artwork_prefetch_state)
|
||||
client = JellyseerrClient(base_url, api_key)
|
||||
status_count = get_artwork_cache_status_count()
|
||||
total_requests = get_request_cache_count()
|
||||
use_missing_query = only_missing and status_count >= total_requests and total_requests > 0
|
||||
if only_missing and use_missing_query:
|
||||
total = get_artwork_cache_missing_count()
|
||||
else:
|
||||
total = total_requests
|
||||
_artwork_prefetch_state.update(
|
||||
{
|
||||
"status": "running",
|
||||
"processed": 0,
|
||||
"total": get_request_cache_count(),
|
||||
"message": "Starting artwork prefetch",
|
||||
"total": total,
|
||||
"message": "Seeding artwork cache status"
|
||||
if only_missing and not use_missing_query
|
||||
else ("Starting missing artwork prefetch" if only_missing else "Starting artwork prefetch"),
|
||||
"only_missing": only_missing,
|
||||
"started_at": datetime.now(timezone.utc).isoformat(),
|
||||
"finished_at": None,
|
||||
}
|
||||
)
|
||||
if only_missing and total == 0:
|
||||
_artwork_prefetch_state.update(
|
||||
{
|
||||
"status": "completed",
|
||||
"processed": 0,
|
||||
"message": "No missing artwork to cache.",
|
||||
"finished_at": datetime.now(timezone.utc).isoformat(),
|
||||
}
|
||||
)
|
||||
return dict(_artwork_prefetch_state)
|
||||
|
||||
async def _runner() -> None:
|
||||
try:
|
||||
await _prefetch_artwork_cache(client)
|
||||
await _prefetch_artwork_cache(
|
||||
client,
|
||||
only_missing=only_missing,
|
||||
total=total,
|
||||
use_missing_query=use_missing_query,
|
||||
)
|
||||
except Exception:
|
||||
logger.exception("Artwork prefetch failed")
|
||||
_artwork_prefetch_state.update(
|
||||
@@ -814,13 +1005,14 @@ def _get_recent_from_cache(
|
||||
async def startup_warmup_requests_cache() -> None:
|
||||
runtime = get_runtime_settings()
|
||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||
if not client.configured():
|
||||
return
|
||||
try:
|
||||
await _ensure_requests_cache(client)
|
||||
except httpx.HTTPError as exc:
|
||||
logger.warning("Requests warmup skipped: %s", exc)
|
||||
return
|
||||
if client.configured():
|
||||
try:
|
||||
await _ensure_requests_cache(client)
|
||||
except httpx.HTTPError as exc:
|
||||
logger.warning("Requests warmup skipped: %s", exc)
|
||||
repaired = repair_request_cache_titles()
|
||||
if repaired:
|
||||
logger.info("Requests cache titles repaired: %s", repaired)
|
||||
_refresh_recent_cache_from_db()
|
||||
|
||||
|
||||
@@ -968,7 +1160,10 @@ async def _ensure_request_access(
|
||||
runtime = get_runtime_settings()
|
||||
mode = (runtime.requests_data_source or "prefer_cache").lower()
|
||||
cached = get_request_cache_payload(request_id)
|
||||
if mode != "always_js" and cached is not None:
|
||||
if mode != "always_js":
|
||||
if cached is None:
|
||||
logger.debug("access cache miss: request_id=%s mode=%s", request_id, mode)
|
||||
raise HTTPException(status_code=404, detail="Request not found in cache")
|
||||
logger.debug("access cache hit: request_id=%s mode=%s", request_id, mode)
|
||||
if _request_matches_user(cached, user.get("username", "")):
|
||||
return
|
||||
@@ -1249,13 +1444,15 @@ async def recent_requests(
|
||||
) -> dict:
|
||||
runtime = get_runtime_settings()
|
||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||
if not client.configured():
|
||||
raise HTTPException(status_code=400, detail="Jellyseerr not configured")
|
||||
|
||||
try:
|
||||
await _ensure_requests_cache(client)
|
||||
except httpx.HTTPStatusError as exc:
|
||||
raise HTTPException(status_code=502, detail=str(exc)) from exc
|
||||
mode = (runtime.requests_data_source or "prefer_cache").lower()
|
||||
allow_remote = mode == "always_js"
|
||||
if allow_remote:
|
||||
if not client.configured():
|
||||
raise HTTPException(status_code=400, detail="Jellyseerr not configured")
|
||||
try:
|
||||
await _ensure_requests_cache(client)
|
||||
except httpx.HTTPStatusError as exc:
|
||||
raise HTTPException(status_code=502, detail=str(exc)) from exc
|
||||
|
||||
username_norm = _normalize_username(user.get("username", ""))
|
||||
requested_by = None if user.get("role") == "admin" else username_norm
|
||||
@@ -1266,10 +1463,8 @@ async def recent_requests(
|
||||
_refresh_recent_cache_from_db()
|
||||
rows = _get_recent_from_cache(requested_by, take, skip, since_iso)
|
||||
cache_mode = (runtime.artwork_cache_mode or "remote").lower()
|
||||
mode = (runtime.requests_data_source or "prefer_cache").lower()
|
||||
allow_remote = mode == "always_js"
|
||||
allow_title_hydrate = mode == "prefer_cache"
|
||||
allow_artwork_hydrate = allow_remote or allow_title_hydrate
|
||||
allow_title_hydrate = False
|
||||
allow_artwork_hydrate = allow_remote
|
||||
jellyfin = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
||||
jellyfin_cache: Dict[str, bool] = {}
|
||||
|
||||
@@ -1814,4 +2009,3 @@ async def action_grab(
|
||||
save_action, request_id, "grab", "Grab release", "ok", action_message
|
||||
)
|
||||
return {"status": "ok", "response": {"qbittorrent": "queued"}}
|
||||
|
||||
|
||||
@@ -220,6 +220,7 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
||||
"snapshot cache miss: request_id=%s mode=%s", request_id, mode
|
||||
)
|
||||
|
||||
allow_remote = mode == "always_js" and jellyseerr.configured()
|
||||
if not jellyseerr.configured() and not cached_request:
|
||||
timeline.append(TimelineHop(service="Jellyseerr", status="not_configured"))
|
||||
timeline.append(TimelineHop(service="Sonarr/Radarr", status="not_configured"))
|
||||
@@ -227,9 +228,15 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
||||
timeline.append(TimelineHop(service="qBittorrent", status="not_configured"))
|
||||
snapshot.timeline = timeline
|
||||
return snapshot
|
||||
if cached_request is None and not allow_remote:
|
||||
timeline.append(TimelineHop(service="Jellyseerr", status="cache_miss"))
|
||||
snapshot.timeline = timeline
|
||||
snapshot.state = NormalizedState.unknown
|
||||
snapshot.state_reason = "Request not found in cache"
|
||||
return snapshot
|
||||
|
||||
jelly_request = cached_request
|
||||
if (jelly_request is None or mode == "always_js") and jellyseerr.configured():
|
||||
if allow_remote and (jelly_request is None or mode == "always_js"):
|
||||
try:
|
||||
jelly_request = await jellyseerr.get_request(request_id)
|
||||
logging.getLogger(__name__).debug(
|
||||
@@ -262,7 +269,7 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
||||
poster_path = media.get("posterPath") or media.get("poster_path")
|
||||
backdrop_path = media.get("backdropPath") or media.get("backdrop_path")
|
||||
|
||||
if snapshot.title in {None, "", "Unknown"} and jellyseerr.configured():
|
||||
if snapshot.title in {None, "", "Unknown"} and allow_remote:
|
||||
tmdb_id = jelly_request.get("media", {}).get("tmdbId")
|
||||
if tmdb_id:
|
||||
try:
|
||||
|
||||
@@ -21,14 +21,14 @@ type ServiceOptions = {
|
||||
const SECTION_LABELS: Record<string, string> = {
|
||||
jellyseerr: 'Jellyseerr',
|
||||
jellyfin: 'Jellyfin',
|
||||
artwork: 'Artwork',
|
||||
cache: 'Cache',
|
||||
artwork: 'Artwork cache',
|
||||
cache: 'Cache Control',
|
||||
sonarr: 'Sonarr',
|
||||
radarr: 'Radarr',
|
||||
prowlarr: 'Prowlarr',
|
||||
qbittorrent: 'qBittorrent',
|
||||
log: 'Activity log',
|
||||
requests: 'Request syncing',
|
||||
requests: 'Request sync',
|
||||
site: 'Site',
|
||||
}
|
||||
|
||||
@@ -39,13 +39,13 @@ const BANNER_TONES = ['info', 'warning', 'error', 'maintenance']
|
||||
const SECTION_DESCRIPTIONS: Record<string, string> = {
|
||||
jellyseerr: 'Connect the request system where users submit content.',
|
||||
jellyfin: 'Control Jellyfin login and availability checks.',
|
||||
artwork: 'Configure how posters and artwork are loaded.',
|
||||
cache: 'Manage saved request data and offline artwork.',
|
||||
artwork: 'Cache posters/backdrops and review artwork coverage.',
|
||||
cache: 'Manage saved requests cache and refresh behavior.',
|
||||
sonarr: 'TV automation settings.',
|
||||
radarr: 'Movie automation settings.',
|
||||
prowlarr: 'Indexer search settings.',
|
||||
qbittorrent: 'Downloader connection settings.',
|
||||
requests: 'Sync and refresh cadence for requests.',
|
||||
requests: 'Control how often requests are refreshed and cleaned up.',
|
||||
log: 'Activity log for troubleshooting.',
|
||||
site: 'Sitewide banner, version, and changelog details.',
|
||||
}
|
||||
@@ -53,7 +53,7 @@ const SECTION_DESCRIPTIONS: Record<string, string> = {
|
||||
const SETTINGS_SECTION_MAP: Record<string, string | null> = {
|
||||
jellyseerr: 'jellyseerr',
|
||||
jellyfin: 'jellyfin',
|
||||
artwork: 'artwork',
|
||||
artwork: null,
|
||||
sonarr: 'sonarr',
|
||||
radarr: 'radarr',
|
||||
prowlarr: 'prowlarr',
|
||||
@@ -73,13 +73,13 @@ const labelFromKey = (key: string) =>
|
||||
.replace('quality profile id', 'Quality profile ID')
|
||||
.replace('root folder', 'Root folder')
|
||||
.replace('qbittorrent', 'qBittorrent')
|
||||
.replace('requests sync ttl minutes', 'Refresh saved requests if older than (minutes)')
|
||||
.replace('requests poll interval seconds', 'Background refresh check (seconds)')
|
||||
.replace('requests delta sync interval minutes', 'Check for new or updated requests every (minutes)')
|
||||
.replace('requests full sync time', 'Full refresh time (24h)')
|
||||
.replace('requests cleanup time', 'Clean up old history time (24h)')
|
||||
.replace('requests cleanup days', 'Remove history older than (days)')
|
||||
.replace('requests data source', 'Where requests are loaded from')
|
||||
.replace('requests sync ttl minutes', 'Saved request refresh TTL (minutes)')
|
||||
.replace('requests poll interval seconds', 'Full refresh check interval (seconds)')
|
||||
.replace('requests delta sync interval minutes', 'Delta sync interval (minutes)')
|
||||
.replace('requests full sync time', 'Daily full refresh time (24h)')
|
||||
.replace('requests cleanup time', 'Daily history cleanup time (24h)')
|
||||
.replace('requests cleanup days', 'History retention window (days)')
|
||||
.replace('requests data source', 'Request source (cache vs Jellyseerr)')
|
||||
.replace('jellyfin public url', 'Jellyfin public URL')
|
||||
.replace('jellyfin sync to arr', 'Sync Jellyfin to Sonarr/Radarr')
|
||||
.replace('artwork cache mode', 'Artwork cache mode')
|
||||
@@ -89,6 +89,19 @@ const labelFromKey = (key: string) =>
|
||||
.replace('site banner tone', 'Sitewide banner tone')
|
||||
.replace('site changelog', 'Changelog text')
|
||||
|
||||
const formatBytes = (value?: number | null) => {
|
||||
if (!value || value <= 0) return '0 B'
|
||||
const units = ['B', 'KB', 'MB', 'GB', 'TB']
|
||||
let size = value
|
||||
let unitIndex = 0
|
||||
while (size >= 1024 && unitIndex < units.length - 1) {
|
||||
size /= 1024
|
||||
unitIndex += 1
|
||||
}
|
||||
const decimals = unitIndex === 0 || size >= 10 ? 0 : 1
|
||||
return `${size.toFixed(decimals)} ${units[unitIndex]}`
|
||||
}
|
||||
|
||||
type SettingsPageProps = {
|
||||
section: string
|
||||
}
|
||||
@@ -114,6 +127,8 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
||||
const [cacheStatus, setCacheStatus] = useState<string | null>(null)
|
||||
const [requestsSync, setRequestsSync] = useState<any | null>(null)
|
||||
const [artworkPrefetch, setArtworkPrefetch] = useState<any | null>(null)
|
||||
const [artworkSummary, setArtworkSummary] = useState<any | null>(null)
|
||||
const [artworkSummaryStatus, setArtworkSummaryStatus] = useState<string | null>(null)
|
||||
const [maintenanceStatus, setMaintenanceStatus] = useState<string | null>(null)
|
||||
const [maintenanceBusy, setMaintenanceBusy] = useState(false)
|
||||
|
||||
@@ -165,6 +180,27 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
||||
}
|
||||
}, [])
|
||||
|
||||
const loadArtworkSummary = useCallback(async () => {
|
||||
setArtworkSummaryStatus(null)
|
||||
try {
|
||||
const baseUrl = getApiBase()
|
||||
const response = await authFetch(`${baseUrl}/admin/requests/artwork/summary`)
|
||||
if (!response.ok) {
|
||||
const text = await response.text()
|
||||
throw new Error(text || 'Artwork summary fetch failed')
|
||||
}
|
||||
const data = await response.json()
|
||||
setArtworkSummary(data?.summary ?? null)
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
const message =
|
||||
err instanceof Error && err.message
|
||||
? err.message.replace(/^\\{\"detail\":\"|\"\\}$/g, '')
|
||||
: 'Could not load artwork stats.'
|
||||
setArtworkSummaryStatus(message)
|
||||
}
|
||||
}, [])
|
||||
|
||||
const loadOptions = useCallback(async (service: 'sonarr' | 'radarr') => {
|
||||
try {
|
||||
const baseUrl = getApiBase()
|
||||
@@ -204,8 +240,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
||||
}
|
||||
try {
|
||||
await loadSettings()
|
||||
if (section === 'artwork') {
|
||||
if (section === 'cache' || section === 'artwork') {
|
||||
await loadArtworkPrefetchStatus()
|
||||
await loadArtworkSummary()
|
||||
}
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
@@ -222,7 +259,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
||||
if (section === 'radarr') {
|
||||
void loadOptions('radarr')
|
||||
}
|
||||
}, [loadArtworkPrefetchStatus, loadOptions, loadSettings, router, section])
|
||||
}, [loadArtworkPrefetchStatus, loadArtworkSummary, loadOptions, loadSettings, router, section])
|
||||
|
||||
const groupedSettings = useMemo(() => {
|
||||
const groups: Record<string, AdminSetting[]> = {}
|
||||
@@ -237,28 +274,51 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
||||
const settingsSection = SETTINGS_SECTION_MAP[section] ?? null
|
||||
const visibleSections = settingsSection ? [settingsSection] : []
|
||||
const isCacheSection = section === 'cache'
|
||||
const cacheSettingKeys = new Set([
|
||||
'requests_sync_ttl_minutes',
|
||||
'requests_data_source',
|
||||
'artwork_cache_mode',
|
||||
])
|
||||
const cacheSettingKeys = new Set(['requests_sync_ttl_minutes', 'requests_data_source'])
|
||||
const artworkSettingKeys = new Set(['artwork_cache_mode'])
|
||||
const hiddenSettingKeys = new Set([...cacheSettingKeys, ...artworkSettingKeys])
|
||||
const requestSettingOrder = [
|
||||
'requests_poll_interval_seconds',
|
||||
'requests_delta_sync_interval_minutes',
|
||||
'requests_full_sync_time',
|
||||
'requests_cleanup_time',
|
||||
'requests_cleanup_days',
|
||||
]
|
||||
const sortByOrder = (items: AdminSetting[], order: string[]) => {
|
||||
const position = new Map(order.map((key, index) => [key, index]))
|
||||
return [...items].sort((a, b) => {
|
||||
const aIndex = position.get(a.key) ?? Number.POSITIVE_INFINITY
|
||||
const bIndex = position.get(b.key) ?? Number.POSITIVE_INFINITY
|
||||
if (aIndex !== bIndex) return aIndex - bIndex
|
||||
return a.key.localeCompare(b.key)
|
||||
})
|
||||
}
|
||||
const cacheSettings = settings.filter((setting) => cacheSettingKeys.has(setting.key))
|
||||
const artworkSettings = settings.filter((setting) => artworkSettingKeys.has(setting.key))
|
||||
const settingsSections = isCacheSection
|
||||
? [{ key: 'cache', title: 'Cache settings', items: cacheSettings }]
|
||||
? [
|
||||
{ key: 'cache', title: 'Cache control', items: cacheSettings },
|
||||
{ key: 'artwork', title: 'Artwork cache', items: artworkSettings },
|
||||
]
|
||||
: visibleSections.map((sectionKey) => ({
|
||||
key: sectionKey,
|
||||
title: SECTION_LABELS[sectionKey] ?? sectionKey,
|
||||
items:
|
||||
sectionKey === 'requests' || sectionKey === 'artwork'
|
||||
? (groupedSettings[sectionKey] ?? []).filter(
|
||||
(setting) => !cacheSettingKeys.has(setting.key)
|
||||
)
|
||||
: groupedSettings[sectionKey] ?? [],
|
||||
items: (() => {
|
||||
const sectionItems = groupedSettings[sectionKey] ?? []
|
||||
const filtered =
|
||||
sectionKey === 'requests' || sectionKey === 'artwork'
|
||||
? sectionItems.filter((setting) => !hiddenSettingKeys.has(setting.key))
|
||||
: sectionItems
|
||||
if (sectionKey === 'requests') {
|
||||
return sortByOrder(filtered, requestSettingOrder)
|
||||
}
|
||||
return filtered
|
||||
})(),
|
||||
}))
|
||||
const showLogs = section === 'logs'
|
||||
const showMaintenance = section === 'maintenance'
|
||||
const showRequestsExtras = section === 'requests'
|
||||
const showArtworkExtras = section === 'artwork'
|
||||
const showArtworkExtras = section === 'cache'
|
||||
const showCacheExtras = section === 'cache'
|
||||
const shouldRenderSection = (sectionGroup: { key: string; items?: AdminSetting[] }) => {
|
||||
if (sectionGroup.items && sectionGroup.items.length > 0) return true
|
||||
@@ -292,12 +352,15 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
||||
qbittorrent_username: 'qBittorrent login username.',
|
||||
qbittorrent_password: 'qBittorrent login password.',
|
||||
requests_sync_ttl_minutes: 'How long saved requests stay fresh before a refresh is needed.',
|
||||
requests_poll_interval_seconds: 'How often the background checker runs.',
|
||||
requests_delta_sync_interval_minutes: 'How often we check for new or updated requests.',
|
||||
requests_full_sync_time: 'Daily time to refresh the full request list.',
|
||||
requests_cleanup_time: 'Daily time to trim old history.',
|
||||
requests_poll_interval_seconds:
|
||||
'How often Magent checks if a full refresh should run.',
|
||||
requests_delta_sync_interval_minutes:
|
||||
'How often we poll for new or updated requests.',
|
||||
requests_full_sync_time: 'Daily time to rebuild the full request cache.',
|
||||
requests_cleanup_time: 'Daily time to trim old request history.',
|
||||
requests_cleanup_days: 'History older than this is removed during cleanup.',
|
||||
requests_data_source: 'Pick where Magent should read requests from.',
|
||||
requests_data_source:
|
||||
'Pick where Magent should read requests from. Cache-only avoids Jellyseerr lookups on reads.',
|
||||
log_level: 'How much detail is written to the activity log.',
|
||||
log_file: 'Where the activity log is stored.',
|
||||
site_build_number: 'Build number shown in the account menu (auto-set from releases).',
|
||||
@@ -462,6 +525,31 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
||||
}
|
||||
}
|
||||
|
||||
const prefetchArtworkMissing = async () => {
|
||||
setArtworkPrefetchStatus(null)
|
||||
try {
|
||||
const baseUrl = getApiBase()
|
||||
const response = await authFetch(
|
||||
`${baseUrl}/admin/requests/artwork/prefetch?only_missing=1`,
|
||||
{ method: 'POST' }
|
||||
)
|
||||
if (!response.ok) {
|
||||
const text = await response.text()
|
||||
throw new Error(text || 'Missing artwork prefetch failed')
|
||||
}
|
||||
const data = await response.json()
|
||||
setArtworkPrefetch(data?.prefetch ?? null)
|
||||
setArtworkPrefetchStatus('Missing artwork caching started.')
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
const message =
|
||||
err instanceof Error && err.message
|
||||
? err.message.replace(/^\\{\"detail\":\"|\"\\}$/g, '')
|
||||
: 'Could not cache missing artwork.'
|
||||
setArtworkPrefetchStatus(message)
|
||||
}
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (!artworkPrefetch || artworkPrefetch.status !== 'running') {
|
||||
return
|
||||
@@ -479,6 +567,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
||||
setArtworkPrefetch(data?.prefetch ?? null)
|
||||
if (data?.prefetch?.status && data.prefetch.status !== 'running') {
|
||||
setArtworkPrefetchStatus(data.prefetch.message || 'Artwork caching complete.')
|
||||
void loadArtworkSummary()
|
||||
}
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
@@ -488,7 +577,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
||||
active = false
|
||||
clearInterval(timer)
|
||||
}
|
||||
}, [artworkPrefetch])
|
||||
}, [artworkPrefetch, loadArtworkSummary])
|
||||
|
||||
useEffect(() => {
|
||||
if (!artworkPrefetch || artworkPrefetch.status === 'running') {
|
||||
@@ -714,7 +803,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
||||
.map((sectionGroup) => (
|
||||
<section key={sectionGroup.key} className="admin-section">
|
||||
<div className="section-header">
|
||||
<h2>{sectionGroup.key === 'requests' ? 'Sync controls' : sectionGroup.title}</h2>
|
||||
<h2>
|
||||
{sectionGroup.key === 'requests' ? 'Request sync controls' : sectionGroup.title}
|
||||
</h2>
|
||||
{sectionGroup.key === 'sonarr' && (
|
||||
<button type="button" onClick={() => loadOptions('sonarr')}>
|
||||
Refresh Sonarr options
|
||||
@@ -730,24 +821,33 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
||||
Import Jellyfin users
|
||||
</button>
|
||||
)}
|
||||
{(showArtworkExtras && sectionGroup.key === 'artwork') ||
|
||||
(showCacheExtras && sectionGroup.key === 'cache') ? (
|
||||
<button type="button" onClick={prefetchArtwork}>
|
||||
Cache all artwork now
|
||||
</button>
|
||||
{showArtworkExtras && sectionGroup.key === 'artwork' ? (
|
||||
<div className="sync-actions">
|
||||
<button type="button" onClick={prefetchArtwork}>
|
||||
Cache all artwork now
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
className="ghost-button"
|
||||
onClick={prefetchArtworkMissing}
|
||||
>
|
||||
Sync only missing artwork
|
||||
</button>
|
||||
</div>
|
||||
) : null}
|
||||
{showRequestsExtras && sectionGroup.key === 'requests' && (
|
||||
<div className="sync-actions-block">
|
||||
<div className="sync-actions">
|
||||
<button type="button" onClick={syncRequests}>
|
||||
Full refresh (all requests)
|
||||
Run full refresh (rebuild cache)
|
||||
</button>
|
||||
<button type="button" className="ghost-button" onClick={syncRequestsDelta}>
|
||||
Quick refresh (delta changes)
|
||||
Run delta sync (recent changes)
|
||||
</button>
|
||||
</div>
|
||||
<div className="meta sync-note">
|
||||
Full refresh reloads the entire list. Quick refresh only checks recent changes.
|
||||
Full refresh rebuilds the entire cache. Delta sync only checks new or updated
|
||||
requests.
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
@@ -764,17 +864,48 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
||||
{sectionGroup.key === 'jellyfin' && jellyfinSyncStatus && (
|
||||
<div className="status-banner">{jellyfinSyncStatus}</div>
|
||||
)}
|
||||
{((showArtworkExtras && sectionGroup.key === 'artwork') ||
|
||||
(showCacheExtras && sectionGroup.key === 'cache')) &&
|
||||
artworkPrefetchStatus && (
|
||||
{showArtworkExtras && sectionGroup.key === 'artwork' && artworkPrefetchStatus && (
|
||||
<div className="status-banner">{artworkPrefetchStatus}</div>
|
||||
)}
|
||||
{showArtworkExtras && sectionGroup.key === 'artwork' && artworkSummaryStatus && (
|
||||
<div className="status-banner">{artworkSummaryStatus}</div>
|
||||
)}
|
||||
{showArtworkExtras && sectionGroup.key === 'artwork' && (
|
||||
<div className="summary">
|
||||
<div className="summary-card">
|
||||
<strong>Missing artwork</strong>
|
||||
<p>{artworkSummary?.missing_artwork ?? '--'}</p>
|
||||
<div className="meta">Requests missing poster/backdrop or cache files.</div>
|
||||
</div>
|
||||
<div className="summary-card">
|
||||
<strong>Artwork cache size</strong>
|
||||
<p>{formatBytes(artworkSummary?.cache_bytes)}</p>
|
||||
<div className="meta">
|
||||
{artworkSummary?.cache_files ?? '--'} cached files
|
||||
</div>
|
||||
</div>
|
||||
<div className="summary-card">
|
||||
<strong>Total requests</strong>
|
||||
<p>{artworkSummary?.total_requests ?? '--'}</p>
|
||||
<div className="meta">Requests currently tracked in cache.</div>
|
||||
</div>
|
||||
<div className="summary-card">
|
||||
<strong>Cache mode</strong>
|
||||
<p>{artworkSummary?.cache_mode ?? '--'}</p>
|
||||
<div className="meta">Artwork setting applied to posters/backdrops.</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{showRequestsExtras && sectionGroup.key === 'requests' && requestsSyncStatus && (
|
||||
<div className="status-banner">{requestsSyncStatus}</div>
|
||||
)}
|
||||
{((showArtworkExtras && sectionGroup.key === 'artwork') ||
|
||||
(showCacheExtras && sectionGroup.key === 'cache')) &&
|
||||
artworkPrefetch && (
|
||||
{showRequestsExtras && sectionGroup.key === 'requests' && (
|
||||
<div className="status-banner">
|
||||
Full refresh checks only decide when to run a full refresh. The delta sync interval
|
||||
polls for new or updated requests.
|
||||
</div>
|
||||
)}
|
||||
{showArtworkExtras && sectionGroup.key === 'artwork' && artworkPrefetch && (
|
||||
<div className="sync-progress">
|
||||
<div className="sync-meta">
|
||||
<span>Status: {artworkPrefetch.status}</span>
|
||||
@@ -1129,7 +1260,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
||||
}
|
||||
>
|
||||
<option value="always_js">Always use Jellyseerr (slower)</option>
|
||||
<option value="prefer_cache">Use saved requests first (faster)</option>
|
||||
<option value="prefer_cache">
|
||||
Use saved requests only (fastest)
|
||||
</option>
|
||||
</select>
|
||||
</label>
|
||||
)
|
||||
@@ -1199,7 +1332,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
||||
</form>
|
||||
) : (
|
||||
<div className="status-banner">
|
||||
No settings to show here yet. Try the Cache page for artwork and saved-request controls.
|
||||
No settings to show here yet. Try the Cache Control page for artwork and saved-request controls.
|
||||
</div>
|
||||
)}
|
||||
{showLogs && (
|
||||
|
||||
@@ -1326,6 +1326,17 @@ button span {
|
||||
|
||||
.progress-indeterminate .progress-fill {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
left: 0;
|
||||
top: 0;
|
||||
background: linear-gradient(
|
||||
90deg,
|
||||
rgba(255, 255, 255, 0),
|
||||
var(--accent-2),
|
||||
var(--accent-3),
|
||||
rgba(255, 255, 255, 0)
|
||||
);
|
||||
background-size: 200% 100%;
|
||||
animation: progress-indeterminate 1.6s ease-in-out infinite;
|
||||
}
|
||||
|
||||
@@ -1509,13 +1520,10 @@ button span {
|
||||
|
||||
@keyframes progress-indeterminate {
|
||||
0% {
|
||||
transform: translateX(-50%);
|
||||
}
|
||||
50% {
|
||||
transform: translateX(120%);
|
||||
background-position: 200% 0;
|
||||
}
|
||||
100% {
|
||||
transform: translateX(-50%);
|
||||
background-position: -200% 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -17,9 +17,8 @@ const NAV_GROUPS = [
|
||||
{
|
||||
title: 'Requests',
|
||||
items: [
|
||||
{ href: '/admin/requests', label: 'Request syncing' },
|
||||
{ href: '/admin/artwork', label: 'Artwork' },
|
||||
{ href: '/admin/cache', label: 'Cache' },
|
||||
{ href: '/admin/requests', label: 'Request sync' },
|
||||
{ href: '/admin/cache', label: 'Cache Control' },
|
||||
],
|
||||
},
|
||||
{
|
||||
|
||||
@@ -25,6 +25,8 @@ export default function UsersPage() {
|
||||
const [users, setUsers] = useState<AdminUser[]>([])
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [loading, setLoading] = useState(true)
|
||||
const [jellyfinSyncStatus, setJellyfinSyncStatus] = useState<string | null>(null)
|
||||
const [jellyfinSyncBusy, setJellyfinSyncBusy] = useState(false)
|
||||
|
||||
const loadUsers = async () => {
|
||||
try {
|
||||
@@ -103,6 +105,28 @@ export default function UsersPage() {
|
||||
}
|
||||
}
|
||||
|
||||
const syncJellyfinUsers = async () => {
|
||||
setJellyfinSyncStatus(null)
|
||||
setJellyfinSyncBusy(true)
|
||||
try {
|
||||
const baseUrl = getApiBase()
|
||||
const response = await authFetch(`${baseUrl}/admin/jellyfin/users/sync`, {
|
||||
method: 'POST',
|
||||
})
|
||||
if (!response.ok) {
|
||||
const text = await response.text()
|
||||
throw new Error(text || 'Sync failed')
|
||||
}
|
||||
const data = await response.json()
|
||||
setJellyfinSyncStatus(`Synced ${data?.imported ?? 0} Jellyfin users.`)
|
||||
await loadUsers()
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
setJellyfinSyncStatus('Could not sync Jellyfin users.')
|
||||
} finally {
|
||||
setJellyfinSyncBusy(false)
|
||||
}
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (!getToken()) {
|
||||
@@ -121,13 +145,19 @@ export default function UsersPage() {
|
||||
title="Users"
|
||||
subtitle="Manage who can use Magent."
|
||||
actions={
|
||||
<button type="button" onClick={loadUsers}>
|
||||
Reload list
|
||||
</button>
|
||||
<>
|
||||
<button type="button" onClick={loadUsers}>
|
||||
Reload list
|
||||
</button>
|
||||
<button type="button" onClick={syncJellyfinUsers} disabled={jellyfinSyncBusy}>
|
||||
{jellyfinSyncBusy ? 'Syncing Jellyfin users...' : 'Sync Jellyfin users'}
|
||||
</button>
|
||||
</>
|
||||
}
|
||||
>
|
||||
<section className="admin-section">
|
||||
{error && <div className="error-banner">{error}</div>}
|
||||
{jellyfinSyncStatus && <div className="status-banner">{jellyfinSyncStatus}</div>}
|
||||
{users.length === 0 ? (
|
||||
<div className="status-banner">No users found yet.</div>
|
||||
) : (
|
||||
|
||||
Reference in New Issue
Block a user