Compare commits
7 Commits
23549f1e45
...
2601261358
| Author | SHA1 | Date | |
|---|---|---|---|
| b93b41713a | |||
| ceb8c1c9eb | |||
| 86ca3bdeb2 | |||
| 22f90b7e07 | |||
| 57a4883931 | |||
| 6ba41b854b | |||
| 580b335268 |
1
.build_number
Normal file
1
.build_number
Normal file
@@ -0,0 +1 @@
|
|||||||
|
2601261358
|
||||||
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
|
||||||
)
|
)
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
@@ -141,6 +229,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 +373,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 +391,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 +472,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 +689,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 +750,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 +854,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 not title:
|
||||||
if isinstance(payload, dict):
|
title = derived_title
|
||||||
media = payload.get("media") or {}
|
if not year:
|
||||||
if not title:
|
year = derived_year
|
||||||
title = (
|
|
||||||
(media.get("title") if isinstance(media, dict) else None)
|
|
||||||
or (media.get("name") if isinstance(media, dict) else None)
|
|
||||||
or payload.get("title")
|
|
||||||
or payload.get("name")
|
|
||||||
)
|
|
||||||
if not year:
|
|
||||||
year = media.get("year") if isinstance(media, dict) else None
|
|
||||||
year = year or payload.get("year")
|
|
||||||
except json.JSONDecodeError:
|
|
||||||
pass
|
|
||||||
results.append(
|
results.append(
|
||||||
{
|
{
|
||||||
"request_id": row[0],
|
"request_id": row[0],
|
||||||
@@ -759,18 +890,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,6 +908,34 @@ 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()
|
||||||
@@ -796,7 +945,9 @@ def get_request_cache_count() -> int:
|
|||||||
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 +956,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(
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ 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_settings_overrides,
|
get_settings_overrides,
|
||||||
get_user_by_username,
|
get_user_by_username,
|
||||||
set_setting,
|
set_setting,
|
||||||
@@ -21,6 +22,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 +101,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 []
|
||||||
@@ -282,27 +316,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 []
|
||||||
|
stats_payload = {
|
||||||
|
**stats,
|
||||||
|
"share": share,
|
||||||
|
"global_total": global_total,
|
||||||
|
}
|
||||||
|
if current_user.get("role") == "admin":
|
||||||
|
stats_payload["most_active_user"] = get_global_request_leader()
|
||||||
return {
|
return {
|
||||||
"user": current_user,
|
"user": current_user,
|
||||||
"stats": {
|
"stats": stats_payload,
|
||||||
**stats,
|
|
||||||
"share": share,
|
|
||||||
"global_total": global_total,
|
|
||||||
"most_active_user": leader,
|
|
||||||
},
|
|
||||||
"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]:
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ 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,
|
||||||
|
repair_request_cache_titles,
|
||||||
prune_duplicate_requests_cache,
|
prune_duplicate_requests_cache,
|
||||||
upsert_request_cache,
|
upsert_request_cache,
|
||||||
get_setting,
|
get_setting,
|
||||||
@@ -814,13 +815,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)
|
repaired = repair_request_cache_titles()
|
||||||
return
|
if repaired:
|
||||||
|
logger.info("Requests cache titles repaired: %s", repaired)
|
||||||
_refresh_recent_cache_from_db()
|
_refresh_recent_cache_from_db()
|
||||||
|
|
||||||
|
|
||||||
@@ -968,7 +970,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,13 +1254,15 @@ 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)
|
||||||
if not client.configured():
|
mode = (runtime.requests_data_source or "prefer_cache").lower()
|
||||||
raise HTTPException(status_code=400, detail="Jellyseerr not configured")
|
allow_remote = mode == "always_js"
|
||||||
|
if allow_remote:
|
||||||
try:
|
if not client.configured():
|
||||||
await _ensure_requests_cache(client)
|
raise HTTPException(status_code=400, detail="Jellyseerr not configured")
|
||||||
except httpx.HTTPStatusError as exc:
|
try:
|
||||||
raise HTTPException(status_code=502, detail=str(exc)) from exc
|
await _ensure_requests_cache(client)
|
||||||
|
except httpx.HTTPStatusError as exc:
|
||||||
|
raise HTTPException(status_code=502, detail=str(exc)) from exc
|
||||||
|
|
||||||
username_norm = _normalize_username(user.get("username", ""))
|
username_norm = _normalize_username(user.get("username", ""))
|
||||||
requested_by = None if user.get("role") == "admin" else username_norm
|
requested_by = None if user.get("role") == "admin" else username_norm
|
||||||
@@ -1266,10 +1273,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 +1819,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"}}
|
||||||
|
|
||||||
|
|||||||
@@ -220,6 +220,7 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
"snapshot cache miss: request_id=%s mode=%s", request_id, mode
|
"snapshot cache miss: request_id=%s mode=%s", request_id, mode
|
||||||
)
|
)
|
||||||
|
|
||||||
|
allow_remote = mode == "always_js" and jellyseerr.configured()
|
||||||
if not jellyseerr.configured() and not cached_request:
|
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 +228,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(
|
||||||
@@ -262,7 +269,7 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
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:
|
||||||
|
|||||||
@@ -297,7 +297,8 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
requests_full_sync_time: 'Daily time to refresh the full request list.',
|
requests_full_sync_time: 'Daily time to refresh the full request list.',
|
||||||
requests_cleanup_time: 'Daily time to trim old history.',
|
requests_cleanup_time: 'Daily time to trim old 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).',
|
||||||
@@ -714,7 +715,7 @@ 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' ? '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
|
||||||
@@ -737,17 +738,22 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
</button>
|
</button>
|
||||||
) : null}
|
) : null}
|
||||||
{showRequestsExtras && sectionGroup.key === 'requests' && (
|
{showRequestsExtras && sectionGroup.key === 'requests' && (
|
||||||
<div className="sync-actions">
|
<div className="sync-actions-block">
|
||||||
<button type="button" onClick={syncRequests}>
|
<div className="sync-actions">
|
||||||
Full refresh
|
<button type="button" onClick={syncRequests}>
|
||||||
</button>
|
Full refresh (all requests)
|
||||||
<button type="button" className="ghost-button" onClick={syncRequestsDelta}>
|
</button>
|
||||||
Quick refresh (new changes)
|
<button type="button" className="ghost-button" onClick={syncRequestsDelta}>
|
||||||
</button>
|
Quick refresh (delta changes)
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div className="meta sync-note">
|
||||||
|
Full refresh reloads the entire list. Quick refresh only checks recent changes.
|
||||||
|
</div>
|
||||||
</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 && (
|
||||||
@@ -1124,7 +1130,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>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -188,14 +188,16 @@ export default function ProfilePage() {
|
|||||||
: '0%'}
|
: '0%'}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="stat-card">
|
{profile?.role === 'admin' ? (
|
||||||
<div className="stat-label">Most active user</div>
|
<div className="stat-card">
|
||||||
<div className="stat-value stat-value--small">
|
<div className="stat-label">Most active user</div>
|
||||||
{stats?.most_active_user
|
<div className="stat-value stat-value--small">
|
||||||
? `${stats.most_active_user.username} (${stats.most_active_user.total})`
|
{stats?.most_active_user
|
||||||
: 'N/A'}
|
? `${stats.most_active_user.username} (${stats.most_active_user.total})`
|
||||||
|
: 'N/A'}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
<section className="profile-section">
|
<section className="profile-section">
|
||||||
|
|||||||
@@ -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}>
|
<>
|
||||||
Reload list
|
<button type="button" onClick={loadUsers}>
|
||||||
</button>
|
Reload list
|
||||||
|
</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