Compare commits
19 Commits
251261718
...
b98239ab3e
| Author | SHA1 | Date | |
|---|---|---|---|
| b98239ab3e | |||
| 40dc46c0c5 | |||
| d23d84ea42 | |||
| 7d6cdcbe02 | |||
| 0e95f94025 | |||
| 8b1a09fbd4 | |||
| fe0c108363 | |||
| 9e8d22ba85 | |||
| 7863658a19 | |||
| 7c97934bb9 | |||
| 3f51e24181 | |||
| ab27ebfadf | |||
| b93b41713a | |||
| ceb8c1c9eb | |||
| 86ca3bdeb2 | |||
| 22f90b7e07 | |||
| 57a4883931 | |||
| 6ba41b854b | |||
| 580b335268 |
1
.build_number
Normal file
1
.build_number
Normal file
@@ -0,0 +1 @@
|
|||||||
|
271261524
|
||||||
BIN
backend/app/assets/branding/favicon.ico
Normal file
BIN
backend/app/assets/branding/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.8 KiB |
BIN
backend/app/assets/branding/logo.png
Normal file
BIN
backend/app/assets/branding/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
@@ -24,6 +24,92 @@ def _connect() -> sqlite3.Connection:
|
|||||||
return sqlite3.connect(_db_path())
|
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:
|
def init_db() -> None:
|
||||||
with _connect() as conn:
|
with _connect() as conn:
|
||||||
conn.execute(
|
conn.execute(
|
||||||
@@ -61,7 +147,9 @@ def init_db() -> None:
|
|||||||
auth_provider TEXT NOT NULL DEFAULT 'local',
|
auth_provider TEXT NOT NULL DEFAULT 'local',
|
||||||
created_at TEXT NOT NULL,
|
created_at TEXT NOT NULL,
|
||||||
last_login_at TEXT,
|
last_login_at TEXT,
|
||||||
is_blocked INTEGER NOT NULL DEFAULT 0
|
is_blocked INTEGER NOT NULL DEFAULT 0,
|
||||||
|
jellyfin_password_hash TEXT,
|
||||||
|
last_jellyfin_auth_at TEXT
|
||||||
)
|
)
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
@@ -91,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(
|
conn.execute(
|
||||||
"""
|
"""
|
||||||
CREATE INDEX IF NOT EXISTS idx_requests_cache_created_at
|
CREATE INDEX IF NOT EXISTS idx_requests_cache_created_at
|
||||||
@@ -103,6 +206,12 @@ def init_db() -> None:
|
|||||||
ON requests_cache (requested_by_norm)
|
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(
|
conn.execute(
|
||||||
"""
|
"""
|
||||||
CREATE TABLE IF NOT EXISTS user_activity (
|
CREATE TABLE IF NOT EXISTS user_activity (
|
||||||
@@ -141,6 +250,14 @@ def init_db() -> None:
|
|||||||
conn.execute("ALTER TABLE users ADD COLUMN auth_provider TEXT NOT NULL DEFAULT 'local'")
|
conn.execute("ALTER TABLE users ADD COLUMN auth_provider TEXT NOT NULL DEFAULT 'local'")
|
||||||
except sqlite3.OperationalError:
|
except sqlite3.OperationalError:
|
||||||
pass
|
pass
|
||||||
|
try:
|
||||||
|
conn.execute("ALTER TABLE users ADD COLUMN jellyfin_password_hash TEXT")
|
||||||
|
except sqlite3.OperationalError:
|
||||||
|
pass
|
||||||
|
try:
|
||||||
|
conn.execute("ALTER TABLE users ADD COLUMN last_jellyfin_auth_at TEXT")
|
||||||
|
except sqlite3.OperationalError:
|
||||||
|
pass
|
||||||
_backfill_auth_providers()
|
_backfill_auth_providers()
|
||||||
ensure_admin_user()
|
ensure_admin_user()
|
||||||
|
|
||||||
@@ -277,7 +394,8 @@ def get_user_by_username(username: str) -> Optional[Dict[str, Any]]:
|
|||||||
with _connect() as conn:
|
with _connect() as conn:
|
||||||
row = conn.execute(
|
row = conn.execute(
|
||||||
"""
|
"""
|
||||||
SELECT id, username, password_hash, role, auth_provider, created_at, last_login_at, is_blocked
|
SELECT id, username, password_hash, role, auth_provider, created_at, last_login_at,
|
||||||
|
is_blocked, jellyfin_password_hash, last_jellyfin_auth_at
|
||||||
FROM users
|
FROM users
|
||||||
WHERE username = ?
|
WHERE username = ?
|
||||||
""",
|
""",
|
||||||
@@ -294,6 +412,8 @@ def get_user_by_username(username: str) -> Optional[Dict[str, Any]]:
|
|||||||
"created_at": row[5],
|
"created_at": row[5],
|
||||||
"last_login_at": row[6],
|
"last_login_at": row[6],
|
||||||
"is_blocked": bool(row[7]),
|
"is_blocked": bool(row[7]),
|
||||||
|
"jellyfin_password_hash": row[8],
|
||||||
|
"last_jellyfin_auth_at": row[9],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -373,6 +493,22 @@ def set_user_password(username: str, password: str) -> None:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def set_jellyfin_auth_cache(username: str, password: str) -> None:
|
||||||
|
if not username or not password:
|
||||||
|
return
|
||||||
|
password_hash = hash_password(password)
|
||||||
|
timestamp = datetime.now(timezone.utc).isoformat()
|
||||||
|
with _connect() as conn:
|
||||||
|
conn.execute(
|
||||||
|
"""
|
||||||
|
UPDATE users
|
||||||
|
SET jellyfin_password_hash = ?, last_jellyfin_auth_at = ?
|
||||||
|
WHERE username = ?
|
||||||
|
""",
|
||||||
|
(password_hash, timestamp, username),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def _backfill_auth_providers() -> None:
|
def _backfill_auth_providers() -> None:
|
||||||
with _connect() as conn:
|
with _connect() as conn:
|
||||||
rows = conn.execute(
|
rows = conn.execute(
|
||||||
@@ -574,7 +710,34 @@ def upsert_request_cache(
|
|||||||
updated_at: Optional[str],
|
updated_at: Optional[str],
|
||||||
payload_json: str,
|
payload_json: str,
|
||||||
) -> None:
|
) -> 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:
|
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(
|
conn.execute(
|
||||||
"""
|
"""
|
||||||
INSERT INTO requests_cache (
|
INSERT INTO requests_cache (
|
||||||
@@ -608,8 +771,8 @@ def upsert_request_cache(
|
|||||||
media_id,
|
media_id,
|
||||||
media_type,
|
media_type,
|
||||||
status,
|
status,
|
||||||
title,
|
normalized_title,
|
||||||
year,
|
normalized_year,
|
||||||
requested_by,
|
requested_by,
|
||||||
requested_by_norm,
|
requested_by_norm,
|
||||||
created_at,
|
created_at,
|
||||||
@@ -712,22 +875,11 @@ def get_cached_requests(
|
|||||||
title = row[4]
|
title = row[4]
|
||||||
year = row[5]
|
year = row[5]
|
||||||
if (not title or not year) and row[8]:
|
if (not title or not year) and row[8]:
|
||||||
try:
|
derived_title, derived_year = _extract_title_year_from_payload(row[8])
|
||||||
payload = json.loads(row[8])
|
|
||||||
if isinstance(payload, dict):
|
|
||||||
media = payload.get("media") or {}
|
|
||||||
if not title:
|
if not title:
|
||||||
title = (
|
title = derived_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:
|
if not year:
|
||||||
year = media.get("year") if isinstance(media, dict) else None
|
year = derived_year
|
||||||
year = year or payload.get("year")
|
|
||||||
except json.JSONDecodeError:
|
|
||||||
pass
|
|
||||||
results.append(
|
results.append(
|
||||||
{
|
{
|
||||||
"request_id": row[0],
|
"request_id": row[0],
|
||||||
@@ -759,18 +911,8 @@ def get_request_cache_overview(limit: int = 50) -> list[Dict[str, Any]]:
|
|||||||
for row in rows:
|
for row in rows:
|
||||||
title = row[4]
|
title = row[4]
|
||||||
if not title and row[9]:
|
if not title and row[9]:
|
||||||
try:
|
derived_title, _ = _extract_title_year_from_payload(row[9])
|
||||||
payload = json.loads(row[9])
|
title = derived_title or row[4]
|
||||||
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]
|
|
||||||
results.append(
|
results.append(
|
||||||
{
|
{
|
||||||
"request_id": row[0],
|
"request_id": row[0],
|
||||||
@@ -787,16 +929,160 @@ def get_request_cache_overview(limit: int = 50) -> list[Dict[str, Any]]:
|
|||||||
return results
|
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:
|
def get_request_cache_count() -> int:
|
||||||
with _connect() as conn:
|
with _connect() as conn:
|
||||||
row = conn.execute("SELECT COUNT(*) FROM requests_cache").fetchone()
|
row = conn.execute("SELECT COUNT(*) FROM requests_cache").fetchone()
|
||||||
return int(row[0] or 0)
|
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(
|
def update_request_cache_title(
|
||||||
request_id: int, title: str, year: Optional[int] = None
|
request_id: int, title: str, year: Optional[int] = None
|
||||||
) -> None:
|
) -> None:
|
||||||
if not title:
|
normalized_title = _normalize_title_value(title)
|
||||||
|
normalized_year = _normalize_year_value(year)
|
||||||
|
if not normalized_title:
|
||||||
return
|
return
|
||||||
with _connect() as conn:
|
with _connect() as conn:
|
||||||
conn.execute(
|
conn.execute(
|
||||||
@@ -805,10 +1091,38 @@ def update_request_cache_title(
|
|||||||
SET title = ?, year = COALESCE(?, year)
|
SET title = ?, year = COALESCE(?, year)
|
||||||
WHERE request_id = ?
|
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:
|
def prune_duplicate_requests_cache() -> int:
|
||||||
with _connect() as conn:
|
with _connect() as conn:
|
||||||
cursor = conn.execute(
|
cursor = conn.execute(
|
||||||
@@ -851,6 +1165,39 @@ def get_request_cache_payloads(limit: int = 200, offset: int = 0) -> list[Dict[s
|
|||||||
return results
|
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]]:
|
def get_cached_requests_since(since_iso: str) -> list[Dict[str, Any]]:
|
||||||
with _connect() as conn:
|
with _connect() as conn:
|
||||||
rows = conn.execute(
|
rows = conn.execute(
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ from ..db import (
|
|||||||
delete_setting,
|
delete_setting,
|
||||||
get_all_users,
|
get_all_users,
|
||||||
get_request_cache_overview,
|
get_request_cache_overview,
|
||||||
|
get_request_cache_missing_titles,
|
||||||
|
get_request_cache_stats,
|
||||||
get_settings_overrides,
|
get_settings_overrides,
|
||||||
get_user_by_username,
|
get_user_by_username,
|
||||||
set_setting,
|
set_setting,
|
||||||
@@ -21,6 +23,7 @@ from ..db import (
|
|||||||
clear_history,
|
clear_history,
|
||||||
cleanup_history,
|
cleanup_history,
|
||||||
update_request_cache_title,
|
update_request_cache_title,
|
||||||
|
repair_request_cache_titles,
|
||||||
)
|
)
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
from ..clients.sonarr import SonarrClient
|
from ..clients.sonarr import SonarrClient
|
||||||
@@ -99,6 +102,38 @@ def _normalize_root_folders(folders: Any) -> List[Dict[str, Any]]:
|
|||||||
return results
|
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]]:
|
def _normalize_quality_profiles(profiles: Any) -> List[Dict[str, Any]]:
|
||||||
if not isinstance(profiles, list):
|
if not isinstance(profiles, list):
|
||||||
return []
|
return []
|
||||||
@@ -243,10 +278,12 @@ async def requests_sync_delta() -> Dict[str, Any]:
|
|||||||
|
|
||||||
|
|
||||||
@router.post("/requests/artwork/prefetch")
|
@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()
|
runtime = get_runtime_settings()
|
||||||
state = await requests_router.start_artwork_prefetch(
|
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"))
|
logger.info("Admin triggered artwork prefetch: status=%s", state.get("status"))
|
||||||
return {"status": "ok", "prefetch": state}
|
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]:
|
async def requests_artwork_status() -> Dict[str, Any]:
|
||||||
return {"status": "ok", "prefetch": requests_router.get_artwork_prefetch_state()}
|
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")
|
@router.get("/requests/sync/status")
|
||||||
async def requests_sync_status() -> Dict[str, Any]:
|
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")
|
@router.get("/requests/cache")
|
||||||
async def requests_cache(limit: int = 50) -> Dict[str, Any]:
|
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)
|
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}
|
return {"rows": rows}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
|
||||||
from fastapi import APIRouter, HTTPException, status, Depends
|
from fastapi import APIRouter, HTTPException, status, Depends
|
||||||
from fastapi.security import OAuth2PasswordRequestForm
|
from fastapi.security import OAuth2PasswordRequestForm
|
||||||
|
|
||||||
@@ -7,6 +9,7 @@ from ..db import (
|
|||||||
set_last_login,
|
set_last_login,
|
||||||
get_user_by_username,
|
get_user_by_username,
|
||||||
set_user_password,
|
set_user_password,
|
||||||
|
set_jellyfin_auth_cache,
|
||||||
get_user_activity,
|
get_user_activity,
|
||||||
get_user_activity_summary,
|
get_user_activity_summary,
|
||||||
get_user_request_stats,
|
get_user_request_stats,
|
||||||
@@ -16,7 +19,7 @@ from ..db import (
|
|||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
from ..clients.jellyfin import JellyfinClient
|
from ..clients.jellyfin import JellyfinClient
|
||||||
from ..clients.jellyseerr import JellyseerrClient
|
from ..clients.jellyseerr import JellyseerrClient
|
||||||
from ..security import create_access_token
|
from ..security import create_access_token, verify_password
|
||||||
from ..auth import get_current_user
|
from ..auth import get_current_user
|
||||||
|
|
||||||
router = APIRouter(prefix="/auth", tags=["auth"])
|
router = APIRouter(prefix="/auth", tags=["auth"])
|
||||||
@@ -26,6 +29,31 @@ def _normalize_username(value: str) -> str:
|
|||||||
return value.strip().lower()
|
return value.strip().lower()
|
||||||
|
|
||||||
|
|
||||||
|
def _is_recent_jellyfin_auth(last_auth_at: str) -> bool:
|
||||||
|
if not last_auth_at:
|
||||||
|
return False
|
||||||
|
try:
|
||||||
|
parsed = datetime.fromisoformat(last_auth_at)
|
||||||
|
except ValueError:
|
||||||
|
return False
|
||||||
|
if parsed.tzinfo is None:
|
||||||
|
parsed = parsed.replace(tzinfo=timezone.utc)
|
||||||
|
age = datetime.now(timezone.utc) - parsed
|
||||||
|
return age <= timedelta(days=7)
|
||||||
|
|
||||||
|
|
||||||
|
def _has_valid_jellyfin_cache(user: dict, password: str) -> bool:
|
||||||
|
if not user or not password:
|
||||||
|
return False
|
||||||
|
cached_hash = user.get("jellyfin_password_hash")
|
||||||
|
last_auth_at = user.get("last_jellyfin_auth_at")
|
||||||
|
if not cached_hash or not last_auth_at:
|
||||||
|
return False
|
||||||
|
if not verify_password(password, cached_hash):
|
||||||
|
return False
|
||||||
|
return _is_recent_jellyfin_auth(last_auth_at)
|
||||||
|
|
||||||
|
|
||||||
@router.post("/login")
|
@router.post("/login")
|
||||||
async def login(form_data: OAuth2PasswordRequestForm = Depends()) -> dict:
|
async def login(form_data: OAuth2PasswordRequestForm = Depends()) -> dict:
|
||||||
user = verify_user_password(form_data.username, form_data.password)
|
user = verify_user_password(form_data.username, form_data.password)
|
||||||
@@ -48,14 +76,23 @@ async def jellyfin_login(form_data: OAuth2PasswordRequestForm = Depends()) -> di
|
|||||||
client = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
client = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
||||||
if not client.configured():
|
if not client.configured():
|
||||||
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Jellyfin not configured")
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Jellyfin not configured")
|
||||||
|
username = form_data.username
|
||||||
|
password = form_data.password
|
||||||
|
user = get_user_by_username(username)
|
||||||
|
if user and user.get("is_blocked"):
|
||||||
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
||||||
|
if user and _has_valid_jellyfin_cache(user, password):
|
||||||
|
token = create_access_token(username, "user")
|
||||||
|
set_last_login(username)
|
||||||
|
return {"access_token": token, "token_type": "bearer", "user": {"username": username, "role": "user"}}
|
||||||
try:
|
try:
|
||||||
response = await client.authenticate_by_name(form_data.username, form_data.password)
|
response = await client.authenticate_by_name(username, password)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=str(exc)) from exc
|
raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=str(exc)) from exc
|
||||||
if not isinstance(response, dict) or not response.get("User"):
|
if not isinstance(response, dict) or not response.get("User"):
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyfin credentials")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyfin credentials")
|
||||||
create_user_if_missing(form_data.username, "jellyfin-user", role="user", auth_provider="jellyfin")
|
create_user_if_missing(username, "jellyfin-user", role="user", auth_provider="jellyfin")
|
||||||
user = get_user_by_username(form_data.username)
|
user = get_user_by_username(username)
|
||||||
if user and user.get("is_blocked"):
|
if user and user.get("is_blocked"):
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
||||||
try:
|
try:
|
||||||
@@ -69,9 +106,10 @@ async def jellyfin_login(form_data: OAuth2PasswordRequestForm = Depends()) -> di
|
|||||||
create_user_if_missing(name, "jellyfin-user", role="user", auth_provider="jellyfin")
|
create_user_if_missing(name, "jellyfin-user", role="user", auth_provider="jellyfin")
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
token = create_access_token(form_data.username, "user")
|
set_jellyfin_auth_cache(username, password)
|
||||||
set_last_login(form_data.username)
|
token = create_access_token(username, "user")
|
||||||
return {"access_token": token, "token_type": "bearer", "user": {"username": form_data.username, "role": "user"}}
|
set_last_login(username)
|
||||||
|
return {"access_token": token, "token_type": "bearer", "user": {"username": username, "role": "user"}}
|
||||||
|
|
||||||
|
|
||||||
@router.post("/jellyseerr/login")
|
@router.post("/jellyseerr/login")
|
||||||
@@ -107,18 +145,19 @@ async def profile(current_user: dict = Depends(get_current_user)) -> dict:
|
|||||||
username_norm = _normalize_username(username) if username else ""
|
username_norm = _normalize_username(username) if username else ""
|
||||||
stats = get_user_request_stats(username_norm)
|
stats = get_user_request_stats(username_norm)
|
||||||
global_total = get_global_request_total()
|
global_total = get_global_request_total()
|
||||||
leader = get_global_request_leader()
|
|
||||||
share = (stats.get("total", 0) / global_total) if global_total else 0
|
share = (stats.get("total", 0) / global_total) if global_total else 0
|
||||||
activity_summary = get_user_activity_summary(username) if username else {}
|
activity_summary = get_user_activity_summary(username) if username else {}
|
||||||
activity_recent = get_user_activity(username, limit=5) if username else []
|
activity_recent = get_user_activity(username, limit=5) if username else []
|
||||||
return {
|
stats_payload = {
|
||||||
"user": current_user,
|
|
||||||
"stats": {
|
|
||||||
**stats,
|
**stats,
|
||||||
"share": share,
|
"share": share,
|
||||||
"global_total": global_total,
|
"global_total": global_total,
|
||||||
"most_active_user": leader,
|
}
|
||||||
},
|
if current_user.get("role") == "admin":
|
||||||
|
stats_payload["most_active_user"] = get_global_request_leader()
|
||||||
|
return {
|
||||||
|
"user": current_user,
|
||||||
|
"stats": stats_payload,
|
||||||
"activity": {
|
"activity": {
|
||||||
**activity_summary,
|
**activity_summary,
|
||||||
"recent": activity_recent,
|
"recent": activity_recent,
|
||||||
|
|||||||
@@ -11,6 +11,10 @@ router = APIRouter(prefix="/branding", tags=["branding"])
|
|||||||
_BRANDING_DIR = os.path.join(os.getcwd(), "data", "branding")
|
_BRANDING_DIR = os.path.join(os.getcwd(), "data", "branding")
|
||||||
_LOGO_PATH = os.path.join(_BRANDING_DIR, "logo.png")
|
_LOGO_PATH = os.path.join(_BRANDING_DIR, "logo.png")
|
||||||
_FAVICON_PATH = os.path.join(_BRANDING_DIR, "favicon.ico")
|
_FAVICON_PATH = os.path.join(_BRANDING_DIR, "favicon.ico")
|
||||||
|
_BUNDLED_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "assets", "branding"))
|
||||||
|
_BUNDLED_LOGO_PATH = os.path.join(_BUNDLED_DIR, "logo.png")
|
||||||
|
_BUNDLED_FAVICON_PATH = os.path.join(_BUNDLED_DIR, "favicon.ico")
|
||||||
|
_BRANDING_SOURCE = os.getenv("BRANDING_SOURCE", "bundled").lower()
|
||||||
|
|
||||||
|
|
||||||
def _ensure_branding_dir() -> None:
|
def _ensure_branding_dir() -> None:
|
||||||
@@ -41,6 +45,18 @@ def _ensure_default_branding() -> None:
|
|||||||
if os.path.exists(_LOGO_PATH) and os.path.exists(_FAVICON_PATH):
|
if os.path.exists(_LOGO_PATH) and os.path.exists(_FAVICON_PATH):
|
||||||
return
|
return
|
||||||
_ensure_branding_dir()
|
_ensure_branding_dir()
|
||||||
|
if not os.path.exists(_LOGO_PATH) and os.path.exists(_BUNDLED_LOGO_PATH):
|
||||||
|
try:
|
||||||
|
with open(_BUNDLED_LOGO_PATH, "rb") as source, open(_LOGO_PATH, "wb") as target:
|
||||||
|
target.write(source.read())
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
if not os.path.exists(_FAVICON_PATH) and os.path.exists(_BUNDLED_FAVICON_PATH):
|
||||||
|
try:
|
||||||
|
with open(_BUNDLED_FAVICON_PATH, "rb") as source, open(_FAVICON_PATH, "wb") as target:
|
||||||
|
target.write(source.read())
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
if not os.path.exists(_LOGO_PATH):
|
if not os.path.exists(_LOGO_PATH):
|
||||||
image = Image.new("RGBA", (300, 300), (12, 18, 28, 255))
|
image = Image.new("RGBA", (300, 300), (12, 18, 28, 255))
|
||||||
draw = ImageDraw.Draw(image)
|
draw = ImageDraw.Draw(image)
|
||||||
@@ -65,24 +81,32 @@ def _ensure_default_branding() -> None:
|
|||||||
favicon.save(_FAVICON_PATH, format="ICO")
|
favicon.save(_FAVICON_PATH, format="ICO")
|
||||||
|
|
||||||
|
|
||||||
|
def _resolve_branding_paths() -> tuple[str, str]:
|
||||||
|
if _BRANDING_SOURCE == "data":
|
||||||
|
_ensure_default_branding()
|
||||||
|
return _LOGO_PATH, _FAVICON_PATH
|
||||||
|
if os.path.exists(_BUNDLED_LOGO_PATH) and os.path.exists(_BUNDLED_FAVICON_PATH):
|
||||||
|
return _BUNDLED_LOGO_PATH, _BUNDLED_FAVICON_PATH
|
||||||
|
_ensure_default_branding()
|
||||||
|
return _LOGO_PATH, _FAVICON_PATH
|
||||||
|
|
||||||
|
|
||||||
@router.get("/logo.png")
|
@router.get("/logo.png")
|
||||||
async def branding_logo() -> FileResponse:
|
async def branding_logo() -> FileResponse:
|
||||||
if not os.path.exists(_LOGO_PATH):
|
logo_path, _ = _resolve_branding_paths()
|
||||||
_ensure_default_branding()
|
if not os.path.exists(logo_path):
|
||||||
if not os.path.exists(_LOGO_PATH):
|
|
||||||
raise HTTPException(status_code=404, detail="Logo not found")
|
raise HTTPException(status_code=404, detail="Logo not found")
|
||||||
headers = {"Cache-Control": "public, max-age=300"}
|
headers = {"Cache-Control": "no-store"}
|
||||||
return FileResponse(_LOGO_PATH, media_type="image/png", headers=headers)
|
return FileResponse(logo_path, media_type="image/png", headers=headers)
|
||||||
|
|
||||||
|
|
||||||
@router.get("/favicon.ico")
|
@router.get("/favicon.ico")
|
||||||
async def branding_favicon() -> FileResponse:
|
async def branding_favicon() -> FileResponse:
|
||||||
if not os.path.exists(_FAVICON_PATH):
|
_, favicon_path = _resolve_branding_paths()
|
||||||
_ensure_default_branding()
|
if not os.path.exists(favicon_path):
|
||||||
if not os.path.exists(_FAVICON_PATH):
|
|
||||||
raise HTTPException(status_code=404, detail="Favicon not found")
|
raise HTTPException(status_code=404, detail="Favicon not found")
|
||||||
headers = {"Cache-Control": "public, max-age=300"}
|
headers = {"Cache-Control": "no-store"}
|
||||||
return FileResponse(_FAVICON_PATH, media_type="image/x-icon", headers=headers)
|
return FileResponse(favicon_path, media_type="image/x-icon", headers=headers)
|
||||||
|
|
||||||
|
|
||||||
async def save_branding_image(file: UploadFile) -> Dict[str, Any]:
|
async def save_branding_image(file: UploadFile) -> Dict[str, Any]:
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import mimetypes
|
import mimetypes
|
||||||
|
import logging
|
||||||
|
from typing import Optional
|
||||||
from fastapi import APIRouter, HTTPException, Response
|
from fastapi import APIRouter, HTTPException, Response
|
||||||
from fastapi.responses import FileResponse, RedirectResponse
|
from fastapi.responses import FileResponse, RedirectResponse
|
||||||
import httpx
|
import httpx
|
||||||
@@ -11,6 +13,7 @@ router = APIRouter(prefix="/images", tags=["images"])
|
|||||||
|
|
||||||
_TMDB_BASE = "https://image.tmdb.org/t/p"
|
_TMDB_BASE = "https://image.tmdb.org/t/p"
|
||||||
_ALLOWED_SIZES = {"w92", "w154", "w185", "w342", "w500", "w780", "original"}
|
_ALLOWED_SIZES = {"w92", "w154", "w185", "w342", "w500", "w780", "original"}
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
def _safe_filename(path: str) -> str:
|
def _safe_filename(path: str) -> str:
|
||||||
@@ -19,13 +22,24 @@ def _safe_filename(path: str) -> str:
|
|||||||
safe = re.sub(r"[^A-Za-z0-9_.-]", "_", trimmed)
|
safe = re.sub(r"[^A-Za-z0-9_.-]", "_", trimmed)
|
||||||
return safe or "image"
|
return safe or "image"
|
||||||
|
|
||||||
|
def tmdb_cache_path(path: str, size: str) -> Optional[str]:
|
||||||
async def cache_tmdb_image(path: str, size: str = "w342") -> bool:
|
|
||||||
if not path or "://" in path or ".." in path:
|
if not path or "://" in path or ".." in path:
|
||||||
return False
|
return None
|
||||||
if not path.startswith("/"):
|
if not path.startswith("/"):
|
||||||
path = f"/{path}"
|
path = f"/{path}"
|
||||||
if size not in _ALLOWED_SIZES:
|
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
|
return False
|
||||||
|
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
@@ -33,9 +47,10 @@ async def cache_tmdb_image(path: str, size: str = "w342") -> bool:
|
|||||||
if cache_mode != "cache":
|
if cache_mode != "cache":
|
||||||
return False
|
return False
|
||||||
|
|
||||||
cache_dir = os.path.join(os.getcwd(), "data", "artwork", "tmdb", size)
|
file_path = tmdb_cache_path(path, size)
|
||||||
os.makedirs(cache_dir, exist_ok=True)
|
if not file_path:
|
||||||
file_path = os.path.join(cache_dir, _safe_filename(path))
|
return False
|
||||||
|
os.makedirs(os.path.dirname(file_path), exist_ok=True)
|
||||||
if os.path.exists(file_path):
|
if os.path.exists(file_path):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@@ -64,9 +79,10 @@ async def tmdb_image(path: str, size: str = "w342"):
|
|||||||
if cache_mode != "cache":
|
if cache_mode != "cache":
|
||||||
return RedirectResponse(url=url)
|
return RedirectResponse(url=url)
|
||||||
|
|
||||||
cache_dir = os.path.join(os.getcwd(), "data", "artwork", "tmdb", size)
|
file_path = tmdb_cache_path(path, size)
|
||||||
os.makedirs(cache_dir, exist_ok=True)
|
if not file_path:
|
||||||
file_path = os.path.join(cache_dir, _safe_filename(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"}
|
headers = {"Cache-Control": "public, max-age=86400"}
|
||||||
if os.path.exists(file_path):
|
if os.path.exists(file_path):
|
||||||
media_type = mimetypes.guess_type(file_path)[0] or "image/jpeg"
|
media_type = mimetypes.guess_type(file_path)[0] or "image/jpeg"
|
||||||
@@ -77,6 +93,8 @@ async def tmdb_image(path: str, size: str = "w342"):
|
|||||||
if os.path.exists(file_path):
|
if os.path.exists(file_path):
|
||||||
media_type = mimetypes.guess_type(file_path)[0] or "image/jpeg"
|
media_type = mimetypes.guess_type(file_path)[0] or "image/jpeg"
|
||||||
return FileResponse(file_path, media_type=media_type, headers=headers)
|
return FileResponse(file_path, media_type=media_type, headers=headers)
|
||||||
raise HTTPException(status_code=502, detail="Image cache failed")
|
logger.warning("TMDB cache miss after fetch: path=%s size=%s", path, size)
|
||||||
except httpx.HTTPError as exc:
|
except (httpx.HTTPError, OSError) as exc:
|
||||||
raise HTTPException(status_code=502, detail=f"Image fetch failed: {exc}") from exc
|
logger.warning("TMDB cache failed: path=%s size=%s error=%s", path, size, exc)
|
||||||
|
|
||||||
|
return RedirectResponse(url=url)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import asyncio
|
|||||||
import httpx
|
import httpx
|
||||||
import json
|
import json
|
||||||
import logging
|
import logging
|
||||||
|
import os
|
||||||
import time
|
import time
|
||||||
from urllib.parse import quote
|
from urllib.parse import quote
|
||||||
from datetime import datetime, timezone, timedelta
|
from datetime import datetime, timezone, timedelta
|
||||||
@@ -17,7 +18,7 @@ from ..clients.prowlarr import ProwlarrClient
|
|||||||
from ..ai.triage import triage_snapshot
|
from ..ai.triage import triage_snapshot
|
||||||
from ..auth import get_current_user
|
from ..auth import get_current_user
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
from .images import cache_tmdb_image
|
from .images import cache_tmdb_image, is_tmdb_cached
|
||||||
from ..db import (
|
from ..db import (
|
||||||
save_action,
|
save_action,
|
||||||
get_recent_actions,
|
get_recent_actions,
|
||||||
@@ -30,10 +31,16 @@ from ..db import (
|
|||||||
get_request_cache_last_updated,
|
get_request_cache_last_updated,
|
||||||
get_request_cache_count,
|
get_request_cache_count,
|
||||||
get_request_cache_payloads,
|
get_request_cache_payloads,
|
||||||
|
get_request_cache_payloads_missing,
|
||||||
|
repair_request_cache_titles,
|
||||||
prune_duplicate_requests_cache,
|
prune_duplicate_requests_cache,
|
||||||
upsert_request_cache,
|
upsert_request_cache,
|
||||||
|
upsert_artwork_cache_status,
|
||||||
|
get_artwork_cache_missing_count,
|
||||||
|
get_artwork_cache_status_count,
|
||||||
get_setting,
|
get_setting,
|
||||||
set_setting,
|
set_setting,
|
||||||
|
update_artwork_cache_stats,
|
||||||
cleanup_history,
|
cleanup_history,
|
||||||
)
|
)
|
||||||
from ..models import Snapshot, TriageResult, RequestType
|
from ..models import Snapshot, TriageResult, RequestType
|
||||||
@@ -64,6 +71,7 @@ _artwork_prefetch_state: Dict[str, Any] = {
|
|||||||
"processed": 0,
|
"processed": 0,
|
||||||
"total": 0,
|
"total": 0,
|
||||||
"message": "",
|
"message": "",
|
||||||
|
"only_missing": False,
|
||||||
"started_at": None,
|
"started_at": None,
|
||||||
"finished_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")
|
backdrop_path = item.get("backdropPath") or item.get("backdrop_path")
|
||||||
return poster_path, 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]]:
|
async def _get_request_details(client: JellyseerrClient, request_id: int) -> Optional[Dict[str, Any]]:
|
||||||
cache_key = f"request:{request_id}"
|
cache_key = f"request:{request_id}"
|
||||||
@@ -471,6 +581,8 @@ async def _sync_all_requests(client: JellyseerrClient) -> int:
|
|||||||
updated_at=payload.get("updated_at"),
|
updated_at=payload.get("updated_at"),
|
||||||
payload_json=payload_json,
|
payload_json=payload_json,
|
||||||
)
|
)
|
||||||
|
if isinstance(item, dict):
|
||||||
|
_upsert_artwork_status(item, cache_mode)
|
||||||
stored += 1
|
stored += 1
|
||||||
_sync_state["stored"] = stored
|
_sync_state["stored"] = stored
|
||||||
if len(items) < take:
|
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())
|
set_setting(_sync_last_key, datetime.now(timezone.utc).isoformat())
|
||||||
_refresh_recent_cache_from_db()
|
_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
|
return stored
|
||||||
|
|
||||||
|
|
||||||
@@ -601,6 +718,8 @@ async def _sync_delta_requests(client: JellyseerrClient) -> int:
|
|||||||
updated_at=payload.get("updated_at"),
|
updated_at=payload.get("updated_at"),
|
||||||
payload_json=payload_json,
|
payload_json=payload_json,
|
||||||
)
|
)
|
||||||
|
if isinstance(item, dict):
|
||||||
|
_upsert_artwork_status(item, cache_mode)
|
||||||
stored += 1
|
stored += 1
|
||||||
page_changed = True
|
page_changed = True
|
||||||
_sync_state["stored"] = stored
|
_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())
|
set_setting(_sync_last_key, datetime.now(timezone.utc).isoformat())
|
||||||
_refresh_recent_cache_from_db()
|
_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
|
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()
|
runtime = get_runtime_settings()
|
||||||
cache_mode = (runtime.artwork_cache_mode or "remote").lower()
|
cache_mode = (runtime.artwork_cache_mode or "remote").lower()
|
||||||
if cache_mode != "cache":
|
if cache_mode != "cache":
|
||||||
@@ -644,35 +773,52 @@ async def _prefetch_artwork_cache(client: JellyseerrClient) -> None:
|
|||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
total = get_request_cache_count()
|
total = total if total is not None else get_request_cache_count()
|
||||||
_artwork_prefetch_state.update(
|
_artwork_prefetch_state.update(
|
||||||
{
|
{
|
||||||
"status": "running",
|
"status": "running",
|
||||||
"processed": 0,
|
"processed": 0,
|
||||||
"total": total,
|
"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(),
|
"started_at": datetime.now(timezone.utc).isoformat(),
|
||||||
"finished_at": None,
|
"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
|
offset = 0
|
||||||
limit = 200
|
limit = 200
|
||||||
processed = 0
|
processed = 0
|
||||||
while True:
|
while True:
|
||||||
|
if use_missing_query:
|
||||||
|
batch = get_request_cache_payloads_missing(limit=limit, offset=offset)
|
||||||
|
else:
|
||||||
batch = get_request_cache_payloads(limit=limit, offset=offset)
|
batch = get_request_cache_payloads(limit=limit, offset=offset)
|
||||||
if not batch:
|
if not batch:
|
||||||
break
|
break
|
||||||
for row in batch:
|
for row in batch:
|
||||||
payload = row.get("payload")
|
payload = row.get("payload")
|
||||||
if not isinstance(payload, dict):
|
if not isinstance(payload, dict):
|
||||||
|
if not only_missing:
|
||||||
processed += 1
|
processed += 1
|
||||||
continue
|
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)
|
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 {}
|
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(
|
hydrated_poster, hydrated_backdrop = await _hydrate_artwork_from_tmdb(
|
||||||
client, media_type, tmdb_id
|
client, media_type, tmdb_id
|
||||||
)
|
)
|
||||||
@@ -701,17 +847,26 @@ async def _prefetch_artwork_cache(client: JellyseerrClient) -> None:
|
|||||||
updated_at=parsed.get("updated_at"),
|
updated_at=parsed.get("updated_at"),
|
||||||
payload_json=json.dumps(payload, ensure_ascii=True),
|
payload_json=json.dumps(payload, ensure_ascii=True),
|
||||||
)
|
)
|
||||||
|
poster_cached_flag = False
|
||||||
|
backdrop_cached_flag = False
|
||||||
if poster_path:
|
if poster_path:
|
||||||
try:
|
try:
|
||||||
|
poster_cached_flag = bool(
|
||||||
await cache_tmdb_image(poster_path, "w185")
|
await cache_tmdb_image(poster_path, "w185")
|
||||||
await cache_tmdb_image(poster_path, "w342")
|
) and bool(await cache_tmdb_image(poster_path, "w342"))
|
||||||
except httpx.HTTPError:
|
except httpx.HTTPError:
|
||||||
pass
|
poster_cached_flag = False
|
||||||
if backdrop_path:
|
if backdrop_path:
|
||||||
try:
|
try:
|
||||||
await cache_tmdb_image(backdrop_path, "w780")
|
backdrop_cached_flag = bool(await cache_tmdb_image(backdrop_path, "w780"))
|
||||||
except httpx.HTTPError:
|
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
|
processed += 1
|
||||||
if processed % 25 == 0:
|
if processed % 25 == 0:
|
||||||
_artwork_prefetch_state.update(
|
_artwork_prefetch_state.update(
|
||||||
@@ -719,6 +874,15 @@ async def _prefetch_artwork_cache(client: JellyseerrClient) -> None:
|
|||||||
)
|
)
|
||||||
offset += limit
|
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(
|
_artwork_prefetch_state.update(
|
||||||
{
|
{
|
||||||
"status": "completed",
|
"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
|
global _artwork_prefetch_task
|
||||||
if _artwork_prefetch_task and not _artwork_prefetch_task.done():
|
if _artwork_prefetch_task and not _artwork_prefetch_task.done():
|
||||||
return dict(_artwork_prefetch_state)
|
return dict(_artwork_prefetch_state)
|
||||||
client = JellyseerrClient(base_url, api_key)
|
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(
|
_artwork_prefetch_state.update(
|
||||||
{
|
{
|
||||||
"status": "running",
|
"status": "running",
|
||||||
"processed": 0,
|
"processed": 0,
|
||||||
"total": get_request_cache_count(),
|
"total": total,
|
||||||
"message": "Starting artwork prefetch",
|
"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(),
|
"started_at": datetime.now(timezone.utc).isoformat(),
|
||||||
"finished_at": None,
|
"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:
|
async def _runner() -> None:
|
||||||
try:
|
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:
|
except Exception:
|
||||||
logger.exception("Artwork prefetch failed")
|
logger.exception("Artwork prefetch failed")
|
||||||
_artwork_prefetch_state.update(
|
_artwork_prefetch_state.update(
|
||||||
@@ -814,13 +1005,14 @@ def _get_recent_from_cache(
|
|||||||
async def startup_warmup_requests_cache() -> None:
|
async def startup_warmup_requests_cache() -> None:
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
if not client.configured():
|
if client.configured():
|
||||||
return
|
|
||||||
try:
|
try:
|
||||||
await _ensure_requests_cache(client)
|
await _ensure_requests_cache(client)
|
||||||
except httpx.HTTPError as exc:
|
except httpx.HTTPError as exc:
|
||||||
logger.warning("Requests warmup skipped: %s", exc)
|
logger.warning("Requests warmup skipped: %s", exc)
|
||||||
return
|
repaired = repair_request_cache_titles()
|
||||||
|
if repaired:
|
||||||
|
logger.info("Requests cache titles repaired: %s", repaired)
|
||||||
_refresh_recent_cache_from_db()
|
_refresh_recent_cache_from_db()
|
||||||
|
|
||||||
|
|
||||||
@@ -968,7 +1160,10 @@ async def _ensure_request_access(
|
|||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
mode = (runtime.requests_data_source or "prefer_cache").lower()
|
mode = (runtime.requests_data_source or "prefer_cache").lower()
|
||||||
cached = get_request_cache_payload(request_id)
|
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)
|
logger.debug("access cache hit: request_id=%s mode=%s", request_id, mode)
|
||||||
if _request_matches_user(cached, user.get("username", "")):
|
if _request_matches_user(cached, user.get("username", "")):
|
||||||
return
|
return
|
||||||
@@ -1249,9 +1444,11 @@ async def recent_requests(
|
|||||||
) -> dict:
|
) -> dict:
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
|
mode = (runtime.requests_data_source or "prefer_cache").lower()
|
||||||
|
allow_remote = mode == "always_js"
|
||||||
|
if allow_remote:
|
||||||
if not client.configured():
|
if not client.configured():
|
||||||
raise HTTPException(status_code=400, detail="Jellyseerr not configured")
|
raise HTTPException(status_code=400, detail="Jellyseerr not configured")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
await _ensure_requests_cache(client)
|
await _ensure_requests_cache(client)
|
||||||
except httpx.HTTPStatusError as exc:
|
except httpx.HTTPStatusError as exc:
|
||||||
@@ -1266,10 +1463,8 @@ async def recent_requests(
|
|||||||
_refresh_recent_cache_from_db()
|
_refresh_recent_cache_from_db()
|
||||||
rows = _get_recent_from_cache(requested_by, take, skip, since_iso)
|
rows = _get_recent_from_cache(requested_by, take, skip, since_iso)
|
||||||
cache_mode = (runtime.artwork_cache_mode or "remote").lower()
|
cache_mode = (runtime.artwork_cache_mode or "remote").lower()
|
||||||
mode = (runtime.requests_data_source or "prefer_cache").lower()
|
allow_title_hydrate = False
|
||||||
allow_remote = mode == "always_js"
|
allow_artwork_hydrate = allow_remote
|
||||||
allow_title_hydrate = mode == "prefer_cache"
|
|
||||||
allow_artwork_hydrate = allow_remote or allow_title_hydrate
|
|
||||||
jellyfin = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
jellyfin = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
||||||
jellyfin_cache: Dict[str, bool] = {}
|
jellyfin_cache: Dict[str, bool] = {}
|
||||||
|
|
||||||
@@ -1814,4 +2009,3 @@ async def action_grab(
|
|||||||
save_action, request_id, "grab", "Grab release", "ok", action_message
|
save_action, request_id, "grab", "Grab release", "ok", action_message
|
||||||
)
|
)
|
||||||
return {"status": "ok", "response": {"qbittorrent": "queued"}}
|
return {"status": "ok", "response": {"qbittorrent": "queued"}}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
from typing import Any, Dict
|
from typing import Any, Dict
|
||||||
import httpx
|
import httpx
|
||||||
from fastapi import APIRouter, Depends
|
from fastapi import APIRouter, Depends, HTTPException
|
||||||
|
|
||||||
from ..auth import get_current_user
|
from ..auth import get_current_user
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
@@ -93,3 +93,42 @@ async def services_status() -> Dict[str, Any]:
|
|||||||
overall = "degraded"
|
overall = "degraded"
|
||||||
|
|
||||||
return {"overall": overall, "services": services}
|
return {"overall": overall, "services": services}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/services/{service}/test")
|
||||||
|
async def test_service(service: str) -> Dict[str, Any]:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
jellyseerr = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
|
sonarr = SonarrClient(runtime.sonarr_base_url, runtime.sonarr_api_key)
|
||||||
|
radarr = RadarrClient(runtime.radarr_base_url, runtime.radarr_api_key)
|
||||||
|
prowlarr = ProwlarrClient(runtime.prowlarr_base_url, runtime.prowlarr_api_key)
|
||||||
|
qbittorrent = QBittorrentClient(
|
||||||
|
runtime.qbittorrent_base_url, runtime.qbittorrent_username, runtime.qbittorrent_password
|
||||||
|
)
|
||||||
|
jellyfin = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
||||||
|
|
||||||
|
service_key = service.strip().lower()
|
||||||
|
checks = {
|
||||||
|
"jellyseerr": (
|
||||||
|
"Jellyseerr",
|
||||||
|
jellyseerr.configured(),
|
||||||
|
lambda: jellyseerr.get_recent_requests(take=1, skip=0),
|
||||||
|
),
|
||||||
|
"sonarr": ("Sonarr", sonarr.configured(), sonarr.get_system_status),
|
||||||
|
"radarr": ("Radarr", radarr.configured(), radarr.get_system_status),
|
||||||
|
"prowlarr": ("Prowlarr", prowlarr.configured(), prowlarr.get_health),
|
||||||
|
"qbittorrent": ("qBittorrent", qbittorrent.configured(), qbittorrent.get_app_version),
|
||||||
|
"jellyfin": ("Jellyfin", jellyfin.configured(), jellyfin.get_system_info),
|
||||||
|
}
|
||||||
|
|
||||||
|
if service_key not in checks:
|
||||||
|
raise HTTPException(status_code=404, detail="Unknown service")
|
||||||
|
|
||||||
|
name, configured, func = checks[service_key]
|
||||||
|
result = await _check(name, configured, func)
|
||||||
|
if name == "Prowlarr" and result.get("status") == "up":
|
||||||
|
health = result.get("detail")
|
||||||
|
if isinstance(health, list) and health:
|
||||||
|
result["status"] = "degraded"
|
||||||
|
result["message"] = "Health warnings"
|
||||||
|
return result
|
||||||
|
|||||||
@@ -11,7 +11,14 @@ from ..clients.radarr import RadarrClient
|
|||||||
from ..clients.prowlarr import ProwlarrClient
|
from ..clients.prowlarr import ProwlarrClient
|
||||||
from ..clients.qbittorrent import QBittorrentClient
|
from ..clients.qbittorrent import QBittorrentClient
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
from ..db import save_snapshot, get_request_cache_payload, get_recent_snapshots, get_setting, set_setting
|
from ..db import (
|
||||||
|
save_snapshot,
|
||||||
|
get_request_cache_payload,
|
||||||
|
get_request_cache_by_id,
|
||||||
|
get_recent_snapshots,
|
||||||
|
get_setting,
|
||||||
|
set_setting,
|
||||||
|
)
|
||||||
from ..models import ActionOption, NormalizedState, RequestType, Snapshot, TimelineHop
|
from ..models import ActionOption, NormalizedState, RequestType, Snapshot, TimelineHop
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@@ -219,7 +226,21 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
logging.getLogger(__name__).debug(
|
logging.getLogger(__name__).debug(
|
||||||
"snapshot cache miss: request_id=%s mode=%s", request_id, mode
|
"snapshot cache miss: request_id=%s mode=%s", request_id, mode
|
||||||
)
|
)
|
||||||
|
if cached_request is not None:
|
||||||
|
cache_meta = get_request_cache_by_id(int(request_id))
|
||||||
|
cached_title = cache_meta.get("title") if cache_meta else None
|
||||||
|
if cached_title and isinstance(cached_request, dict):
|
||||||
|
media = cached_request.get("media")
|
||||||
|
if not isinstance(media, dict):
|
||||||
|
media = {}
|
||||||
|
cached_request["media"] = media
|
||||||
|
if not media.get("title") and not media.get("name"):
|
||||||
|
media["title"] = cached_title
|
||||||
|
media["name"] = cached_title
|
||||||
|
if not cached_request.get("title") and not cached_request.get("name"):
|
||||||
|
cached_request["title"] = cached_title
|
||||||
|
|
||||||
|
allow_remote = mode == "always_js" and jellyseerr.configured()
|
||||||
if not jellyseerr.configured() and not cached_request:
|
if not jellyseerr.configured() and not cached_request:
|
||||||
timeline.append(TimelineHop(service="Jellyseerr", status="not_configured"))
|
timeline.append(TimelineHop(service="Jellyseerr", status="not_configured"))
|
||||||
timeline.append(TimelineHop(service="Sonarr/Radarr", status="not_configured"))
|
timeline.append(TimelineHop(service="Sonarr/Radarr", status="not_configured"))
|
||||||
@@ -227,9 +248,15 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
timeline.append(TimelineHop(service="qBittorrent", status="not_configured"))
|
timeline.append(TimelineHop(service="qBittorrent", status="not_configured"))
|
||||||
snapshot.timeline = timeline
|
snapshot.timeline = timeline
|
||||||
return snapshot
|
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
|
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:
|
try:
|
||||||
jelly_request = await jellyseerr.get_request(request_id)
|
jelly_request = await jellyseerr.get_request(request_id)
|
||||||
logging.getLogger(__name__).debug(
|
logging.getLogger(__name__).debug(
|
||||||
@@ -252,17 +279,25 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
jelly_status = jelly_request.get("status", "unknown")
|
jelly_status = jelly_request.get("status", "unknown")
|
||||||
jelly_status_label = _status_label(jelly_status)
|
jelly_status_label = _status_label(jelly_status)
|
||||||
jelly_type = jelly_request.get("type") or "unknown"
|
jelly_type = jelly_request.get("type") or "unknown"
|
||||||
snapshot.title = jelly_request.get("media", {}).get("title", "Unknown")
|
|
||||||
snapshot.year = jelly_request.get("media", {}).get("year")
|
|
||||||
snapshot.request_type = RequestType(jelly_type) if jelly_type in {"movie", "tv"} else RequestType.unknown
|
|
||||||
media = jelly_request.get("media", {}) if isinstance(jelly_request, dict) else {}
|
media = jelly_request.get("media", {}) if isinstance(jelly_request, dict) else {}
|
||||||
|
if not isinstance(media, dict):
|
||||||
|
media = {}
|
||||||
|
snapshot.title = (
|
||||||
|
media.get("title")
|
||||||
|
or media.get("name")
|
||||||
|
or jelly_request.get("title")
|
||||||
|
or jelly_request.get("name")
|
||||||
|
or "Unknown"
|
||||||
|
)
|
||||||
|
snapshot.year = media.get("year") or jelly_request.get("year")
|
||||||
|
snapshot.request_type = RequestType(jelly_type) if jelly_type in {"movie", "tv"} else RequestType.unknown
|
||||||
poster_path = None
|
poster_path = None
|
||||||
backdrop_path = None
|
backdrop_path = None
|
||||||
if isinstance(media, dict):
|
if isinstance(media, dict):
|
||||||
poster_path = media.get("posterPath") or media.get("poster_path")
|
poster_path = media.get("posterPath") or media.get("poster_path")
|
||||||
backdrop_path = media.get("backdropPath") or media.get("backdrop_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")
|
tmdb_id = jelly_request.get("media", {}).get("tmdbId")
|
||||||
if tmdb_id:
|
if tmdb_id:
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -21,14 +21,14 @@ type ServiceOptions = {
|
|||||||
const SECTION_LABELS: Record<string, string> = {
|
const SECTION_LABELS: Record<string, string> = {
|
||||||
jellyseerr: 'Jellyseerr',
|
jellyseerr: 'Jellyseerr',
|
||||||
jellyfin: 'Jellyfin',
|
jellyfin: 'Jellyfin',
|
||||||
artwork: 'Artwork',
|
artwork: 'Artwork cache',
|
||||||
cache: 'Cache',
|
cache: 'Cache Control',
|
||||||
sonarr: 'Sonarr',
|
sonarr: 'Sonarr',
|
||||||
radarr: 'Radarr',
|
radarr: 'Radarr',
|
||||||
prowlarr: 'Prowlarr',
|
prowlarr: 'Prowlarr',
|
||||||
qbittorrent: 'qBittorrent',
|
qbittorrent: 'qBittorrent',
|
||||||
log: 'Activity log',
|
log: 'Activity log',
|
||||||
requests: 'Request syncing',
|
requests: 'Request sync',
|
||||||
site: 'Site',
|
site: 'Site',
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39,13 +39,13 @@ const BANNER_TONES = ['info', 'warning', 'error', 'maintenance']
|
|||||||
const SECTION_DESCRIPTIONS: Record<string, string> = {
|
const SECTION_DESCRIPTIONS: Record<string, string> = {
|
||||||
jellyseerr: 'Connect the request system where users submit content.',
|
jellyseerr: 'Connect the request system where users submit content.',
|
||||||
jellyfin: 'Control Jellyfin login and availability checks.',
|
jellyfin: 'Control Jellyfin login and availability checks.',
|
||||||
artwork: 'Configure how posters and artwork are loaded.',
|
artwork: 'Cache posters/backdrops and review artwork coverage.',
|
||||||
cache: 'Manage saved request data and offline artwork.',
|
cache: 'Manage saved requests cache and refresh behavior.',
|
||||||
sonarr: 'TV automation settings.',
|
sonarr: 'TV automation settings.',
|
||||||
radarr: 'Movie automation settings.',
|
radarr: 'Movie automation settings.',
|
||||||
prowlarr: 'Indexer search settings.',
|
prowlarr: 'Indexer search settings.',
|
||||||
qbittorrent: 'Downloader connection 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.',
|
log: 'Activity log for troubleshooting.',
|
||||||
site: 'Sitewide banner, version, and changelog details.',
|
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> = {
|
const SETTINGS_SECTION_MAP: Record<string, string | null> = {
|
||||||
jellyseerr: 'jellyseerr',
|
jellyseerr: 'jellyseerr',
|
||||||
jellyfin: 'jellyfin',
|
jellyfin: 'jellyfin',
|
||||||
artwork: 'artwork',
|
artwork: null,
|
||||||
sonarr: 'sonarr',
|
sonarr: 'sonarr',
|
||||||
radarr: 'radarr',
|
radarr: 'radarr',
|
||||||
prowlarr: 'prowlarr',
|
prowlarr: 'prowlarr',
|
||||||
@@ -73,13 +73,13 @@ const labelFromKey = (key: string) =>
|
|||||||
.replace('quality profile id', 'Quality profile ID')
|
.replace('quality profile id', 'Quality profile ID')
|
||||||
.replace('root folder', 'Root folder')
|
.replace('root folder', 'Root folder')
|
||||||
.replace('qbittorrent', 'qBittorrent')
|
.replace('qbittorrent', 'qBittorrent')
|
||||||
.replace('requests sync ttl minutes', 'Refresh saved requests if older than (minutes)')
|
.replace('requests sync ttl minutes', 'Saved request refresh TTL (minutes)')
|
||||||
.replace('requests poll interval seconds', 'Background refresh check (seconds)')
|
.replace('requests poll interval seconds', 'Full refresh check interval (seconds)')
|
||||||
.replace('requests delta sync interval minutes', 'Check for new or updated requests every (minutes)')
|
.replace('requests delta sync interval minutes', 'Delta sync interval (minutes)')
|
||||||
.replace('requests full sync time', 'Full refresh time (24h)')
|
.replace('requests full sync time', 'Daily full refresh time (24h)')
|
||||||
.replace('requests cleanup time', 'Clean up old history time (24h)')
|
.replace('requests cleanup time', 'Daily history cleanup time (24h)')
|
||||||
.replace('requests cleanup days', 'Remove history older than (days)')
|
.replace('requests cleanup days', 'History retention window (days)')
|
||||||
.replace('requests data source', 'Where requests are loaded from')
|
.replace('requests data source', 'Request source (cache vs Jellyseerr)')
|
||||||
.replace('jellyfin public url', 'Jellyfin public URL')
|
.replace('jellyfin public url', 'Jellyfin public URL')
|
||||||
.replace('jellyfin sync to arr', 'Sync Jellyfin to Sonarr/Radarr')
|
.replace('jellyfin sync to arr', 'Sync Jellyfin to Sonarr/Radarr')
|
||||||
.replace('artwork cache mode', 'Artwork cache mode')
|
.replace('artwork cache mode', 'Artwork cache mode')
|
||||||
@@ -89,6 +89,19 @@ const labelFromKey = (key: string) =>
|
|||||||
.replace('site banner tone', 'Sitewide banner tone')
|
.replace('site banner tone', 'Sitewide banner tone')
|
||||||
.replace('site changelog', 'Changelog text')
|
.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 = {
|
type SettingsPageProps = {
|
||||||
section: string
|
section: string
|
||||||
}
|
}
|
||||||
@@ -112,8 +125,11 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
const [cacheRows, setCacheRows] = useState<any[]>([])
|
const [cacheRows, setCacheRows] = useState<any[]>([])
|
||||||
const [cacheCount, setCacheCount] = useState(50)
|
const [cacheCount, setCacheCount] = useState(50)
|
||||||
const [cacheStatus, setCacheStatus] = useState<string | null>(null)
|
const [cacheStatus, setCacheStatus] = useState<string | null>(null)
|
||||||
|
const [cacheLoading, setCacheLoading] = useState(false)
|
||||||
const [requestsSync, setRequestsSync] = useState<any | null>(null)
|
const [requestsSync, setRequestsSync] = useState<any | null>(null)
|
||||||
const [artworkPrefetch, setArtworkPrefetch] = 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 [maintenanceStatus, setMaintenanceStatus] = useState<string | null>(null)
|
||||||
const [maintenanceBusy, setMaintenanceBusy] = useState(false)
|
const [maintenanceBusy, setMaintenanceBusy] = useState(false)
|
||||||
|
|
||||||
@@ -165,6 +181,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') => {
|
const loadOptions = useCallback(async (service: 'sonarr' | 'radarr') => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
@@ -204,8 +241,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
await loadSettings()
|
await loadSettings()
|
||||||
if (section === 'artwork') {
|
if (section === 'cache' || section === 'artwork') {
|
||||||
await loadArtworkPrefetchStatus()
|
await loadArtworkPrefetchStatus()
|
||||||
|
await loadArtworkSummary()
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
@@ -222,7 +260,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
if (section === 'radarr') {
|
if (section === 'radarr') {
|
||||||
void loadOptions('radarr')
|
void loadOptions('radarr')
|
||||||
}
|
}
|
||||||
}, [loadArtworkPrefetchStatus, loadOptions, loadSettings, router, section])
|
}, [loadArtworkPrefetchStatus, loadArtworkSummary, loadOptions, loadSettings, router, section])
|
||||||
|
|
||||||
const groupedSettings = useMemo(() => {
|
const groupedSettings = useMemo(() => {
|
||||||
const groups: Record<string, AdminSetting[]> = {}
|
const groups: Record<string, AdminSetting[]> = {}
|
||||||
@@ -237,28 +275,51 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
const settingsSection = SETTINGS_SECTION_MAP[section] ?? null
|
const settingsSection = SETTINGS_SECTION_MAP[section] ?? null
|
||||||
const visibleSections = settingsSection ? [settingsSection] : []
|
const visibleSections = settingsSection ? [settingsSection] : []
|
||||||
const isCacheSection = section === 'cache'
|
const isCacheSection = section === 'cache'
|
||||||
const cacheSettingKeys = new Set([
|
const cacheSettingKeys = new Set(['requests_sync_ttl_minutes', 'requests_data_source'])
|
||||||
'requests_sync_ttl_minutes',
|
const artworkSettingKeys = new Set(['artwork_cache_mode'])
|
||||||
'requests_data_source',
|
const hiddenSettingKeys = new Set([...cacheSettingKeys, ...artworkSettingKeys])
|
||||||
'artwork_cache_mode',
|
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 cacheSettings = settings.filter((setting) => cacheSettingKeys.has(setting.key))
|
||||||
|
const artworkSettings = settings.filter((setting) => artworkSettingKeys.has(setting.key))
|
||||||
const settingsSections = isCacheSection
|
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) => ({
|
: visibleSections.map((sectionKey) => ({
|
||||||
key: sectionKey,
|
key: sectionKey,
|
||||||
title: SECTION_LABELS[sectionKey] ?? sectionKey,
|
title: SECTION_LABELS[sectionKey] ?? sectionKey,
|
||||||
items:
|
items: (() => {
|
||||||
|
const sectionItems = groupedSettings[sectionKey] ?? []
|
||||||
|
const filtered =
|
||||||
sectionKey === 'requests' || sectionKey === 'artwork'
|
sectionKey === 'requests' || sectionKey === 'artwork'
|
||||||
? (groupedSettings[sectionKey] ?? []).filter(
|
? sectionItems.filter((setting) => !hiddenSettingKeys.has(setting.key))
|
||||||
(setting) => !cacheSettingKeys.has(setting.key)
|
: sectionItems
|
||||||
)
|
if (sectionKey === 'requests') {
|
||||||
: groupedSettings[sectionKey] ?? [],
|
return sortByOrder(filtered, requestSettingOrder)
|
||||||
|
}
|
||||||
|
return filtered
|
||||||
|
})(),
|
||||||
}))
|
}))
|
||||||
const showLogs = section === 'logs'
|
const showLogs = section === 'logs'
|
||||||
const showMaintenance = section === 'maintenance'
|
const showMaintenance = section === 'maintenance'
|
||||||
const showRequestsExtras = section === 'requests'
|
const showRequestsExtras = section === 'requests'
|
||||||
const showArtworkExtras = section === 'artwork'
|
const showArtworkExtras = section === 'cache'
|
||||||
const showCacheExtras = section === 'cache'
|
const showCacheExtras = section === 'cache'
|
||||||
const shouldRenderSection = (sectionGroup: { key: string; items?: AdminSetting[] }) => {
|
const shouldRenderSection = (sectionGroup: { key: string; items?: AdminSetting[] }) => {
|
||||||
if (sectionGroup.items && sectionGroup.items.length > 0) return true
|
if (sectionGroup.items && sectionGroup.items.length > 0) return true
|
||||||
@@ -292,12 +353,15 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
qbittorrent_username: 'qBittorrent login username.',
|
qbittorrent_username: 'qBittorrent login username.',
|
||||||
qbittorrent_password: 'qBittorrent login password.',
|
qbittorrent_password: 'qBittorrent login password.',
|
||||||
requests_sync_ttl_minutes: 'How long saved requests stay fresh before a refresh is needed.',
|
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_poll_interval_seconds:
|
||||||
requests_delta_sync_interval_minutes: 'How often we check for new or updated requests.',
|
'How often Magent checks if a full refresh should run.',
|
||||||
requests_full_sync_time: 'Daily time to refresh the full request list.',
|
requests_delta_sync_interval_minutes:
|
||||||
requests_cleanup_time: 'Daily time to trim old history.',
|
'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_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_level: 'How much detail is written to the activity log.',
|
||||||
log_file: 'Where the activity log is stored.',
|
log_file: 'Where the activity log is stored.',
|
||||||
site_build_number: 'Build number shown in the account menu (auto-set from releases).',
|
site_build_number: 'Build number shown in the account menu (auto-set from releases).',
|
||||||
@@ -462,6 +526,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(() => {
|
useEffect(() => {
|
||||||
if (!artworkPrefetch || artworkPrefetch.status !== 'running') {
|
if (!artworkPrefetch || artworkPrefetch.status !== 'running') {
|
||||||
return
|
return
|
||||||
@@ -479,6 +568,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
setArtworkPrefetch(data?.prefetch ?? null)
|
setArtworkPrefetch(data?.prefetch ?? null)
|
||||||
if (data?.prefetch?.status && data.prefetch.status !== 'running') {
|
if (data?.prefetch?.status && data.prefetch.status !== 'running') {
|
||||||
setArtworkPrefetchStatus(data.prefetch.message || 'Artwork caching complete.')
|
setArtworkPrefetchStatus(data.prefetch.message || 'Artwork caching complete.')
|
||||||
|
void loadArtworkSummary()
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
@@ -488,7 +578,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
active = false
|
active = false
|
||||||
clearInterval(timer)
|
clearInterval(timer)
|
||||||
}
|
}
|
||||||
}, [artworkPrefetch])
|
}, [artworkPrefetch, loadArtworkSummary])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!artworkPrefetch || artworkPrefetch.status === 'running') {
|
if (!artworkPrefetch || artworkPrefetch.status === 'running') {
|
||||||
@@ -578,6 +668,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
|
|
||||||
const loadCache = async () => {
|
const loadCache = async () => {
|
||||||
setCacheStatus(null)
|
setCacheStatus(null)
|
||||||
|
setCacheLoading(true)
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(
|
const response = await authFetch(
|
||||||
@@ -600,6 +691,8 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
? err.message.replace(/^\\{\"detail\":\"|\"\\}$/g, '')
|
? err.message.replace(/^\\{\"detail\":\"|\"\\}$/g, '')
|
||||||
: 'Could not load cache.'
|
: 'Could not load cache.'
|
||||||
setCacheStatus(message)
|
setCacheStatus(message)
|
||||||
|
} finally {
|
||||||
|
setCacheLoading(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -714,7 +807,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
.map((sectionGroup) => (
|
.map((sectionGroup) => (
|
||||||
<section key={sectionGroup.key} className="admin-section">
|
<section key={sectionGroup.key} className="admin-section">
|
||||||
<div className="section-header">
|
<div className="section-header">
|
||||||
<h2>{sectionGroup.title}</h2>
|
<h2>
|
||||||
|
{sectionGroup.key === 'requests' ? 'Request sync controls' : sectionGroup.title}
|
||||||
|
</h2>
|
||||||
{sectionGroup.key === 'sonarr' && (
|
{sectionGroup.key === 'sonarr' && (
|
||||||
<button type="button" onClick={() => loadOptions('sonarr')}>
|
<button type="button" onClick={() => loadOptions('sonarr')}>
|
||||||
Refresh Sonarr options
|
Refresh Sonarr options
|
||||||
@@ -730,24 +825,38 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
Import Jellyfin users
|
Import Jellyfin users
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
{(showArtworkExtras && sectionGroup.key === 'artwork') ||
|
{showArtworkExtras && sectionGroup.key === 'artwork' ? (
|
||||||
(showCacheExtras && sectionGroup.key === 'cache') ? (
|
<div className="sync-actions">
|
||||||
<button type="button" onClick={prefetchArtwork}>
|
<button type="button" onClick={prefetchArtwork}>
|
||||||
Cache all artwork now
|
Cache all artwork now
|
||||||
</button>
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="ghost-button"
|
||||||
|
onClick={prefetchArtworkMissing}
|
||||||
|
>
|
||||||
|
Sync only missing artwork
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
{showRequestsExtras && sectionGroup.key === 'requests' && (
|
{showRequestsExtras && sectionGroup.key === 'requests' && (
|
||||||
|
<div className="sync-actions-block">
|
||||||
<div className="sync-actions">
|
<div className="sync-actions">
|
||||||
<button type="button" onClick={syncRequests}>
|
<button type="button" onClick={syncRequests}>
|
||||||
Full refresh
|
Run full refresh (rebuild cache)
|
||||||
</button>
|
</button>
|
||||||
<button type="button" className="ghost-button" onClick={syncRequestsDelta}>
|
<button type="button" className="ghost-button" onClick={syncRequestsDelta}>
|
||||||
Quick refresh (new changes)
|
Run delta sync (recent changes)
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
<div className="meta sync-note">
|
||||||
|
Full refresh rebuilds the entire cache. Delta sync only checks new or updated
|
||||||
|
requests.
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{SECTION_DESCRIPTIONS[sectionGroup.key] && (
|
{SECTION_DESCRIPTIONS[sectionGroup.key] && !settingsSection && (
|
||||||
<p className="section-subtitle">{SECTION_DESCRIPTIONS[sectionGroup.key]}</p>
|
<p className="section-subtitle">{SECTION_DESCRIPTIONS[sectionGroup.key]}</p>
|
||||||
)}
|
)}
|
||||||
{sectionGroup.key === 'sonarr' && sonarrError && (
|
{sectionGroup.key === 'sonarr' && sonarrError && (
|
||||||
@@ -759,17 +868,48 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
{sectionGroup.key === 'jellyfin' && jellyfinSyncStatus && (
|
{sectionGroup.key === 'jellyfin' && jellyfinSyncStatus && (
|
||||||
<div className="status-banner">{jellyfinSyncStatus}</div>
|
<div className="status-banner">{jellyfinSyncStatus}</div>
|
||||||
)}
|
)}
|
||||||
{((showArtworkExtras && sectionGroup.key === 'artwork') ||
|
{showArtworkExtras && sectionGroup.key === 'artwork' && artworkPrefetchStatus && (
|
||||||
(showCacheExtras && sectionGroup.key === 'cache')) &&
|
|
||||||
artworkPrefetchStatus && (
|
|
||||||
<div className="status-banner">{artworkPrefetchStatus}</div>
|
<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 && (
|
{showRequestsExtras && sectionGroup.key === 'requests' && requestsSyncStatus && (
|
||||||
<div className="status-banner">{requestsSyncStatus}</div>
|
<div className="status-banner">{requestsSyncStatus}</div>
|
||||||
)}
|
)}
|
||||||
{((showArtworkExtras && sectionGroup.key === 'artwork') ||
|
{showRequestsExtras && sectionGroup.key === 'requests' && (
|
||||||
(showCacheExtras && sectionGroup.key === 'cache')) &&
|
<div className="status-banner">
|
||||||
artworkPrefetch && (
|
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-progress">
|
||||||
<div className="sync-meta">
|
<div className="sync-meta">
|
||||||
<span>Status: {artworkPrefetch.status}</span>
|
<span>Status: {artworkPrefetch.status}</span>
|
||||||
@@ -1124,7 +1264,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
<option value="always_js">Always use Jellyseerr (slower)</option>
|
<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>
|
</select>
|
||||||
</label>
|
</label>
|
||||||
)
|
)
|
||||||
@@ -1194,7 +1336,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
</form>
|
</form>
|
||||||
) : (
|
) : (
|
||||||
<div className="status-banner">
|
<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>
|
</div>
|
||||||
)}
|
)}
|
||||||
{showLogs && (
|
{showLogs && (
|
||||||
@@ -1240,8 +1382,15 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
<option value={200}>200</option>
|
<option value={200}>200</option>
|
||||||
</select>
|
</select>
|
||||||
</label>
|
</label>
|
||||||
<button type="button" onClick={loadCache}>
|
<button type="button" onClick={loadCache} disabled={cacheLoading}>
|
||||||
Load saved requests
|
{cacheLoading ? (
|
||||||
|
<>
|
||||||
|
<span className="spinner button-spinner" aria-hidden="true" />
|
||||||
|
Loading saved requests
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
'Load saved requests'
|
||||||
|
)}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1047,6 +1047,17 @@ button span {
|
|||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.sync-actions-block {
|
||||||
|
display: grid;
|
||||||
|
gap: 6px;
|
||||||
|
justify-items: end;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sync-note {
|
||||||
|
margin-top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.section-header button {
|
.section-header button {
|
||||||
background: rgba(255, 255, 255, 0.08);
|
background: rgba(255, 255, 255, 0.08);
|
||||||
color: var(--ink);
|
color: var(--ink);
|
||||||
@@ -1315,6 +1326,17 @@ button span {
|
|||||||
|
|
||||||
.progress-indeterminate .progress-fill {
|
.progress-indeterminate .progress-fill {
|
||||||
position: absolute;
|
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;
|
animation: progress-indeterminate 1.6s ease-in-out infinite;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1393,6 +1415,24 @@ button span {
|
|||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.system-meta {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.system-test-message {
|
||||||
|
font-size: 11px;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.system-actions {
|
||||||
|
margin-left: auto;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
.system-dot {
|
.system-dot {
|
||||||
width: 10px;
|
width: 10px;
|
||||||
height: 10px;
|
height: 10px;
|
||||||
@@ -1422,10 +1462,28 @@ button span {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.system-state {
|
.system-state {
|
||||||
margin-left: auto;
|
|
||||||
color: var(--ink-muted);
|
color: var(--ink-muted);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.system-test {
|
||||||
|
padding: 4px 10px;
|
||||||
|
border-radius: 999px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
background: rgba(255, 255, 255, 0.08);
|
||||||
|
color: var(--ink-muted);
|
||||||
|
font-size: 11px;
|
||||||
|
letter-spacing: 0.02em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.system-test:hover:not(:disabled) {
|
||||||
|
background: rgba(255, 255, 255, 0.16);
|
||||||
|
}
|
||||||
|
|
||||||
|
.system-test:disabled {
|
||||||
|
opacity: 0.6;
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
.pipeline-map {
|
.pipeline-map {
|
||||||
border-radius: 16px;
|
border-radius: 16px;
|
||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
@@ -1498,13 +1556,10 @@ button span {
|
|||||||
|
|
||||||
@keyframes progress-indeterminate {
|
@keyframes progress-indeterminate {
|
||||||
0% {
|
0% {
|
||||||
transform: translateX(-50%);
|
background-position: 200% 0;
|
||||||
}
|
|
||||||
50% {
|
|
||||||
transform: translateX(120%);
|
|
||||||
}
|
}
|
||||||
100% {
|
100% {
|
||||||
transform: translateX(-50%);
|
background-position: -200% 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1670,6 +1725,16 @@ button span {
|
|||||||
animation: spin 0.9s linear infinite;
|
animation: spin 0.9s linear infinite;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.button-spinner {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
border-width: 2px;
|
||||||
|
box-shadow: none;
|
||||||
|
margin-right: 8px;
|
||||||
|
vertical-align: middle;
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
|
||||||
.loading-text {
|
.loading-text {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
color: var(--ink-muted);
|
color: var(--ink-muted);
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ export default function HomePage() {
|
|||||||
>(null)
|
>(null)
|
||||||
const [servicesLoading, setServicesLoading] = useState(false)
|
const [servicesLoading, setServicesLoading] = useState(false)
|
||||||
const [servicesError, setServicesError] = useState<string | null>(null)
|
const [servicesError, setServicesError] = useState<string | null>(null)
|
||||||
|
const [serviceTesting, setServiceTesting] = useState<Record<string, boolean>>({})
|
||||||
|
const [serviceTestResults, setServiceTestResults] = useState<Record<string, string | null>>({})
|
||||||
|
|
||||||
const submit = (event: React.FormEvent) => {
|
const submit = (event: React.FormEvent) => {
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
@@ -42,6 +44,61 @@ export default function HomePage() {
|
|||||||
void runSearch(trimmed)
|
void runSearch(trimmed)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const toServiceSlug = (name: string) => name.toLowerCase().replace(/[^a-z0-9]/g, '')
|
||||||
|
|
||||||
|
const updateServiceStatus = (name: string, status: string, message?: string) => {
|
||||||
|
setServicesStatus((prev) => {
|
||||||
|
if (!prev) return prev
|
||||||
|
return {
|
||||||
|
...prev,
|
||||||
|
services: prev.services.map((service) =>
|
||||||
|
service.name === name ? { ...service, status, message } : service
|
||||||
|
),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const testService = async (name: string) => {
|
||||||
|
const slug = toServiceSlug(name)
|
||||||
|
setServiceTesting((prev) => ({ ...prev, [name]: true }))
|
||||||
|
setServiceTestResults((prev) => ({ ...prev, [name]: null }))
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(`${baseUrl}/status/services/${slug}/test`, {
|
||||||
|
method: 'POST',
|
||||||
|
})
|
||||||
|
if (!response.ok) {
|
||||||
|
if (response.status === 401) {
|
||||||
|
clearToken()
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || `Service test failed: ${response.status}`)
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
const status = data?.status ?? 'unknown'
|
||||||
|
const message =
|
||||||
|
data?.message ||
|
||||||
|
(status === 'up'
|
||||||
|
? 'API OK'
|
||||||
|
: status === 'down'
|
||||||
|
? 'API unreachable'
|
||||||
|
: status === 'degraded'
|
||||||
|
? 'Health warnings'
|
||||||
|
: status === 'not_configured'
|
||||||
|
? 'Not configured'
|
||||||
|
: 'Unknown')
|
||||||
|
setServiceTestResults((prev) => ({ ...prev, [name]: message }))
|
||||||
|
updateServiceStatus(name, status, data?.message)
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error)
|
||||||
|
setServiceTestResults((prev) => ({ ...prev, [name]: 'Test failed' }))
|
||||||
|
} finally {
|
||||||
|
setServiceTesting((prev) => ({ ...prev, [name]: false }))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!getToken()) {
|
if (!getToken()) {
|
||||||
router.push('/login')
|
router.push('/login')
|
||||||
@@ -214,10 +271,17 @@ export default function HomePage() {
|
|||||||
return order.map((name) => {
|
return order.map((name) => {
|
||||||
const item = items.find((entry) => entry.name === name)
|
const item = items.find((entry) => entry.name === name)
|
||||||
const status = item?.status ?? 'unknown'
|
const status = item?.status ?? 'unknown'
|
||||||
|
const testing = serviceTesting[name] ?? false
|
||||||
return (
|
return (
|
||||||
<div key={name} className={`system-item system-${status}`}>
|
<div key={name} className={`system-item system-${status}`}>
|
||||||
<span className="system-dot" />
|
<span className="system-dot" />
|
||||||
|
<div className="system-meta">
|
||||||
<span className="system-name">{name}</span>
|
<span className="system-name">{name}</span>
|
||||||
|
{serviceTestResults[name] && (
|
||||||
|
<span className="system-test-message">{serviceTestResults[name]}</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="system-actions">
|
||||||
<span className="system-state">
|
<span className="system-state">
|
||||||
{status === 'up'
|
{status === 'up'
|
||||||
? 'Up'
|
? 'Up'
|
||||||
@@ -229,6 +293,15 @@ export default function HomePage() {
|
|||||||
? 'Not configured'
|
? 'Not configured'
|
||||||
: 'Unknown'}
|
: 'Unknown'}
|
||||||
</span>
|
</span>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="system-test"
|
||||||
|
onClick={() => void testService(name)}
|
||||||
|
disabled={testing}
|
||||||
|
>
|
||||||
|
{testing ? 'Testing...' : 'Test'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -188,6 +188,7 @@ export default function ProfilePage() {
|
|||||||
: '0%'}
|
: '0%'}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{profile?.role === 'admin' ? (
|
||||||
<div className="stat-card">
|
<div className="stat-card">
|
||||||
<div className="stat-label">Most active user</div>
|
<div className="stat-label">Most active user</div>
|
||||||
<div className="stat-value stat-value--small">
|
<div className="stat-value stat-value--small">
|
||||||
@@ -196,6 +197,7 @@ export default function ProfilePage() {
|
|||||||
: 'N/A'}
|
: 'N/A'}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
<section className="profile-section">
|
<section className="profile-section">
|
||||||
|
|||||||
@@ -17,9 +17,8 @@ const NAV_GROUPS = [
|
|||||||
{
|
{
|
||||||
title: 'Requests',
|
title: 'Requests',
|
||||||
items: [
|
items: [
|
||||||
{ href: '/admin/requests', label: 'Request syncing' },
|
{ href: '/admin/requests', label: 'Request sync' },
|
||||||
{ href: '/admin/artwork', label: 'Artwork' },
|
{ href: '/admin/cache', label: 'Cache Control' },
|
||||||
{ href: '/admin/cache', label: 'Cache' },
|
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ export default function UsersPage() {
|
|||||||
const [users, setUsers] = useState<AdminUser[]>([])
|
const [users, setUsers] = useState<AdminUser[]>([])
|
||||||
const [error, setError] = useState<string | null>(null)
|
const [error, setError] = useState<string | null>(null)
|
||||||
const [loading, setLoading] = useState(true)
|
const [loading, setLoading] = useState(true)
|
||||||
|
const [jellyfinSyncStatus, setJellyfinSyncStatus] = useState<string | null>(null)
|
||||||
|
const [jellyfinSyncBusy, setJellyfinSyncBusy] = useState(false)
|
||||||
|
|
||||||
const loadUsers = async () => {
|
const loadUsers = async () => {
|
||||||
try {
|
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(() => {
|
useEffect(() => {
|
||||||
if (!getToken()) {
|
if (!getToken()) {
|
||||||
@@ -121,13 +145,19 @@ export default function UsersPage() {
|
|||||||
title="Users"
|
title="Users"
|
||||||
subtitle="Manage who can use Magent."
|
subtitle="Manage who can use Magent."
|
||||||
actions={
|
actions={
|
||||||
|
<>
|
||||||
<button type="button" onClick={loadUsers}>
|
<button type="button" onClick={loadUsers}>
|
||||||
Reload list
|
Reload list
|
||||||
</button>
|
</button>
|
||||||
|
<button type="button" onClick={syncJellyfinUsers} disabled={jellyfinSyncBusy}>
|
||||||
|
{jellyfinSyncBusy ? 'Syncing Jellyfin users...' : 'Sync Jellyfin users'}
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<section className="admin-section">
|
<section className="admin-section">
|
||||||
{error && <div className="error-banner">{error}</div>}
|
{error && <div className="error-banner">{error}</div>}
|
||||||
|
{jellyfinSyncStatus && <div className="status-banner">{jellyfinSyncStatus}</div>}
|
||||||
{users.length === 0 ? (
|
{users.length === 0 ? (
|
||||||
<div className="status-banner">No users found yet.</div>
|
<div className="status-banner">No users found yet.</div>
|
||||||
) : (
|
) : (
|
||||||
|
|||||||
Reference in New Issue
Block a user