Compare commits
2 Commits
2602262059
...
dev-2.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 619708cae0 | |||
| af67c888c6 |
@@ -1 +0,0 @@
|
|||||||
2602262059
|
|
||||||
53
Dockerfile
53
Dockerfile
@@ -1,53 +0,0 @@
|
|||||||
FROM node:20-slim AS frontend-builder
|
|
||||||
|
|
||||||
WORKDIR /frontend
|
|
||||||
|
|
||||||
ENV NODE_ENV=production \
|
|
||||||
BACKEND_INTERNAL_URL=http://127.0.0.1:8000 \
|
|
||||||
NEXT_PUBLIC_API_BASE=/api
|
|
||||||
|
|
||||||
COPY frontend/package.json ./
|
|
||||||
RUN npm install
|
|
||||||
|
|
||||||
COPY frontend/app ./app
|
|
||||||
COPY frontend/public ./public
|
|
||||||
COPY frontend/next-env.d.ts ./next-env.d.ts
|
|
||||||
COPY frontend/next.config.js ./next.config.js
|
|
||||||
COPY frontend/tsconfig.json ./tsconfig.json
|
|
||||||
|
|
||||||
RUN npm run build
|
|
||||||
|
|
||||||
FROM python:3.12-slim
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
ENV PYTHONDONTWRITEBYTECODE=1 \
|
|
||||||
PYTHONUNBUFFERED=1 \
|
|
||||||
NODE_ENV=production
|
|
||||||
|
|
||||||
RUN apt-get update \
|
|
||||||
&& apt-get install -y --no-install-recommends curl gnupg supervisor \
|
|
||||||
&& curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
|
|
||||||
&& apt-get install -y --no-install-recommends nodejs \
|
|
||||||
&& apt-get clean \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
COPY backend/requirements.txt .
|
|
||||||
RUN pip install --no-cache-dir -r requirements.txt
|
|
||||||
|
|
||||||
COPY backend/app ./app
|
|
||||||
COPY data/branding /app/data/branding
|
|
||||||
|
|
||||||
COPY --from=frontend-builder /frontend/.next /app/frontend/.next
|
|
||||||
COPY --from=frontend-builder /frontend/public /app/frontend/public
|
|
||||||
COPY --from=frontend-builder /frontend/node_modules /app/frontend/node_modules
|
|
||||||
COPY --from=frontend-builder /frontend/package.json /app/frontend/package.json
|
|
||||||
COPY --from=frontend-builder /frontend/next.config.js /app/frontend/next.config.js
|
|
||||||
COPY --from=frontend-builder /frontend/next-env.d.ts /app/frontend/next-env.d.ts
|
|
||||||
COPY --from=frontend-builder /frontend/tsconfig.json /app/frontend/tsconfig.json
|
|
||||||
|
|
||||||
COPY docker/supervisord.conf /etc/supervisor/conf.d/magent.conf
|
|
||||||
|
|
||||||
EXPOSE 3000 8000
|
|
||||||
|
|
||||||
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/magent.conf"]
|
|
||||||
@@ -26,7 +26,7 @@ def triage_snapshot(snapshot: Snapshot) -> TriageResult:
|
|||||||
recommendations.append(
|
recommendations.append(
|
||||||
TriageRecommendation(
|
TriageRecommendation(
|
||||||
action_id="readd_to_arr",
|
action_id="readd_to_arr",
|
||||||
title="Push to Sonarr/Radarr",
|
title="Add it to the library queue",
|
||||||
reason="Sonarr/Radarr has not created the entry for this request.",
|
reason="Sonarr/Radarr has not created the entry for this request.",
|
||||||
risk="medium",
|
risk="medium",
|
||||||
)
|
)
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB |
@@ -1,28 +1,15 @@
|
|||||||
from typing import Dict, Any
|
from typing import Dict, Any
|
||||||
|
|
||||||
from fastapi import Depends, HTTPException, status, Request
|
from fastapi import Depends, HTTPException, status
|
||||||
from fastapi.security import OAuth2PasswordBearer
|
from fastapi.security import OAuth2PasswordBearer
|
||||||
|
|
||||||
from .db import get_user_by_username, upsert_user_activity
|
from .db import get_user_by_username
|
||||||
from .security import safe_decode_token, TokenError
|
from .security import safe_decode_token, TokenError
|
||||||
|
|
||||||
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/auth/login")
|
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/auth/login")
|
||||||
|
|
||||||
def _extract_client_ip(request: Request) -> str:
|
|
||||||
forwarded = request.headers.get("x-forwarded-for")
|
|
||||||
if forwarded:
|
|
||||||
parts = [part.strip() for part in forwarded.split(",") if part.strip()]
|
|
||||||
if parts:
|
|
||||||
return parts[0]
|
|
||||||
real_ip = request.headers.get("x-real-ip")
|
|
||||||
if real_ip:
|
|
||||||
return real_ip.strip()
|
|
||||||
if request.client and request.client.host:
|
|
||||||
return request.client.host
|
|
||||||
return "unknown"
|
|
||||||
|
|
||||||
|
def get_current_user(token: str = Depends(oauth2_scheme)) -> Dict[str, Any]:
|
||||||
def get_current_user(token: str = Depends(oauth2_scheme), request: Request = None) -> Dict[str, Any]:
|
|
||||||
try:
|
try:
|
||||||
payload = safe_decode_token(token)
|
payload = safe_decode_token(token)
|
||||||
except TokenError as exc:
|
except TokenError as exc:
|
||||||
@@ -38,17 +25,10 @@ def get_current_user(token: str = Depends(oauth2_scheme), request: Request = Non
|
|||||||
if user.get("is_blocked"):
|
if 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")
|
||||||
|
|
||||||
if request is not None:
|
|
||||||
ip = _extract_client_ip(request)
|
|
||||||
user_agent = request.headers.get("user-agent", "unknown")
|
|
||||||
upsert_user_activity(user["username"], ip, user_agent)
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"username": user["username"],
|
"username": user["username"],
|
||||||
"role": user["role"],
|
"role": user["role"],
|
||||||
"auth_provider": user.get("auth_provider", "local"),
|
"auth_provider": user.get("auth_provider", "local"),
|
||||||
"jellyseerr_user_id": user.get("jellyseerr_user_id"),
|
|
||||||
"auto_search_enabled": bool(user.get("auto_search_enabled", True)),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
BUILD_NUMBER = "2602262059"
|
|
||||||
CHANGELOG = '2026-01-22\\n- Initial commit\\n- Ignore build artifacts\\n- Update README\\n- Update README with Docker-first guide\\n\\n2026-01-23\\n- Fix cache titles via Jellyseerr media lookup\\n- Split search actions and improve download options\\n- Fallback manual grab to qBittorrent\\n- Hide header actions when signed out\\n- Add feedback form and webhook\\n- Fix cache titles and move feedback link\\n- Show available status on landing when in Jellyfin\\n- Add default branding assets when missing\\n- Use bundled branding assets\\n- Remove password fields from users page\\n- Add Docker Hub compose override\\n- Fix backend Dockerfile paths for root context\\n- Copy public assets into frontend image\\n- Use backend branding assets for logo and favicon\\n\\n2026-01-24\\n- Route grabs through Sonarr/Radarr only\\n- Document fix buttons in how-it-works\\n- Clarify how-it-works steps and fixes\\n- Map Prowlarr releases to Arr indexers for manual grab\\n- Improve request handling and qBittorrent categories\\n\\n2026-01-25\\n- Add site banner, build number, and changelog\\n- Automate build number tagging and sync\\n- Improve mobile header layout\\n- Move account actions into avatar menu\\n- Add user stats and activity tracking\\n- Add Jellyfin login cache and admin-only stats\\n- Tidy request sync controls\\n- Seed branding logo from bundled assets\\n- Serve bundled branding assets by default\\n- Harden request cache titles and cache-only reads\\n- Build 2501262041\\n\\n2026-01-26\\n- Fix cache title hydration\\n- Fix sync progress bar animation\\n\\n2026-01-27\\n- Add cache control artwork stats\\n- Improve cache stats performance (build 271261145)\\n- Fix backend cache stats import (build 271261149)\\n- Clarify request sync settings (build 271261159)\\n- Bump build number to 271261202\\n- Fix request titles in snapshots (build 271261219)\\n- Fix snapshot title fallback (build 271261228)\\n- Add cache load spinner (build 271261238)\\n- Bump build number (process 2) 271261322\\n- Add service test buttons (build 271261335)\\n- Fallback to TMDB when artwork cache fails (build 271261524)\\n- Hydrate missing artwork from Jellyseerr (build 271261539)\\n\\n2026-01-29\\n- release: 2901262036\\n- release: 2901262044\\n- release: 2901262102\\n- Hardcode build number in backend\\n- Bake build number and changelog\\n- Update full changelog\\n- Tidy full changelog\\n- Build 2901262240: cache users\n\n2026-01-30\n- Merge backend and frontend into one container'
|
|
||||||
|
|
||||||
@@ -30,14 +30,3 @@ class ApiClient:
|
|||||||
response = await client.post(url, headers=self.headers(), json=payload)
|
response = await client.post(url, headers=self.headers(), json=payload)
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
return response.json()
|
return response.json()
|
||||||
|
|
||||||
async def put(self, path: str, payload: Optional[Dict[str, Any]] = None) -> Optional[Any]:
|
|
||||||
if not self.base_url:
|
|
||||||
return None
|
|
||||||
url = f"{self.base_url}{path}"
|
|
||||||
async with httpx.AsyncClient(timeout=10.0) as client:
|
|
||||||
response = await client.put(url, headers=self.headers(), json=payload)
|
|
||||||
response.raise_for_status()
|
|
||||||
if not response.content:
|
|
||||||
return None
|
|
||||||
return response.json()
|
|
||||||
|
|||||||
@@ -58,13 +58,3 @@ class JellyfinClient(ApiClient):
|
|||||||
response = await client.get(url, headers=headers)
|
response = await client.get(url, headers=headers)
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
return response.json()
|
return response.json()
|
||||||
|
|
||||||
async def refresh_library(self, recursive: bool = True) -> None:
|
|
||||||
if not self.base_url or not self.api_key:
|
|
||||||
return None
|
|
||||||
url = f"{self.base_url}/Library/Refresh"
|
|
||||||
headers = {"X-Emby-Token": self.api_key}
|
|
||||||
params = {"Recursive": "true" if recursive else "false"}
|
|
||||||
async with httpx.AsyncClient(timeout=10.0) as client:
|
|
||||||
response = await client.post(url, headers=headers, params=params)
|
|
||||||
response.raise_for_status()
|
|
||||||
|
|||||||
@@ -35,12 +35,3 @@ class JellyseerrClient(ApiClient):
|
|||||||
"page": page,
|
"page": page,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
async def get_users(self, take: int = 50, skip: int = 0) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.get(
|
|
||||||
"/api/v1/user",
|
|
||||||
params={
|
|
||||||
"take": take,
|
|
||||||
"skip": skip,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
from typing import Any, Dict, Optional
|
from typing import Any, Dict, Optional
|
||||||
import httpx
|
import httpx
|
||||||
import logging
|
|
||||||
from .base import ApiClient
|
from .base import ApiClient
|
||||||
|
|
||||||
|
|
||||||
@@ -9,7 +8,6 @@ class QBittorrentClient(ApiClient):
|
|||||||
super().__init__(base_url, None)
|
super().__init__(base_url, None)
|
||||||
self.username = username
|
self.username = username
|
||||||
self.password = password
|
self.password = password
|
||||||
self.logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
def configured(self) -> bool:
|
def configured(self) -> bool:
|
||||||
return bool(self.base_url and self.username and self.password)
|
return bool(self.base_url and self.username and self.password)
|
||||||
@@ -74,14 +72,6 @@ class QBittorrentClient(ApiClient):
|
|||||||
raise
|
raise
|
||||||
|
|
||||||
async def add_torrent_url(self, url: str, category: Optional[str] = None) -> None:
|
async def add_torrent_url(self, url: str, category: Optional[str] = None) -> None:
|
||||||
url_host = None
|
|
||||||
if isinstance(url, str) and "://" in url:
|
|
||||||
url_host = url.split("://", 1)[-1].split("/", 1)[0]
|
|
||||||
self.logger.warning(
|
|
||||||
"qBittorrent add_torrent_url invoked: category=%s host=%s",
|
|
||||||
category,
|
|
||||||
url_host or "unknown",
|
|
||||||
)
|
|
||||||
data: Dict[str, Any] = {"urls": url}
|
data: Dict[str, Any] = {"urls": url}
|
||||||
if category:
|
if category:
|
||||||
data["category"] = category
|
data["category"] = category
|
||||||
|
|||||||
@@ -9,9 +9,6 @@ class RadarrClient(ApiClient):
|
|||||||
async def get_movie_by_tmdb_id(self, tmdb_id: int) -> Optional[Dict[str, Any]]:
|
async def get_movie_by_tmdb_id(self, tmdb_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/movie", params={"tmdbId": tmdb_id})
|
return await self.get("/api/v3/movie", params={"tmdbId": tmdb_id})
|
||||||
|
|
||||||
async def get_movie(self, movie_id: int) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.get(f"/api/v3/movie/{movie_id}")
|
|
||||||
|
|
||||||
async def get_movies(self) -> Optional[Dict[str, Any]]:
|
async def get_movies(self) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/movie")
|
return await self.get("/api/v3/movie")
|
||||||
|
|
||||||
@@ -24,9 +21,6 @@ class RadarrClient(ApiClient):
|
|||||||
async def get_queue(self, movie_id: int) -> Optional[Dict[str, Any]]:
|
async def get_queue(self, movie_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/queue", params={"movieId": movie_id})
|
return await self.get("/api/v3/queue", params={"movieId": movie_id})
|
||||||
|
|
||||||
async def get_indexers(self) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.get("/api/v3/indexer")
|
|
||||||
|
|
||||||
async def search(self, movie_id: int) -> Optional[Dict[str, Any]]:
|
async def search(self, movie_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.post("/api/v3/command", payload={"name": "MoviesSearch", "movieIds": [movie_id]})
|
return await self.post("/api/v3/command", payload={"name": "MoviesSearch", "movieIds": [movie_id]})
|
||||||
|
|
||||||
@@ -47,17 +41,5 @@ class RadarrClient(ApiClient):
|
|||||||
}
|
}
|
||||||
return await self.post("/api/v3/movie", payload=payload)
|
return await self.post("/api/v3/movie", payload=payload)
|
||||||
|
|
||||||
async def update_movie(self, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.put("/api/v3/movie", payload=payload)
|
|
||||||
|
|
||||||
async def grab_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
async def grab_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.post("/api/v3/release", payload={"guid": guid, "indexerId": indexer_id})
|
return await self.post("/api/v3/release", payload={"guid": guid, "indexerId": indexer_id})
|
||||||
|
|
||||||
async def push_release(self, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.post("/api/v3/release/push", payload=payload)
|
|
||||||
|
|
||||||
async def download_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.post(
|
|
||||||
"/api/v3/command",
|
|
||||||
payload={"name": "DownloadRelease", "guid": guid, "indexerId": indexer_id},
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -9,9 +9,6 @@ class SonarrClient(ApiClient):
|
|||||||
async def get_series_by_tvdb_id(self, tvdb_id: int) -> Optional[Dict[str, Any]]:
|
async def get_series_by_tvdb_id(self, tvdb_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/series", params={"tvdbId": tvdb_id})
|
return await self.get("/api/v3/series", params={"tvdbId": tvdb_id})
|
||||||
|
|
||||||
async def get_series(self, series_id: int) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.get(f"/api/v3/series/{series_id}")
|
|
||||||
|
|
||||||
async def get_root_folders(self) -> Optional[Dict[str, Any]]:
|
async def get_root_folders(self) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/rootfolder")
|
return await self.get("/api/v3/rootfolder")
|
||||||
|
|
||||||
@@ -21,9 +18,6 @@ class SonarrClient(ApiClient):
|
|||||||
async def get_queue(self, series_id: int) -> Optional[Dict[str, Any]]:
|
async def get_queue(self, series_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/queue", params={"seriesId": series_id})
|
return await self.get("/api/v3/queue", params={"seriesId": series_id})
|
||||||
|
|
||||||
async def get_indexers(self) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.get("/api/v3/indexer")
|
|
||||||
|
|
||||||
async def get_episodes(self, series_id: int) -> Optional[Dict[str, Any]]:
|
async def get_episodes(self, series_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/episode", params={"seriesId": series_id})
|
return await self.get("/api/v3/episode", params={"seriesId": series_id})
|
||||||
|
|
||||||
@@ -54,17 +48,5 @@ class SonarrClient(ApiClient):
|
|||||||
payload["title"] = title
|
payload["title"] = title
|
||||||
return await self.post("/api/v3/series", payload=payload)
|
return await self.post("/api/v3/series", payload=payload)
|
||||||
|
|
||||||
async def update_series(self, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.put("/api/v3/series", payload=payload)
|
|
||||||
|
|
||||||
async def grab_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
async def grab_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.post("/api/v3/release", payload={"guid": guid, "indexerId": indexer_id})
|
return await self.post("/api/v3/release", payload={"guid": guid, "indexerId": indexer_id})
|
||||||
|
|
||||||
async def push_release(self, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.post("/api/v3/release/push", payload=payload)
|
|
||||||
|
|
||||||
async def download_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.post(
|
|
||||||
"/api/v3/command",
|
|
||||||
payload={"name": "DownloadRelease", "guid": guid, "indexerId": indexer_id},
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ from typing import Optional
|
|||||||
from pydantic import AliasChoices, Field
|
from pydantic import AliasChoices, Field
|
||||||
from pydantic_settings import BaseSettings, SettingsConfigDict
|
from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||||
|
|
||||||
from .build_info import BUILD_NUMBER, CHANGELOG
|
|
||||||
|
|
||||||
class Settings(BaseSettings):
|
class Settings(BaseSettings):
|
||||||
model_config = SettingsConfigDict(env_prefix="")
|
model_config = SettingsConfigDict(env_prefix="")
|
||||||
@@ -39,17 +38,6 @@ class Settings(BaseSettings):
|
|||||||
artwork_cache_mode: str = Field(
|
artwork_cache_mode: str = Field(
|
||||||
default="remote", validation_alias=AliasChoices("ARTWORK_CACHE_MODE")
|
default="remote", validation_alias=AliasChoices("ARTWORK_CACHE_MODE")
|
||||||
)
|
)
|
||||||
site_build_number: Optional[str] = Field(default=BUILD_NUMBER)
|
|
||||||
site_banner_enabled: bool = Field(
|
|
||||||
default=False, validation_alias=AliasChoices("SITE_BANNER_ENABLED")
|
|
||||||
)
|
|
||||||
site_banner_message: Optional[str] = Field(
|
|
||||||
default=None, validation_alias=AliasChoices("SITE_BANNER_MESSAGE")
|
|
||||||
)
|
|
||||||
site_banner_tone: str = Field(
|
|
||||||
default="info", validation_alias=AliasChoices("SITE_BANNER_TONE")
|
|
||||||
)
|
|
||||||
site_changelog: Optional[str] = Field(default=CHANGELOG)
|
|
||||||
|
|
||||||
jellyseerr_base_url: Optional[str] = Field(
|
jellyseerr_base_url: Optional[str] = Field(
|
||||||
default=None, validation_alias=AliasChoices("JELLYSEERR_URL", "JELLYSEERR_BASE_URL")
|
default=None, validation_alias=AliasChoices("JELLYSEERR_URL", "JELLYSEERR_BASE_URL")
|
||||||
@@ -82,10 +70,6 @@ class Settings(BaseSettings):
|
|||||||
sonarr_root_folder: Optional[str] = Field(
|
sonarr_root_folder: Optional[str] = Field(
|
||||||
default=None, validation_alias=AliasChoices("SONARR_ROOT_FOLDER")
|
default=None, validation_alias=AliasChoices("SONARR_ROOT_FOLDER")
|
||||||
)
|
)
|
||||||
sonarr_qbittorrent_category: Optional[str] = Field(
|
|
||||||
default="sonarr",
|
|
||||||
validation_alias=AliasChoices("SONARR_QBITTORRENT_CATEGORY"),
|
|
||||||
)
|
|
||||||
|
|
||||||
radarr_base_url: Optional[str] = Field(
|
radarr_base_url: Optional[str] = Field(
|
||||||
default=None, validation_alias=AliasChoices("RADARR_URL", "RADARR_BASE_URL")
|
default=None, validation_alias=AliasChoices("RADARR_URL", "RADARR_BASE_URL")
|
||||||
@@ -99,10 +83,6 @@ class Settings(BaseSettings):
|
|||||||
radarr_root_folder: Optional[str] = Field(
|
radarr_root_folder: Optional[str] = Field(
|
||||||
default=None, validation_alias=AliasChoices("RADARR_ROOT_FOLDER")
|
default=None, validation_alias=AliasChoices("RADARR_ROOT_FOLDER")
|
||||||
)
|
)
|
||||||
radarr_qbittorrent_category: Optional[str] = Field(
|
|
||||||
default="radarr",
|
|
||||||
validation_alias=AliasChoices("RADARR_QBITTORRENT_CATEGORY"),
|
|
||||||
)
|
|
||||||
|
|
||||||
prowlarr_base_url: Optional[str] = Field(
|
prowlarr_base_url: Optional[str] = Field(
|
||||||
default=None, validation_alias=AliasChoices("PROWLARR_URL", "PROWLARR_BASE_URL")
|
default=None, validation_alias=AliasChoices("PROWLARR_URL", "PROWLARR_BASE_URL")
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -18,7 +18,6 @@ from .routers.images import router as images_router
|
|||||||
from .routers.branding import router as branding_router
|
from .routers.branding import router as branding_router
|
||||||
from .routers.status import router as status_router
|
from .routers.status import router as status_router
|
||||||
from .routers.feedback import router as feedback_router
|
from .routers.feedback import router as feedback_router
|
||||||
from .routers.site import router as site_router
|
|
||||||
from .services.jellyfin_sync import run_daily_jellyfin_sync
|
from .services.jellyfin_sync import run_daily_jellyfin_sync
|
||||||
from .logging_config import configure_logging
|
from .logging_config import configure_logging
|
||||||
from .runtime import get_runtime_settings
|
from .runtime import get_runtime_settings
|
||||||
@@ -57,4 +56,3 @@ app.include_router(images_router)
|
|||||||
app.include_router(branding_router)
|
app.include_router(branding_router)
|
||||||
app.include_router(status_router)
|
app.include_router(status_router)
|
||||||
app.include_router(feedback_router)
|
app.include_router(feedback_router)
|
||||||
app.include_router(site_router)
|
|
||||||
|
|||||||
@@ -1,31 +1,18 @@
|
|||||||
from typing import Any, Dict, List, Optional
|
from typing import Any, Dict, List
|
||||||
from datetime import datetime, timedelta, timezone
|
|
||||||
import ipaddress
|
|
||||||
import os
|
import os
|
||||||
from urllib.parse import urlparse, urlunparse
|
|
||||||
|
|
||||||
from fastapi import APIRouter, HTTPException, Depends, UploadFile, File
|
from fastapi import APIRouter, HTTPException, Depends, UploadFile, File
|
||||||
|
|
||||||
from ..auth import require_admin, get_current_user
|
from ..auth import require_admin
|
||||||
from ..config import settings as env_settings
|
from ..config import settings as env_settings
|
||||||
from ..db import (
|
from ..db import (
|
||||||
delete_setting,
|
delete_setting,
|
||||||
get_all_users,
|
get_all_users,
|
||||||
get_cached_requests,
|
|
||||||
get_cached_requests_count,
|
|
||||||
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_id,
|
|
||||||
get_user_by_username,
|
get_user_by_username,
|
||||||
get_user_request_stats,
|
|
||||||
create_user_if_missing,
|
|
||||||
set_user_jellyseerr_id,
|
|
||||||
set_setting,
|
set_setting,
|
||||||
set_user_blocked,
|
set_user_blocked,
|
||||||
set_user_auto_search_enabled,
|
|
||||||
set_auto_search_enabled_for_non_admin_users,
|
|
||||||
set_user_password,
|
set_user_password,
|
||||||
set_user_role,
|
set_user_role,
|
||||||
run_integrity_check,
|
run_integrity_check,
|
||||||
@@ -33,9 +20,6 @@ from ..db import (
|
|||||||
clear_requests_cache,
|
clear_requests_cache,
|
||||||
clear_history,
|
clear_history,
|
||||||
cleanup_history,
|
cleanup_history,
|
||||||
update_request_cache_title,
|
|
||||||
repair_request_cache_titles,
|
|
||||||
delete_non_admin_users,
|
|
||||||
)
|
)
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
from ..clients.sonarr import SonarrClient
|
from ..clients.sonarr import SonarrClient
|
||||||
@@ -43,14 +27,6 @@ from ..clients.radarr import RadarrClient
|
|||||||
from ..clients.jellyfin import JellyfinClient
|
from ..clients.jellyfin import JellyfinClient
|
||||||
from ..clients.jellyseerr import JellyseerrClient
|
from ..clients.jellyseerr import JellyseerrClient
|
||||||
from ..services.jellyfin_sync import sync_jellyfin_users
|
from ..services.jellyfin_sync import sync_jellyfin_users
|
||||||
from ..services.user_cache import (
|
|
||||||
build_jellyseerr_candidate_map,
|
|
||||||
get_cached_jellyfin_users,
|
|
||||||
get_cached_jellyseerr_users,
|
|
||||||
match_jellyseerr_user_id,
|
|
||||||
save_jellyfin_users_cache,
|
|
||||||
save_jellyseerr_users_cache,
|
|
||||||
)
|
|
||||||
import logging
|
import logging
|
||||||
from ..logging_config import configure_logging
|
from ..logging_config import configure_logging
|
||||||
from ..routers import requests as requests_router
|
from ..routers import requests as requests_router
|
||||||
@@ -68,16 +44,6 @@ SENSITIVE_KEYS = {
|
|||||||
"qbittorrent_password",
|
"qbittorrent_password",
|
||||||
}
|
}
|
||||||
|
|
||||||
URL_SETTING_KEYS = {
|
|
||||||
"jellyseerr_base_url",
|
|
||||||
"jellyfin_base_url",
|
|
||||||
"jellyfin_public_url",
|
|
||||||
"sonarr_base_url",
|
|
||||||
"radarr_base_url",
|
|
||||||
"prowlarr_base_url",
|
|
||||||
"qbittorrent_base_url",
|
|
||||||
}
|
|
||||||
|
|
||||||
SETTING_KEYS: List[str] = [
|
SETTING_KEYS: List[str] = [
|
||||||
"jellyseerr_base_url",
|
"jellyseerr_base_url",
|
||||||
"jellyseerr_api_key",
|
"jellyseerr_api_key",
|
||||||
@@ -90,12 +56,10 @@ SETTING_KEYS: List[str] = [
|
|||||||
"sonarr_api_key",
|
"sonarr_api_key",
|
||||||
"sonarr_quality_profile_id",
|
"sonarr_quality_profile_id",
|
||||||
"sonarr_root_folder",
|
"sonarr_root_folder",
|
||||||
"sonarr_qbittorrent_category",
|
|
||||||
"radarr_base_url",
|
"radarr_base_url",
|
||||||
"radarr_api_key",
|
"radarr_api_key",
|
||||||
"radarr_quality_profile_id",
|
"radarr_quality_profile_id",
|
||||||
"radarr_root_folder",
|
"radarr_root_folder",
|
||||||
"radarr_qbittorrent_category",
|
|
||||||
"prowlarr_base_url",
|
"prowlarr_base_url",
|
||||||
"prowlarr_api_key",
|
"prowlarr_api_key",
|
||||||
"qbittorrent_base_url",
|
"qbittorrent_base_url",
|
||||||
@@ -110,60 +74,8 @@ SETTING_KEYS: List[str] = [
|
|||||||
"requests_cleanup_time",
|
"requests_cleanup_time",
|
||||||
"requests_cleanup_days",
|
"requests_cleanup_days",
|
||||||
"requests_data_source",
|
"requests_data_source",
|
||||||
"site_banner_enabled",
|
|
||||||
"site_banner_message",
|
|
||||||
"site_banner_tone",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
def _normalize_username(value: str) -> str:
|
|
||||||
normalized = value.strip().lower()
|
|
||||||
if "@" in normalized:
|
|
||||||
normalized = normalized.split("@", 1)[0]
|
|
||||||
return normalized
|
|
||||||
|
|
||||||
|
|
||||||
def _is_ip_host(host: str) -> bool:
|
|
||||||
try:
|
|
||||||
ipaddress.ip_address(host)
|
|
||||||
return True
|
|
||||||
except ValueError:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def _normalize_service_url(value: str) -> str:
|
|
||||||
raw = value.strip()
|
|
||||||
if not raw:
|
|
||||||
raise ValueError("URL cannot be empty.")
|
|
||||||
|
|
||||||
candidate = raw
|
|
||||||
if "://" not in candidate:
|
|
||||||
authority = candidate.split("/", 1)[0].strip()
|
|
||||||
if authority.startswith("["):
|
|
||||||
closing = authority.find("]")
|
|
||||||
host = authority[1:closing] if closing > 0 else authority.strip("[]")
|
|
||||||
else:
|
|
||||||
host = authority.split(":", 1)[0]
|
|
||||||
host = host.strip().lower()
|
|
||||||
default_scheme = "http" if host in {"localhost"} or _is_ip_host(host) or "." not in host else "https"
|
|
||||||
candidate = f"{default_scheme}://{candidate}"
|
|
||||||
|
|
||||||
parsed = urlparse(candidate)
|
|
||||||
if parsed.scheme not in {"http", "https"}:
|
|
||||||
raise ValueError("URL must use http:// or https://.")
|
|
||||||
if not parsed.netloc:
|
|
||||||
raise ValueError("URL must include a host.")
|
|
||||||
if parsed.query or parsed.fragment:
|
|
||||||
raise ValueError("URL must not include query params or fragments.")
|
|
||||||
if not parsed.hostname:
|
|
||||||
raise ValueError("URL must include a valid host.")
|
|
||||||
|
|
||||||
normalized_path = parsed.path.rstrip("/")
|
|
||||||
normalized = parsed._replace(path=normalized_path, params="", query="", fragment="")
|
|
||||||
result = urlunparse(normalized).rstrip("/")
|
|
||||||
if not result:
|
|
||||||
raise ValueError("URL is invalid.")
|
|
||||||
return result
|
|
||||||
|
|
||||||
def _normalize_root_folders(folders: Any) -> List[Dict[str, Any]]:
|
def _normalize_root_folders(folders: Any) -> List[Dict[str, Any]]:
|
||||||
if not isinstance(folders, list):
|
if not isinstance(folders, list):
|
||||||
return []
|
return []
|
||||||
@@ -179,38 +91,6 @@ 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 []
|
||||||
@@ -260,14 +140,7 @@ async def update_settings(payload: Dict[str, Any]) -> Dict[str, Any]:
|
|||||||
delete_setting(key)
|
delete_setting(key)
|
||||||
updates += 1
|
updates += 1
|
||||||
continue
|
continue
|
||||||
value_to_store = str(value).strip() if isinstance(value, str) else str(value)
|
set_setting(key, str(value))
|
||||||
if key in URL_SETTING_KEYS and value_to_store:
|
|
||||||
try:
|
|
||||||
value_to_store = _normalize_service_url(value_to_store)
|
|
||||||
except ValueError as exc:
|
|
||||||
friendly_key = key.replace("_", " ")
|
|
||||||
raise HTTPException(status_code=400, detail=f"{friendly_key}: {exc}") from exc
|
|
||||||
set_setting(key, value_to_store)
|
|
||||||
updates += 1
|
updates += 1
|
||||||
if key in {"log_level", "log_file"}:
|
if key in {"log_level", "log_file"}:
|
||||||
touched_logging = True
|
touched_logging = True
|
||||||
@@ -307,9 +180,6 @@ async def radarr_options() -> Dict[str, Any]:
|
|||||||
|
|
||||||
@router.get("/jellyfin/users")
|
@router.get("/jellyfin/users")
|
||||||
async def jellyfin_users() -> Dict[str, Any]:
|
async def jellyfin_users() -> Dict[str, Any]:
|
||||||
cached = get_cached_jellyfin_users()
|
|
||||||
if cached is not None:
|
|
||||||
return {"users": cached}
|
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
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():
|
||||||
@@ -317,7 +187,18 @@ async def jellyfin_users() -> Dict[str, Any]:
|
|||||||
users = await client.get_users()
|
users = await client.get_users()
|
||||||
if not isinstance(users, list):
|
if not isinstance(users, list):
|
||||||
return {"users": []}
|
return {"users": []}
|
||||||
results = save_jellyfin_users_cache(users)
|
results = []
|
||||||
|
for user in users:
|
||||||
|
if not isinstance(user, dict):
|
||||||
|
continue
|
||||||
|
results.append(
|
||||||
|
{
|
||||||
|
"id": user.get("Id"),
|
||||||
|
"name": user.get("Name"),
|
||||||
|
"hasPassword": user.get("HasPassword"),
|
||||||
|
"lastLoginDate": user.get("LastLoginDate"),
|
||||||
|
}
|
||||||
|
)
|
||||||
return {"users": results}
|
return {"users": results}
|
||||||
|
|
||||||
|
|
||||||
@@ -326,106 +207,6 @@ async def jellyfin_users_sync() -> Dict[str, Any]:
|
|||||||
imported = await sync_jellyfin_users()
|
imported = await sync_jellyfin_users()
|
||||||
return {"status": "ok", "imported": imported}
|
return {"status": "ok", "imported": imported}
|
||||||
|
|
||||||
async def _fetch_all_jellyseerr_users(
|
|
||||||
client: JellyseerrClient, use_cache: bool = True
|
|
||||||
) -> List[Dict[str, Any]]:
|
|
||||||
if use_cache:
|
|
||||||
cached = get_cached_jellyseerr_users()
|
|
||||||
if cached is not None:
|
|
||||||
return cached
|
|
||||||
users: List[Dict[str, Any]] = []
|
|
||||||
take = 100
|
|
||||||
skip = 0
|
|
||||||
while True:
|
|
||||||
payload = await client.get_users(take=take, skip=skip)
|
|
||||||
if not payload:
|
|
||||||
break
|
|
||||||
if isinstance(payload, list):
|
|
||||||
batch = payload
|
|
||||||
elif isinstance(payload, dict):
|
|
||||||
batch = payload.get("results") or payload.get("users") or payload.get("data") or payload.get("items")
|
|
||||||
else:
|
|
||||||
batch = None
|
|
||||||
if not isinstance(batch, list) or not batch:
|
|
||||||
break
|
|
||||||
users.extend([user for user in batch if isinstance(user, dict)])
|
|
||||||
if len(batch) < take:
|
|
||||||
break
|
|
||||||
skip += take
|
|
||||||
if users:
|
|
||||||
return save_jellyseerr_users_cache(users)
|
|
||||||
return users
|
|
||||||
|
|
||||||
@router.post("/jellyseerr/users/sync")
|
|
||||||
async def jellyseerr_users_sync() -> Dict[str, Any]:
|
|
||||||
runtime = get_runtime_settings()
|
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
|
||||||
if not client.configured():
|
|
||||||
raise HTTPException(status_code=400, detail="Jellyseerr not configured")
|
|
||||||
jellyseerr_users = await _fetch_all_jellyseerr_users(client, use_cache=False)
|
|
||||||
if not jellyseerr_users:
|
|
||||||
return {"status": "ok", "matched": 0, "skipped": 0, "total": 0}
|
|
||||||
|
|
||||||
candidate_to_id = build_jellyseerr_candidate_map(jellyseerr_users)
|
|
||||||
|
|
||||||
updated = 0
|
|
||||||
skipped = 0
|
|
||||||
users = get_all_users()
|
|
||||||
for user in users:
|
|
||||||
if user.get("jellyseerr_user_id") is not None:
|
|
||||||
skipped += 1
|
|
||||||
continue
|
|
||||||
username = user.get("username") or ""
|
|
||||||
matched_id = match_jellyseerr_user_id(username, candidate_to_id)
|
|
||||||
if matched_id is not None:
|
|
||||||
set_user_jellyseerr_id(username, matched_id)
|
|
||||||
updated += 1
|
|
||||||
else:
|
|
||||||
skipped += 1
|
|
||||||
|
|
||||||
return {"status": "ok", "matched": updated, "skipped": skipped, "total": len(users)}
|
|
||||||
|
|
||||||
def _pick_jellyseerr_username(user: Dict[str, Any]) -> Optional[str]:
|
|
||||||
for key in ("email", "username", "displayName", "name"):
|
|
||||||
value = user.get(key)
|
|
||||||
if isinstance(value, str) and value.strip():
|
|
||||||
return value.strip()
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/jellyseerr/users/resync")
|
|
||||||
async def jellyseerr_users_resync() -> Dict[str, Any]:
|
|
||||||
runtime = get_runtime_settings()
|
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
|
||||||
if not client.configured():
|
|
||||||
raise HTTPException(status_code=400, detail="Jellyseerr not configured")
|
|
||||||
jellyseerr_users = await _fetch_all_jellyseerr_users(client, use_cache=False)
|
|
||||||
if not jellyseerr_users:
|
|
||||||
return {"status": "ok", "imported": 0, "cleared": 0}
|
|
||||||
|
|
||||||
cleared = delete_non_admin_users()
|
|
||||||
imported = 0
|
|
||||||
for user in jellyseerr_users:
|
|
||||||
user_id = user.get("id") or user.get("userId") or user.get("Id")
|
|
||||||
try:
|
|
||||||
user_id = int(user_id)
|
|
||||||
except (TypeError, ValueError):
|
|
||||||
continue
|
|
||||||
username = _pick_jellyseerr_username(user)
|
|
||||||
if not username:
|
|
||||||
continue
|
|
||||||
created = create_user_if_missing(
|
|
||||||
username,
|
|
||||||
"jellyseerr-user",
|
|
||||||
role="user",
|
|
||||||
auth_provider="jellyseerr",
|
|
||||||
jellyseerr_user_id=user_id,
|
|
||||||
)
|
|
||||||
if created:
|
|
||||||
imported += 1
|
|
||||||
else:
|
|
||||||
set_user_jellyseerr_id(username, user_id)
|
|
||||||
return {"status": "ok", "imported": imported, "cleared": cleared}
|
|
||||||
|
|
||||||
@router.post("/requests/sync")
|
@router.post("/requests/sync")
|
||||||
async def requests_sync() -> Dict[str, Any]:
|
async def requests_sync() -> Dict[str, Any]:
|
||||||
@@ -454,12 +235,10 @@ async def requests_sync_delta() -> Dict[str, Any]:
|
|||||||
|
|
||||||
|
|
||||||
@router.post("/requests/artwork/prefetch")
|
@router.post("/requests/artwork/prefetch")
|
||||||
async def requests_artwork_prefetch(only_missing: bool = False) -> Dict[str, Any]:
|
async def requests_artwork_prefetch() -> 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_base_url, runtime.jellyseerr_api_key
|
||||||
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}
|
||||||
@@ -469,25 +248,6 @@ async def requests_artwork_prefetch(only_missing: bool = False) -> 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]:
|
||||||
@@ -514,48 +274,7 @@ 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()
|
return {"rows": get_request_cache_overview(limit)}
|
||||||
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)
|
|
||||||
return {"rows": rows}
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/requests/all")
|
|
||||||
async def requests_all(
|
|
||||||
take: int = 50,
|
|
||||||
skip: int = 0,
|
|
||||||
days: Optional[int] = None,
|
|
||||||
user: Dict[str, str] = Depends(get_current_user),
|
|
||||||
) -> Dict[str, Any]:
|
|
||||||
if user.get("role") != "admin":
|
|
||||||
raise HTTPException(status_code=403, detail="Forbidden")
|
|
||||||
take = max(1, min(int(take or 50), 200))
|
|
||||||
skip = max(0, int(skip or 0))
|
|
||||||
since_iso = None
|
|
||||||
if days is not None and int(days) > 0:
|
|
||||||
since_iso = (datetime.now(timezone.utc) - timedelta(days=int(days))).isoformat()
|
|
||||||
rows = get_cached_requests(limit=take, offset=skip, since_iso=since_iso)
|
|
||||||
total = get_cached_requests_count(since_iso=since_iso)
|
|
||||||
results = []
|
|
||||||
for row in rows:
|
|
||||||
status = row.get("status")
|
|
||||||
results.append(
|
|
||||||
{
|
|
||||||
"id": row.get("request_id"),
|
|
||||||
"title": row.get("title"),
|
|
||||||
"year": row.get("year"),
|
|
||||||
"type": row.get("media_type"),
|
|
||||||
"status": status,
|
|
||||||
"statusLabel": requests_router._status_label(status),
|
|
||||||
"requestedBy": row.get("requested_by"),
|
|
||||||
"createdAt": row.get("created_at"),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
return {"results": results, "total": total, "take": take, "skip": skip}
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/branding/logo")
|
@router.post("/branding/logo")
|
||||||
@@ -607,39 +326,9 @@ async def clear_logs() -> Dict[str, Any]:
|
|||||||
|
|
||||||
@router.get("/users")
|
@router.get("/users")
|
||||||
async def list_users() -> Dict[str, Any]:
|
async def list_users() -> Dict[str, Any]:
|
||||||
users = [user for user in get_all_users() if user.get("role") == "admin" or user.get("auth_provider") == "jellyseerr"]
|
users = get_all_users()
|
||||||
return {"users": users}
|
return {"users": users}
|
||||||
|
|
||||||
@router.get("/users/summary")
|
|
||||||
async def list_users_summary() -> Dict[str, Any]:
|
|
||||||
users = [user for user in get_all_users() if user.get("role") == "admin" or user.get("auth_provider") == "jellyseerr"]
|
|
||||||
results: list[Dict[str, Any]] = []
|
|
||||||
for user in users:
|
|
||||||
username = user.get("username") or ""
|
|
||||||
username_norm = _normalize_username(username) if username else ""
|
|
||||||
stats = get_user_request_stats(username_norm, user.get("jellyseerr_user_id"))
|
|
||||||
results.append({**user, "stats": stats})
|
|
||||||
return {"users": results}
|
|
||||||
|
|
||||||
@router.get("/users/{username}")
|
|
||||||
async def get_user_summary(username: str) -> Dict[str, Any]:
|
|
||||||
user = get_user_by_username(username)
|
|
||||||
if not user:
|
|
||||||
raise HTTPException(status_code=404, detail="User not found")
|
|
||||||
username_norm = _normalize_username(user.get("username") or "")
|
|
||||||
stats = get_user_request_stats(username_norm, user.get("jellyseerr_user_id"))
|
|
||||||
return {"user": user, "stats": stats}
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/users/id/{user_id}")
|
|
||||||
async def get_user_summary_by_id(user_id: int) -> Dict[str, Any]:
|
|
||||||
user = get_user_by_id(user_id)
|
|
||||||
if not user:
|
|
||||||
raise HTTPException(status_code=404, detail="User not found")
|
|
||||||
username_norm = _normalize_username(user.get("username") or "")
|
|
||||||
stats = get_user_request_stats(username_norm, user.get("jellyseerr_user_id"))
|
|
||||||
return {"user": user, "stats": stats}
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/users/{username}/block")
|
@router.post("/users/{username}/block")
|
||||||
async def block_user(username: str) -> Dict[str, Any]:
|
async def block_user(username: str) -> Dict[str, Any]:
|
||||||
@@ -662,32 +351,6 @@ async def update_user_role(username: str, payload: Dict[str, Any]) -> Dict[str,
|
|||||||
return {"status": "ok", "username": username, "role": role}
|
return {"status": "ok", "username": username, "role": role}
|
||||||
|
|
||||||
|
|
||||||
@router.post("/users/{username}/auto-search")
|
|
||||||
async def update_user_auto_search(username: str, payload: Dict[str, Any]) -> Dict[str, Any]:
|
|
||||||
enabled = payload.get("enabled") if isinstance(payload, dict) else None
|
|
||||||
if not isinstance(enabled, bool):
|
|
||||||
raise HTTPException(status_code=400, detail="enabled must be true or false")
|
|
||||||
user = get_user_by_username(username)
|
|
||||||
if not user:
|
|
||||||
raise HTTPException(status_code=404, detail="User not found")
|
|
||||||
set_user_auto_search_enabled(username, enabled)
|
|
||||||
return {"status": "ok", "username": username, "auto_search_enabled": enabled}
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/users/auto-search/bulk")
|
|
||||||
async def update_users_auto_search_bulk(payload: Dict[str, Any]) -> Dict[str, Any]:
|
|
||||||
enabled = payload.get("enabled") if isinstance(payload, dict) else None
|
|
||||||
if not isinstance(enabled, bool):
|
|
||||||
raise HTTPException(status_code=400, detail="enabled must be true or false")
|
|
||||||
updated = set_auto_search_enabled_for_non_admin_users(enabled)
|
|
||||||
return {
|
|
||||||
"status": "ok",
|
|
||||||
"enabled": enabled,
|
|
||||||
"updated": updated,
|
|
||||||
"scope": "non-admin-users",
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/users/{username}/password")
|
@router.post("/users/{username}/password")
|
||||||
async def update_user_password(username: str, payload: Dict[str, Any]) -> Dict[str, Any]:
|
async def update_user_password(username: str, payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
new_password = payload.get("password") if isinstance(payload, dict) else None
|
new_password = payload.get("password") if isinstance(payload, dict) else None
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
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
|
||||||
|
|
||||||
@@ -8,101 +6,22 @@ from ..db import (
|
|||||||
create_user_if_missing,
|
create_user_if_missing,
|
||||||
set_last_login,
|
set_last_login,
|
||||||
get_user_by_username,
|
get_user_by_username,
|
||||||
get_users_by_username_ci,
|
|
||||||
set_user_password,
|
set_user_password,
|
||||||
set_jellyfin_auth_cache,
|
|
||||||
set_user_jellyseerr_id,
|
|
||||||
get_user_activity,
|
|
||||||
get_user_activity_summary,
|
|
||||||
get_user_request_stats,
|
|
||||||
get_global_request_leader,
|
|
||||||
get_global_request_total,
|
|
||||||
)
|
)
|
||||||
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, verify_password
|
from ..security import create_access_token
|
||||||
from ..auth import get_current_user
|
from ..auth import get_current_user
|
||||||
from ..services.user_cache import (
|
|
||||||
build_jellyseerr_candidate_map,
|
|
||||||
get_cached_jellyseerr_users,
|
|
||||||
match_jellyseerr_user_id,
|
|
||||||
save_jellyfin_users_cache,
|
|
||||||
)
|
|
||||||
|
|
||||||
router = APIRouter(prefix="/auth", tags=["auth"])
|
router = APIRouter(prefix="/auth", tags=["auth"])
|
||||||
|
|
||||||
|
|
||||||
def _normalize_username(value: str) -> str:
|
|
||||||
normalized = value.strip().lower()
|
|
||||||
if "@" in normalized:
|
|
||||||
normalized = normalized.split("@", 1)[0]
|
|
||||||
return normalized
|
|
||||||
|
|
||||||
|
|
||||||
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)
|
|
||||||
|
|
||||||
def _extract_jellyseerr_user_id(response: dict) -> int | None:
|
|
||||||
if not isinstance(response, dict):
|
|
||||||
return None
|
|
||||||
candidate = response
|
|
||||||
if isinstance(response.get("user"), dict):
|
|
||||||
candidate = response.get("user")
|
|
||||||
for key in ("id", "userId", "Id"):
|
|
||||||
value = candidate.get(key) if isinstance(candidate, dict) else None
|
|
||||||
if value is None:
|
|
||||||
continue
|
|
||||||
try:
|
|
||||||
return int(value)
|
|
||||||
except (TypeError, ValueError):
|
|
||||||
continue
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/login")
|
@router.post("/login")
|
||||||
async def login(form_data: OAuth2PasswordRequestForm = Depends()) -> dict:
|
async def login(form_data: OAuth2PasswordRequestForm = Depends()) -> dict:
|
||||||
# Provider placeholder passwords must never be accepted by the local-login endpoint.
|
|
||||||
if form_data.password in {"jellyfin-user", "jellyseerr-user"}:
|
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid credentials")
|
|
||||||
matching_users = get_users_by_username_ci(form_data.username)
|
|
||||||
has_external_match = any(
|
|
||||||
str(user.get("auth_provider") or "local").lower() != "local" for user in matching_users
|
|
||||||
)
|
|
||||||
if has_external_match:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_400_BAD_REQUEST,
|
|
||||||
detail="This account uses external sign-in. Use the external sign-in option.",
|
|
||||||
)
|
|
||||||
user = verify_user_password(form_data.username, form_data.password)
|
user = verify_user_password(form_data.username, form_data.password)
|
||||||
if not user:
|
if not user:
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid credentials")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid credentials")
|
||||||
if str(user.get("auth_provider") or "local").lower() != "local":
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_400_BAD_REQUEST,
|
|
||||||
detail="This account uses external sign-in. Use the external sign-in option.",
|
|
||||||
)
|
|
||||||
if user.get("is_blocked"):
|
if 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")
|
||||||
token = create_access_token(user["username"], user["role"])
|
token = create_access_token(user["username"], user["role"])
|
||||||
@@ -120,47 +39,30 @@ 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")
|
||||||
jellyseerr_users = get_cached_jellyseerr_users()
|
|
||||||
candidate_map = build_jellyseerr_candidate_map(jellyseerr_users or [])
|
|
||||||
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(username, password)
|
response = await client.authenticate_by_name(form_data.username, form_data.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(username, "jellyfin-user", role="user", auth_provider="jellyfin")
|
create_user_if_missing(form_data.username, "jellyfin-user", role="user", auth_provider="jellyfin")
|
||||||
user = get_user_by_username(username)
|
user = get_user_by_username(form_data.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:
|
||||||
users = await client.get_users()
|
users = await client.get_users()
|
||||||
if isinstance(users, list):
|
if isinstance(users, list):
|
||||||
save_jellyfin_users_cache(users)
|
for user in users:
|
||||||
for jellyfin_user in users:
|
if not isinstance(user, dict):
|
||||||
if not isinstance(jellyfin_user, dict):
|
|
||||||
continue
|
continue
|
||||||
name = jellyfin_user.get("Name")
|
name = user.get("Name")
|
||||||
if isinstance(name, str) and name:
|
if isinstance(name, str) and name:
|
||||||
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
|
||||||
set_jellyfin_auth_cache(username, password)
|
token = create_access_token(form_data.username, "user")
|
||||||
if user and user.get("jellyseerr_user_id") is None and candidate_map:
|
set_last_login(form_data.username)
|
||||||
matched_id = match_jellyseerr_user_id(username, candidate_map)
|
return {"access_token": token, "token_type": "bearer", "user": {"username": form_data.username, "role": "user"}}
|
||||||
if matched_id is not None:
|
|
||||||
set_user_jellyseerr_id(username, matched_id)
|
|
||||||
token = create_access_token(username, "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")
|
||||||
@@ -176,19 +78,10 @@ async def jellyseerr_login(form_data: OAuth2PasswordRequestForm = Depends()) ->
|
|||||||
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):
|
if not isinstance(response, dict):
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyseerr credentials")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyseerr credentials")
|
||||||
jellyseerr_user_id = _extract_jellyseerr_user_id(response)
|
create_user_if_missing(form_data.username, "jellyseerr-user", role="user", auth_provider="jellyseerr")
|
||||||
create_user_if_missing(
|
|
||||||
form_data.username,
|
|
||||||
"jellyseerr-user",
|
|
||||||
role="user",
|
|
||||||
auth_provider="jellyseerr",
|
|
||||||
jellyseerr_user_id=jellyseerr_user_id,
|
|
||||||
)
|
|
||||||
user = get_user_by_username(form_data.username)
|
user = get_user_by_username(form_data.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")
|
||||||
if jellyseerr_user_id is not None:
|
|
||||||
set_user_jellyseerr_id(form_data.username, jellyseerr_user_id)
|
|
||||||
token = create_access_token(form_data.username, "user")
|
token = create_access_token(form_data.username, "user")
|
||||||
set_last_login(form_data.username)
|
set_last_login(form_data.username)
|
||||||
return {"access_token": token, "token_type": "bearer", "user": {"username": form_data.username, "role": "user"}}
|
return {"access_token": token, "token_type": "bearer", "user": {"username": form_data.username, "role": "user"}}
|
||||||
@@ -199,32 +92,6 @@ async def me(current_user: dict = Depends(get_current_user)) -> dict:
|
|||||||
return current_user
|
return current_user
|
||||||
|
|
||||||
|
|
||||||
@router.get("/profile")
|
|
||||||
async def profile(current_user: dict = Depends(get_current_user)) -> dict:
|
|
||||||
username = current_user.get("username") or ""
|
|
||||||
username_norm = _normalize_username(username) if username else ""
|
|
||||||
stats = get_user_request_stats(username_norm, current_user.get("jellyseerr_user_id"))
|
|
||||||
global_total = get_global_request_total()
|
|
||||||
share = (stats.get("total", 0) / global_total) if global_total else 0
|
|
||||||
activity_summary = get_user_activity_summary(username) 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 {
|
|
||||||
"user": current_user,
|
|
||||||
"stats": stats_payload,
|
|
||||||
"activity": {
|
|
||||||
**activity_summary,
|
|
||||||
"recent": activity_recent,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/password")
|
@router.post("/password")
|
||||||
async def change_password(payload: dict, current_user: dict = Depends(get_current_user)) -> dict:
|
async def change_password(payload: dict, current_user: dict = Depends(get_current_user)) -> dict:
|
||||||
if current_user.get("auth_provider") != "local":
|
if current_user.get("auth_provider") != "local":
|
||||||
|
|||||||
@@ -11,10 +11,6 @@ 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:
|
||||||
@@ -45,18 +41,6 @@ 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)
|
||||||
@@ -81,32 +65,24 @@ 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:
|
||||||
logo_path, _ = _resolve_branding_paths()
|
if not os.path.exists(_LOGO_PATH):
|
||||||
if not os.path.exists(logo_path):
|
_ensure_default_branding()
|
||||||
|
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": "no-store"}
|
headers = {"Cache-Control": "public, max-age=300"}
|
||||||
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:
|
||||||
_, favicon_path = _resolve_branding_paths()
|
if not os.path.exists(_FAVICON_PATH):
|
||||||
if not os.path.exists(favicon_path):
|
_ensure_default_branding()
|
||||||
|
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": "no-store"}
|
headers = {"Cache-Control": "public, max-age=300"}
|
||||||
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,8 +1,6 @@
|
|||||||
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
|
||||||
@@ -13,7 +11,6 @@ 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:
|
||||||
@@ -22,35 +19,23 @@ 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]:
|
|
||||||
if not path or "://" in path or ".." in path:
|
|
||||||
return None
|
|
||||||
if not path.startswith("/"):
|
|
||||||
path = f"/{path}"
|
|
||||||
if size not in _ALLOWED_SIZES:
|
|
||||||
return None
|
|
||||||
cache_dir = os.path.join(os.getcwd(), "data", "artwork", "tmdb", size)
|
|
||||||
return os.path.join(cache_dir, _safe_filename(path))
|
|
||||||
|
|
||||||
|
|
||||||
def is_tmdb_cached(path: str, size: str) -> bool:
|
|
||||||
file_path = tmdb_cache_path(path, size)
|
|
||||||
return bool(file_path and os.path.exists(file_path))
|
|
||||||
|
|
||||||
|
|
||||||
async def cache_tmdb_image(path: str, size: str = "w342") -> bool:
|
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 False
|
||||||
|
if not path.startswith("/"):
|
||||||
|
path = f"/{path}"
|
||||||
|
if size not in _ALLOWED_SIZES:
|
||||||
|
return False
|
||||||
|
|
||||||
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":
|
||||||
return False
|
return False
|
||||||
|
|
||||||
file_path = tmdb_cache_path(path, size)
|
cache_dir = os.path.join(os.getcwd(), "data", "artwork", "tmdb", size)
|
||||||
if not file_path:
|
os.makedirs(cache_dir, exist_ok=True)
|
||||||
return False
|
file_path = os.path.join(cache_dir, _safe_filename(path))
|
||||||
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
|
||||||
|
|
||||||
@@ -79,10 +64,9 @@ 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)
|
||||||
|
|
||||||
file_path = tmdb_cache_path(path, size)
|
cache_dir = os.path.join(os.getcwd(), "data", "artwork", "tmdb", size)
|
||||||
if not file_path:
|
os.makedirs(cache_dir, exist_ok=True)
|
||||||
raise HTTPException(status_code=400, detail="Invalid image path")
|
file_path = os.path.join(cache_dir, _safe_filename(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"
|
||||||
@@ -93,8 +77,6 @@ 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)
|
||||||
logger.warning("TMDB cache miss after fetch: path=%s size=%s", path, size)
|
raise HTTPException(status_code=502, detail="Image cache failed")
|
||||||
except (httpx.HTTPError, OSError) as exc:
|
except httpx.HTTPError as exc:
|
||||||
logger.warning("TMDB cache failed: path=%s size=%s error=%s", path, size, exc)
|
raise HTTPException(status_code=502, detail=f"Image fetch failed: {exc}") from exc
|
||||||
|
|
||||||
return RedirectResponse(url=url)
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,39 +0,0 @@
|
|||||||
from typing import Any, Dict
|
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends
|
|
||||||
|
|
||||||
from ..auth import get_current_user
|
|
||||||
from ..runtime import get_runtime_settings
|
|
||||||
|
|
||||||
router = APIRouter(prefix="/site", tags=["site"])
|
|
||||||
|
|
||||||
_BANNER_TONES = {"info", "warning", "error", "maintenance"}
|
|
||||||
|
|
||||||
|
|
||||||
def _build_site_info(include_changelog: bool) -> Dict[str, Any]:
|
|
||||||
runtime = get_runtime_settings()
|
|
||||||
banner_message = (runtime.site_banner_message or "").strip()
|
|
||||||
tone = (runtime.site_banner_tone or "info").strip().lower()
|
|
||||||
if tone not in _BANNER_TONES:
|
|
||||||
tone = "info"
|
|
||||||
info = {
|
|
||||||
"buildNumber": (runtime.site_build_number or "").strip(),
|
|
||||||
"banner": {
|
|
||||||
"enabled": bool(runtime.site_banner_enabled and banner_message),
|
|
||||||
"message": banner_message,
|
|
||||||
"tone": tone,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
if include_changelog:
|
|
||||||
info["changelog"] = (runtime.site_changelog or "").strip()
|
|
||||||
return info
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/public")
|
|
||||||
async def site_public() -> Dict[str, Any]:
|
|
||||||
return _build_site_info(False)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/info")
|
|
||||||
async def site_info(user: Dict[str, Any] = Depends(get_current_user)) -> Dict[str, Any]:
|
|
||||||
return _build_site_info(True)
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
from typing import Any, Dict
|
from typing import Any, Dict
|
||||||
import httpx
|
import httpx
|
||||||
from fastapi import APIRouter, Depends, HTTPException
|
from fastapi import APIRouter, Depends
|
||||||
|
|
||||||
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,42 +93,3 @@ 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
|
|
||||||
|
|||||||
@@ -12,9 +12,7 @@ _INT_FIELDS = {
|
|||||||
}
|
}
|
||||||
_BOOL_FIELDS = {
|
_BOOL_FIELDS = {
|
||||||
"jellyfin_sync_to_arr",
|
"jellyfin_sync_to_arr",
|
||||||
"site_banner_enabled",
|
|
||||||
}
|
}
|
||||||
_SKIP_OVERRIDE_FIELDS = {"site_build_number", "site_changelog"}
|
|
||||||
|
|
||||||
|
|
||||||
def get_runtime_settings():
|
def get_runtime_settings():
|
||||||
@@ -23,8 +21,6 @@ def get_runtime_settings():
|
|||||||
for key, value in overrides.items():
|
for key, value in overrides.items():
|
||||||
if value is None:
|
if value is None:
|
||||||
continue
|
continue
|
||||||
if key in _SKIP_OVERRIDE_FIELDS:
|
|
||||||
continue
|
|
||||||
if key in _INT_FIELDS:
|
if key in _INT_FIELDS:
|
||||||
try:
|
try:
|
||||||
update[key] = int(value)
|
update[key] = int(value)
|
||||||
|
|||||||
@@ -3,14 +3,8 @@ import logging
|
|||||||
from fastapi import HTTPException
|
from fastapi import HTTPException
|
||||||
|
|
||||||
from ..clients.jellyfin import JellyfinClient
|
from ..clients.jellyfin import JellyfinClient
|
||||||
from ..db import create_user_if_missing, set_user_jellyseerr_id
|
from ..db import create_user_if_missing
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
from .user_cache import (
|
|
||||||
build_jellyseerr_candidate_map,
|
|
||||||
get_cached_jellyseerr_users,
|
|
||||||
match_jellyseerr_user_id,
|
|
||||||
save_jellyfin_users_cache,
|
|
||||||
)
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -23,9 +17,6 @@ async def sync_jellyfin_users() -> int:
|
|||||||
users = await client.get_users()
|
users = await client.get_users()
|
||||||
if not isinstance(users, list):
|
if not isinstance(users, list):
|
||||||
return 0
|
return 0
|
||||||
save_jellyfin_users_cache(users)
|
|
||||||
jellyseerr_users = get_cached_jellyseerr_users()
|
|
||||||
candidate_map = build_jellyseerr_candidate_map(jellyseerr_users or [])
|
|
||||||
imported = 0
|
imported = 0
|
||||||
for user in users:
|
for user in users:
|
||||||
if not isinstance(user, dict):
|
if not isinstance(user, dict):
|
||||||
@@ -33,18 +24,8 @@ async def sync_jellyfin_users() -> int:
|
|||||||
name = user.get("Name")
|
name = user.get("Name")
|
||||||
if not name:
|
if not name:
|
||||||
continue
|
continue
|
||||||
matched_id = match_jellyseerr_user_id(name, candidate_map) if candidate_map else None
|
if create_user_if_missing(name, "jellyfin-user", role="user", auth_provider="jellyfin"):
|
||||||
created = create_user_if_missing(
|
|
||||||
name,
|
|
||||||
"jellyfin-user",
|
|
||||||
role="user",
|
|
||||||
auth_provider="jellyfin",
|
|
||||||
jellyseerr_user_id=matched_id,
|
|
||||||
)
|
|
||||||
if created:
|
|
||||||
imported += 1
|
imported += 1
|
||||||
elif matched_id is not None:
|
|
||||||
set_user_jellyseerr_id(name, matched_id)
|
|
||||||
return imported
|
return imported
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -11,21 +11,9 @@ 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 (
|
from ..db import save_snapshot, get_request_cache_payload
|
||||||
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__)
|
|
||||||
|
|
||||||
JELLYFIN_SCAN_COOLDOWN_SECONDS = 300
|
|
||||||
_jellyfin_scan_key = "jellyfin_scan_last_at"
|
|
||||||
|
|
||||||
|
|
||||||
STATUS_LABELS = {
|
STATUS_LABELS = {
|
||||||
1: "Waiting for approval",
|
1: "Waiting for approval",
|
||||||
@@ -53,35 +41,6 @@ def _pick_first(value: Any) -> Optional[Dict[str, Any]]:
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
async def _maybe_refresh_jellyfin(snapshot: Snapshot) -> None:
|
|
||||||
if snapshot.state not in {NormalizedState.available, NormalizedState.completed}:
|
|
||||||
return
|
|
||||||
runtime = get_runtime_settings()
|
|
||||||
client = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
|
||||||
if not client.configured():
|
|
||||||
return
|
|
||||||
last_scan = get_setting(_jellyfin_scan_key)
|
|
||||||
if last_scan:
|
|
||||||
try:
|
|
||||||
parsed = datetime.fromisoformat(last_scan.replace("Z", "+00:00"))
|
|
||||||
if (datetime.now(timezone.utc) - parsed).total_seconds() < JELLYFIN_SCAN_COOLDOWN_SECONDS:
|
|
||||||
return
|
|
||||||
except ValueError:
|
|
||||||
pass
|
|
||||||
previous = await asyncio.to_thread(get_recent_snapshots, snapshot.request_id, 1)
|
|
||||||
if previous:
|
|
||||||
prev_state = previous[0].get("state")
|
|
||||||
if prev_state in {NormalizedState.available.value, NormalizedState.completed.value}:
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
await client.refresh_library()
|
|
||||||
except Exception as exc:
|
|
||||||
logger.warning("Jellyfin library refresh failed: %s", exc)
|
|
||||||
return
|
|
||||||
set_setting(_jellyfin_scan_key, datetime.now(timezone.utc).isoformat())
|
|
||||||
logger.info("Jellyfin library refresh triggered: request_id=%s", snapshot.request_id)
|
|
||||||
|
|
||||||
|
|
||||||
def _queue_records(queue: Any) -> List[Dict[str, Any]]:
|
def _queue_records(queue: Any) -> List[Dict[str, Any]]:
|
||||||
if isinstance(queue, dict):
|
if isinstance(queue, dict):
|
||||||
records = queue.get("records")
|
records = queue.get("records")
|
||||||
@@ -226,21 +185,7 @@ 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"))
|
||||||
@@ -248,15 +193,9 @@ 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 allow_remote and (jelly_request is None or mode == "always_js"):
|
if (jelly_request is None or mode == "always_js") and jellyseerr.configured():
|
||||||
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(
|
||||||
@@ -279,25 +218,17 @@ 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"
|
||||||
media = jelly_request.get("media", {}) if isinstance(jelly_request, dict) else {}
|
snapshot.title = jelly_request.get("media", {}).get("title", "Unknown")
|
||||||
if not isinstance(media, dict):
|
snapshot.year = jelly_request.get("media", {}).get("year")
|
||||||
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
|
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 {}
|
||||||
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 allow_remote:
|
if snapshot.title in {None, "", "Unknown"} and jellyseerr.configured():
|
||||||
tmdb_id = jelly_request.get("media", {}).get("tmdbId")
|
tmdb_id = jelly_request.get("media", {}).get("tmdbId")
|
||||||
if tmdb_id:
|
if tmdb_id:
|
||||||
try:
|
try:
|
||||||
@@ -450,6 +381,10 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
|
|
||||||
if arr_state is None:
|
if arr_state is None:
|
||||||
arr_state = "unknown"
|
arr_state = "unknown"
|
||||||
|
if arr_state == "missing" and media_status_code in {4}:
|
||||||
|
arr_state = "available"
|
||||||
|
elif arr_state == "missing" and media_status_code in {6}:
|
||||||
|
arr_state = "added"
|
||||||
|
|
||||||
timeline.append(TimelineHop(service="Sonarr/Radarr", status=arr_state, details=arr_details))
|
timeline.append(TimelineHop(service="Sonarr/Radarr", status=arr_state, details=arr_details))
|
||||||
|
|
||||||
@@ -589,7 +524,7 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
snapshot.state_reason = "Waiting for download to start in qBittorrent."
|
snapshot.state_reason = "Waiting for download to start in qBittorrent."
|
||||||
elif arr_state == "missing" and derived_approved:
|
elif arr_state == "missing" and derived_approved:
|
||||||
snapshot.state = NormalizedState.needs_add
|
snapshot.state = NormalizedState.needs_add
|
||||||
snapshot.state_reason = "Approved, but not yet added to Sonarr/Radarr."
|
snapshot.state_reason = "Approved, but not added to the library yet."
|
||||||
elif arr_state == "searching":
|
elif arr_state == "searching":
|
||||||
snapshot.state = NormalizedState.searching
|
snapshot.state = NormalizedState.searching
|
||||||
snapshot.state_reason = "Searching for a matching release."
|
snapshot.state_reason = "Searching for a matching release."
|
||||||
@@ -613,7 +548,7 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
actions.append(
|
actions.append(
|
||||||
ActionOption(
|
ActionOption(
|
||||||
id="readd_to_arr",
|
id="readd_to_arr",
|
||||||
label="Push to Sonarr/Radarr",
|
label="Add to the library queue (Sonarr/Radarr)",
|
||||||
risk="medium",
|
risk="medium",
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -669,6 +604,5 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
await _maybe_refresh_jellyfin(snapshot)
|
|
||||||
await asyncio.to_thread(save_snapshot, snapshot)
|
await asyncio.to_thread(save_snapshot, snapshot)
|
||||||
return snapshot
|
return snapshot
|
||||||
|
|||||||
@@ -1,144 +0,0 @@
|
|||||||
import json
|
|
||||||
import logging
|
|
||||||
from datetime import datetime, timezone, timedelta
|
|
||||||
from typing import Any, Dict, List, Optional
|
|
||||||
|
|
||||||
from ..db import get_setting, set_setting
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
JELLYSEERR_CACHE_KEY = "jellyseerr_users_cache"
|
|
||||||
JELLYSEERR_CACHE_AT_KEY = "jellyseerr_users_cached_at"
|
|
||||||
JELLYFIN_CACHE_KEY = "jellyfin_users_cache"
|
|
||||||
JELLYFIN_CACHE_AT_KEY = "jellyfin_users_cached_at"
|
|
||||||
|
|
||||||
|
|
||||||
def _now_iso() -> str:
|
|
||||||
return datetime.now(timezone.utc).isoformat()
|
|
||||||
|
|
||||||
|
|
||||||
def _parse_iso(value: Optional[str]) -> Optional[datetime]:
|
|
||||||
if not value:
|
|
||||||
return None
|
|
||||||
try:
|
|
||||||
parsed = datetime.fromisoformat(value)
|
|
||||||
except ValueError:
|
|
||||||
return None
|
|
||||||
if parsed.tzinfo is None:
|
|
||||||
parsed = parsed.replace(tzinfo=timezone.utc)
|
|
||||||
return parsed
|
|
||||||
|
|
||||||
|
|
||||||
def _cache_is_fresh(cached_at: Optional[str], max_age_minutes: int) -> bool:
|
|
||||||
parsed = _parse_iso(cached_at)
|
|
||||||
if not parsed:
|
|
||||||
return False
|
|
||||||
age = datetime.now(timezone.utc) - parsed
|
|
||||||
return age <= timedelta(minutes=max_age_minutes)
|
|
||||||
|
|
||||||
|
|
||||||
def _load_cached_users(
|
|
||||||
cache_key: str, cache_at_key: str, max_age_minutes: int
|
|
||||||
) -> Optional[List[Dict[str, Any]]]:
|
|
||||||
cached_at = get_setting(cache_at_key)
|
|
||||||
if not _cache_is_fresh(cached_at, max_age_minutes):
|
|
||||||
return None
|
|
||||||
raw = get_setting(cache_key)
|
|
||||||
if not raw:
|
|
||||||
return None
|
|
||||||
try:
|
|
||||||
data = json.loads(raw)
|
|
||||||
except (TypeError, json.JSONDecodeError):
|
|
||||||
return None
|
|
||||||
if isinstance(data, list):
|
|
||||||
return [item for item in data if isinstance(item, dict)]
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _save_cached_users(cache_key: str, cache_at_key: str, users: List[Dict[str, Any]]) -> None:
|
|
||||||
payload = json.dumps(users, ensure_ascii=True)
|
|
||||||
set_setting(cache_key, payload)
|
|
||||||
set_setting(cache_at_key, _now_iso())
|
|
||||||
|
|
||||||
|
|
||||||
def _normalized_handles(value: Any) -> List[str]:
|
|
||||||
if not isinstance(value, str):
|
|
||||||
return []
|
|
||||||
normalized = value.strip().lower()
|
|
||||||
if not normalized:
|
|
||||||
return []
|
|
||||||
handles = [normalized]
|
|
||||||
if "@" in normalized:
|
|
||||||
handles.append(normalized.split("@", 1)[0])
|
|
||||||
return list(dict.fromkeys(handles))
|
|
||||||
|
|
||||||
|
|
||||||
def build_jellyseerr_candidate_map(users: List[Dict[str, Any]]) -> Dict[str, int]:
|
|
||||||
candidate_to_id: Dict[str, int] = {}
|
|
||||||
for user in users:
|
|
||||||
if not isinstance(user, dict):
|
|
||||||
continue
|
|
||||||
user_id = user.get("id") or user.get("userId") or user.get("Id")
|
|
||||||
try:
|
|
||||||
user_id = int(user_id)
|
|
||||||
except (TypeError, ValueError):
|
|
||||||
continue
|
|
||||||
for key in ("username", "email", "displayName", "name"):
|
|
||||||
for handle in _normalized_handles(user.get(key)):
|
|
||||||
candidate_to_id.setdefault(handle, user_id)
|
|
||||||
return candidate_to_id
|
|
||||||
|
|
||||||
|
|
||||||
def match_jellyseerr_user_id(
|
|
||||||
username: str, candidate_map: Dict[str, int]
|
|
||||||
) -> Optional[int]:
|
|
||||||
for handle in _normalized_handles(username):
|
|
||||||
matched = candidate_map.get(handle)
|
|
||||||
if matched is not None:
|
|
||||||
return matched
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def save_jellyseerr_users_cache(users: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
|
|
||||||
normalized: List[Dict[str, Any]] = []
|
|
||||||
for user in users:
|
|
||||||
if not isinstance(user, dict):
|
|
||||||
continue
|
|
||||||
normalized.append(
|
|
||||||
{
|
|
||||||
"id": user.get("id") or user.get("userId") or user.get("Id"),
|
|
||||||
"email": user.get("email"),
|
|
||||||
"username": user.get("username"),
|
|
||||||
"displayName": user.get("displayName"),
|
|
||||||
"name": user.get("name"),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
_save_cached_users(JELLYSEERR_CACHE_KEY, JELLYSEERR_CACHE_AT_KEY, normalized)
|
|
||||||
logger.debug("Cached Jellyseerr users: %s", len(normalized))
|
|
||||||
return normalized
|
|
||||||
|
|
||||||
|
|
||||||
def get_cached_jellyseerr_users(max_age_minutes: int = 1440) -> Optional[List[Dict[str, Any]]]:
|
|
||||||
return _load_cached_users(JELLYSEERR_CACHE_KEY, JELLYSEERR_CACHE_AT_KEY, max_age_minutes)
|
|
||||||
|
|
||||||
|
|
||||||
def save_jellyfin_users_cache(users: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
|
|
||||||
normalized: List[Dict[str, Any]] = []
|
|
||||||
for user in users:
|
|
||||||
if not isinstance(user, dict):
|
|
||||||
continue
|
|
||||||
normalized.append(
|
|
||||||
{
|
|
||||||
"id": user.get("Id"),
|
|
||||||
"name": user.get("Name"),
|
|
||||||
"hasPassword": user.get("HasPassword"),
|
|
||||||
"lastLoginDate": user.get("LastLoginDate"),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
_save_cached_users(JELLYFIN_CACHE_KEY, JELLYFIN_CACHE_AT_KEY, normalized)
|
|
||||||
logger.debug("Cached Jellyfin users: %s", len(normalized))
|
|
||||||
return normalized
|
|
||||||
|
|
||||||
|
|
||||||
def get_cached_jellyfin_users(max_age_minutes: int = 1440) -> Optional[List[Dict[str, Any]]]:
|
|
||||||
return _load_cached_users(JELLYFIN_CACHE_KEY, JELLYFIN_CACHE_AT_KEY, max_age_minutes)
|
|
||||||
@@ -1,10 +1,19 @@
|
|||||||
services:
|
services:
|
||||||
magent:
|
backend:
|
||||||
image: rephl3xnz/magent:latest
|
image: rephl3xnz/magent-backend:latest
|
||||||
env_file:
|
env_file:
|
||||||
- ./.env
|
- ./.env
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/app/data
|
- ./data:/app/data
|
||||||
|
|
||||||
|
frontend:
|
||||||
|
image: rephl3xnz/magent-frontend:latest
|
||||||
|
environment:
|
||||||
|
- NEXT_PUBLIC_API_BASE=/api
|
||||||
|
- BACKEND_INTERNAL_URL=http://backend:8000
|
||||||
|
ports:
|
||||||
|
- "3000:3000"
|
||||||
|
depends_on:
|
||||||
|
- backend
|
||||||
|
|||||||
@@ -1,12 +1,23 @@
|
|||||||
services:
|
services:
|
||||||
magent:
|
backend:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: backend/Dockerfile
|
||||||
env_file:
|
env_file:
|
||||||
- ./.env
|
- ./.env
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/app/data
|
- ./data:/app/data
|
||||||
|
|
||||||
|
frontend:
|
||||||
|
build:
|
||||||
|
context: ./frontend
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
environment:
|
||||||
|
- NEXT_PUBLIC_API_BASE=/api
|
||||||
|
- BACKEND_INTERNAL_URL=http://backend:8000
|
||||||
|
ports:
|
||||||
|
- "3000:3000"
|
||||||
|
depends_on:
|
||||||
|
- backend
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
[supervisord]
|
|
||||||
nodaemon=true
|
|
||||||
logfile=/dev/null
|
|
||||||
logfile_maxbytes=0
|
|
||||||
pidfile=/tmp/supervisord.pid
|
|
||||||
|
|
||||||
[program:backend]
|
|
||||||
directory=/app
|
|
||||||
command=uvicorn app.main:app --host 0.0.0.0 --port 8000
|
|
||||||
autostart=true
|
|
||||||
autorestart=true
|
|
||||||
stdout_logfile=/dev/stdout
|
|
||||||
stdout_logfile_maxbytes=0
|
|
||||||
stderr_logfile=/dev/stderr
|
|
||||||
stderr_logfile_maxbytes=0
|
|
||||||
priority=10
|
|
||||||
|
|
||||||
[program:frontend]
|
|
||||||
directory=/app/frontend
|
|
||||||
command=/usr/bin/npm start -- --hostname 0.0.0.0 --port 3000
|
|
||||||
environment=NEXT_PUBLIC_API_BASE="/api",BACKEND_INTERNAL_URL="http://127.0.0.1:8000",NODE_ENV="production"
|
|
||||||
autostart=true
|
|
||||||
autorestart=true
|
|
||||||
stdout_logfile=/dev/stdout
|
|
||||||
stdout_logfile_maxbytes=0
|
|
||||||
stderr_logfile=/dev/stderr
|
|
||||||
stderr_logfile_maxbytes=0
|
|
||||||
priority=20
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -13,7 +13,6 @@ const ALLOWED_SECTIONS = new Set([
|
|||||||
'cache',
|
'cache',
|
||||||
'logs',
|
'logs',
|
||||||
'maintenance',
|
'maintenance',
|
||||||
'site',
|
|
||||||
])
|
])
|
||||||
|
|
||||||
type PageProps = {
|
type PageProps = {
|
||||||
|
|||||||
@@ -1,172 +0,0 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import { useEffect, useMemo, useState } from 'react'
|
|
||||||
import { useRouter } from 'next/navigation'
|
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../../lib/auth'
|
|
||||||
import AdminShell from '../../ui/AdminShell'
|
|
||||||
|
|
||||||
type RequestRow = {
|
|
||||||
id: number
|
|
||||||
title?: string | null
|
|
||||||
year?: number | null
|
|
||||||
type?: string | null
|
|
||||||
statusLabel?: string | null
|
|
||||||
requestedBy?: string | null
|
|
||||||
createdAt?: string | null
|
|
||||||
}
|
|
||||||
|
|
||||||
const formatDateTime = (value?: string | null) => {
|
|
||||||
if (!value) return 'Unknown'
|
|
||||||
const date = new Date(value)
|
|
||||||
if (Number.isNaN(date.valueOf())) return value
|
|
||||||
return date.toLocaleString()
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function AdminRequestsAllPage() {
|
|
||||||
const router = useRouter()
|
|
||||||
const [rows, setRows] = useState<RequestRow[]>([])
|
|
||||||
const [total, setTotal] = useState(0)
|
|
||||||
const [loading, setLoading] = useState(false)
|
|
||||||
const [error, setError] = useState<string | null>(null)
|
|
||||||
const [pageSize, setPageSize] = useState(50)
|
|
||||||
const [page, setPage] = useState(1)
|
|
||||||
|
|
||||||
const pageCount = useMemo(() => {
|
|
||||||
if (!total || pageSize <= 0) return 1
|
|
||||||
return Math.max(1, Math.ceil(total / pageSize))
|
|
||||||
}, [total, pageSize])
|
|
||||||
|
|
||||||
const load = async () => {
|
|
||||||
if (!getToken()) {
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
setLoading(true)
|
|
||||||
setError(null)
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const skip = (page - 1) * pageSize
|
|
||||||
const response = await authFetch(
|
|
||||||
`${baseUrl}/admin/requests/all?take=${pageSize}&skip=${skip}`
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
|
||||||
if (response.status === 401) {
|
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (response.status === 403) {
|
|
||||||
router.push('/')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
throw new Error(`Load failed: ${response.status}`)
|
|
||||||
}
|
|
||||||
const data = await response.json()
|
|
||||||
setRows(Array.isArray(data?.results) ? data.results : [])
|
|
||||||
setTotal(Number(data?.total ?? 0))
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setError('Unable to load requests.')
|
|
||||||
} finally {
|
|
||||||
setLoading(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
void load()
|
|
||||||
}, [page, pageSize])
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (page > pageCount) {
|
|
||||||
setPage(pageCount)
|
|
||||||
}
|
|
||||||
}, [pageCount, page])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<AdminShell
|
|
||||||
title="All requests"
|
|
||||||
subtitle="Paginated view of every cached request."
|
|
||||||
actions={
|
|
||||||
<button type="button" onClick={() => router.push('/admin')}>
|
|
||||||
Back to settings
|
|
||||||
</button>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<section className="admin-section">
|
|
||||||
<div className="admin-toolbar">
|
|
||||||
<div className="admin-toolbar-info">
|
|
||||||
<span>{total.toLocaleString()} total</span>
|
|
||||||
</div>
|
|
||||||
<div className="admin-toolbar-actions">
|
|
||||||
<label className="admin-select">
|
|
||||||
<span>Per page</span>
|
|
||||||
<select value={pageSize} onChange={(e) => setPageSize(Number(e.target.value))}>
|
|
||||||
<option value={25}>25</option>
|
|
||||||
<option value={50}>50</option>
|
|
||||||
<option value={100}>100</option>
|
|
||||||
<option value={200}>200</option>
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{loading ? (
|
|
||||||
<div className="status-banner">Loading requests…</div>
|
|
||||||
) : error ? (
|
|
||||||
<div className="error-banner">{error}</div>
|
|
||||||
) : rows.length === 0 ? (
|
|
||||||
<div className="status-banner">No requests found.</div>
|
|
||||||
) : (
|
|
||||||
<div className="admin-table">
|
|
||||||
<div className="admin-table-head">
|
|
||||||
<span>Request</span>
|
|
||||||
<span>Status</span>
|
|
||||||
<span>Requested by</span>
|
|
||||||
<span>Created</span>
|
|
||||||
</div>
|
|
||||||
{rows.map((row) => (
|
|
||||||
<button
|
|
||||||
key={row.id}
|
|
||||||
type="button"
|
|
||||||
className="admin-table-row"
|
|
||||||
onClick={() => router.push(`/requests/${row.id}`)}
|
|
||||||
>
|
|
||||||
<span>
|
|
||||||
{row.title || `Request #${row.id}`}
|
|
||||||
{row.year ? ` (${row.year})` : ''}
|
|
||||||
</span>
|
|
||||||
<span>{row.statusLabel || 'Unknown'}</span>
|
|
||||||
<span>{row.requestedBy || 'Unknown'}</span>
|
|
||||||
<span>{formatDateTime(row.createdAt)}</span>
|
|
||||||
</button>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div className="admin-pagination">
|
|
||||||
<button type="button" onClick={() => setPage(1)} disabled={page <= 1}>
|
|
||||||
First
|
|
||||||
</button>
|
|
||||||
<button type="button" onClick={() => setPage(page - 1)} disabled={page <= 1}>
|
|
||||||
Previous
|
|
||||||
</button>
|
|
||||||
<span>
|
|
||||||
Page {page} of {pageCount}
|
|
||||||
</span>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => setPage(page + 1)}
|
|
||||||
disabled={page >= pageCount}
|
|
||||||
>
|
|
||||||
Next
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => setPage(pageCount)}
|
|
||||||
disabled={page >= pageCount}
|
|
||||||
>
|
|
||||||
Last
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</AdminShell>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,85 +0,0 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import { useEffect, useMemo, useState } from 'react'
|
|
||||||
import { useRouter } from 'next/navigation'
|
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
|
||||||
|
|
||||||
type SiteInfo = {
|
|
||||||
changelog?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
const parseChangelog = (raw: string) =>
|
|
||||||
raw
|
|
||||||
.split('\n')
|
|
||||||
.map((line) => line.trim())
|
|
||||||
.filter(Boolean)
|
|
||||||
|
|
||||||
export default function ChangelogPage() {
|
|
||||||
const router = useRouter()
|
|
||||||
const [entries, setEntries] = useState<string[]>([])
|
|
||||||
const [loading, setLoading] = useState(true)
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const token = getToken()
|
|
||||||
if (!token) {
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
let active = true
|
|
||||||
const load = async () => {
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(`${baseUrl}/site/info`)
|
|
||||||
if (!response.ok) {
|
|
||||||
if (response.status === 401) {
|
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
throw new Error('Failed to load changelog')
|
|
||||||
}
|
|
||||||
const data: SiteInfo = await response.json()
|
|
||||||
if (!active) return
|
|
||||||
setEntries(parseChangelog(data?.changelog ?? ''))
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
if (!active) return
|
|
||||||
setEntries([])
|
|
||||||
} finally {
|
|
||||||
if (active) setLoading(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
void load()
|
|
||||||
return () => {
|
|
||||||
active = false
|
|
||||||
}
|
|
||||||
}, [router])
|
|
||||||
|
|
||||||
const content = useMemo(() => {
|
|
||||||
if (loading) {
|
|
||||||
return <div className="loading-text">Loading changelog...</div>
|
|
||||||
}
|
|
||||||
if (entries.length === 0) {
|
|
||||||
return <div className="meta">No updates posted yet.</div>
|
|
||||||
}
|
|
||||||
return (
|
|
||||||
<ul className="changelog-list">
|
|
||||||
{entries.map((entry, index) => (
|
|
||||||
<li key={`${entry}-${index}`}>{entry}</li>
|
|
||||||
))}
|
|
||||||
</ul>
|
|
||||||
)
|
|
||||||
}, [entries, loading])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="page">
|
|
||||||
<section className="card changelog-card">
|
|
||||||
<div className="changelog-header">
|
|
||||||
<h1>Changelog</h1>
|
|
||||||
<p className="lede">Latest updates and release notes.</p>
|
|
||||||
</div>
|
|
||||||
{content}
|
|
||||||
</section>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -75,64 +75,8 @@ export default function HowItWorksPage() {
|
|||||||
</ol>
|
</ol>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section className="how-flow">
|
|
||||||
<h2>Steps and fixes (simple and visual)</h2>
|
|
||||||
<div className="how-step-grid">
|
|
||||||
<article className="how-step-card step-jellyseerr">
|
|
||||||
<div className="step-badge">1</div>
|
|
||||||
<h3>Request sent</h3>
|
|
||||||
<p className="step-note">Jellyseerr holds your request and approval.</p>
|
|
||||||
<div className="step-fix-title">Fixes you can try</div>
|
|
||||||
<ul className="step-fix-list">
|
|
||||||
<li>Add to library queue (if it was approved but never added)</li>
|
|
||||||
</ul>
|
|
||||||
</article>
|
|
||||||
|
|
||||||
<article className="how-step-card step-arr">
|
|
||||||
<div className="step-badge">2</div>
|
|
||||||
<h3>Added to the library list</h3>
|
|
||||||
<p className="step-note">Sonarr/Radarr decide what quality to get.</p>
|
|
||||||
<div className="step-fix-title">Fixes you can try</div>
|
|
||||||
<ul className="step-fix-list">
|
|
||||||
<li>Search for releases (see options)</li>
|
|
||||||
<li>Search and auto-download (let it pick for you)</li>
|
|
||||||
</ul>
|
|
||||||
</article>
|
|
||||||
|
|
||||||
<article className="how-step-card step-prowlarr">
|
|
||||||
<div className="step-badge">3</div>
|
|
||||||
<h3>Searching for sources</h3>
|
|
||||||
<p className="step-note">Prowlarr checks your torrent providers.</p>
|
|
||||||
<div className="step-fix-title">Fixes you can try</div>
|
|
||||||
<ul className="step-fix-list">
|
|
||||||
<li>Search for releases (show a list to choose)</li>
|
|
||||||
</ul>
|
|
||||||
</article>
|
|
||||||
|
|
||||||
<article className="how-step-card step-qbit">
|
|
||||||
<div className="step-badge">4</div>
|
|
||||||
<h3>Downloading the file</h3>
|
|
||||||
<p className="step-note">qBittorrent downloads the selected match.</p>
|
|
||||||
<div className="step-fix-title">Fixes you can try</div>
|
|
||||||
<ul className="step-fix-list">
|
|
||||||
<li>Resume download (only if it already exists there)</li>
|
|
||||||
</ul>
|
|
||||||
</article>
|
|
||||||
|
|
||||||
<article className="how-step-card step-jellyfin">
|
|
||||||
<div className="step-badge">5</div>
|
|
||||||
<h3>Ready to watch</h3>
|
|
||||||
<p className="step-note">Jellyfin shows it in your library.</p>
|
|
||||||
<div className="step-fix-title">What to do next</div>
|
|
||||||
<ul className="step-fix-list">
|
|
||||||
<li>Open in Jellyfin (watch it)</li>
|
|
||||||
</ul>
|
|
||||||
</article>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section className="how-callout">
|
<section className="how-callout">
|
||||||
<h2>Why Magent sometimes says "waiting"</h2>
|
<h2>Why Magent sometimes says “waiting”</h2>
|
||||||
<p>
|
<p>
|
||||||
If the search helper cannot find a match yet, Magent will say there is nothing to grab.
|
If the search helper cannot find a match yet, Magent will say there is nothing to grab.
|
||||||
That does not mean it is broken. It usually means the release is not available yet.
|
That does not mean it is broken. It usually means the release is not available yet.
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import HeaderIdentity from './ui/HeaderIdentity'
|
|||||||
import ThemeToggle from './ui/ThemeToggle'
|
import ThemeToggle from './ui/ThemeToggle'
|
||||||
import BrandingFavicon from './ui/BrandingFavicon'
|
import BrandingFavicon from './ui/BrandingFavicon'
|
||||||
import BrandingLogo from './ui/BrandingLogo'
|
import BrandingLogo from './ui/BrandingLogo'
|
||||||
import SiteStatus from './ui/SiteStatus'
|
|
||||||
|
|
||||||
export const metadata = {
|
export const metadata = {
|
||||||
title: 'Magent',
|
title: 'Magent',
|
||||||
@@ -29,14 +28,13 @@ export default function RootLayout({ children }: { children: ReactNode }) {
|
|||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div className="header-right">
|
<div className="header-right">
|
||||||
<ThemeToggle />
|
|
||||||
<HeaderIdentity />
|
<HeaderIdentity />
|
||||||
|
<ThemeToggle />
|
||||||
</div>
|
</div>
|
||||||
<div className="header-nav">
|
<div className="header-nav">
|
||||||
<HeaderActions />
|
<HeaderActions />
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
<SiteStatus />
|
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ export default function HomePage() {
|
|||||||
year?: number
|
year?: number
|
||||||
statusLabel?: string
|
statusLabel?: string
|
||||||
artwork?: { poster_url?: string }
|
artwork?: { poster_url?: string }
|
||||||
createdAt?: string | null
|
|
||||||
}[]
|
}[]
|
||||||
>([])
|
>([])
|
||||||
const [recentError, setRecentError] = useState<string | null>(null)
|
const [recentError, setRecentError] = useState<string | null>(null)
|
||||||
@@ -31,8 +30,6 @@ 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()
|
||||||
@@ -45,61 +42,6 @@ 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')
|
||||||
@@ -152,7 +94,6 @@ export default function HomePage() {
|
|||||||
year: item.year,
|
year: item.year,
|
||||||
statusLabel: item.statusLabel,
|
statusLabel: item.statusLabel,
|
||||||
artwork: item.artwork,
|
artwork: item.artwork,
|
||||||
createdAt: item.createdAt ?? null,
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
@@ -238,13 +179,6 @@ export default function HomePage() {
|
|||||||
return url.startsWith('http') ? url : `${getApiBase()}${url}`
|
return url.startsWith('http') ? url : `${getApiBase()}${url}`
|
||||||
}
|
}
|
||||||
|
|
||||||
const formatRequestTime = (value?: string | null) => {
|
|
||||||
if (!value) return null
|
|
||||||
const date = new Date(value)
|
|
||||||
if (Number.isNaN(date.valueOf())) return value
|
|
||||||
return date.toLocaleString()
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="card">
|
<main className="card">
|
||||||
<div className="layout-grid">
|
<div className="layout-grid">
|
||||||
@@ -280,17 +214,10 @@ 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'
|
||||||
@@ -302,15 +229,6 @@ 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>
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
@@ -321,12 +239,11 @@ export default function HomePage() {
|
|||||||
<h2>{role === 'admin' ? 'All requests' : 'My recent requests'}</h2>
|
<h2>{role === 'admin' ? 'All requests' : 'My recent requests'}</h2>
|
||||||
{authReady && (
|
{authReady && (
|
||||||
<label className="recent-filter">
|
<label className="recent-filter">
|
||||||
<span>Show</span>
|
<span>Show last</span>
|
||||||
<select
|
<select
|
||||||
value={recentDays}
|
value={recentDays}
|
||||||
onChange={(event) => setRecentDays(Number(event.target.value))}
|
onChange={(event) => setRecentDays(Number(event.target.value))}
|
||||||
>
|
>
|
||||||
<option value={0}>All</option>
|
|
||||||
<option value={30}>30 days</option>
|
<option value={30}>30 days</option>
|
||||||
<option value={60}>60 days</option>
|
<option value={60}>60 days</option>
|
||||||
<option value={90}>90 days</option>
|
<option value={90}>90 days</option>
|
||||||
@@ -373,7 +290,6 @@ export default function HomePage() {
|
|||||||
<span className="recent-meta">
|
<span className="recent-meta">
|
||||||
{item.statusLabel ? item.statusLabel : 'Status not available yet'} · Request{' '}
|
{item.statusLabel ? item.statusLabel : 'Status not available yet'} · Request{' '}
|
||||||
{item.id}
|
{item.id}
|
||||||
{item.createdAt ? ` · ${formatRequestTime(item.createdAt)}` : ''}
|
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -10,65 +10,9 @@ type ProfileInfo = {
|
|||||||
auth_provider: string
|
auth_provider: string
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProfileStats = {
|
|
||||||
total: number
|
|
||||||
ready: number
|
|
||||||
pending: number
|
|
||||||
in_progress: number
|
|
||||||
declined: number
|
|
||||||
working: number
|
|
||||||
partial: number
|
|
||||||
approved: number
|
|
||||||
last_request_at?: string | null
|
|
||||||
share: number
|
|
||||||
global_total: number
|
|
||||||
most_active_user?: { username: string; total: number } | null
|
|
||||||
}
|
|
||||||
|
|
||||||
type ActivityEntry = {
|
|
||||||
ip: string
|
|
||||||
user_agent: string
|
|
||||||
first_seen_at: string
|
|
||||||
last_seen_at: string
|
|
||||||
hit_count: number
|
|
||||||
}
|
|
||||||
|
|
||||||
type ProfileActivity = {
|
|
||||||
last_ip?: string | null
|
|
||||||
last_user_agent?: string | null
|
|
||||||
last_seen_at?: string | null
|
|
||||||
device_count: number
|
|
||||||
recent: ActivityEntry[]
|
|
||||||
}
|
|
||||||
|
|
||||||
type ProfileResponse = {
|
|
||||||
user: ProfileInfo
|
|
||||||
stats: ProfileStats
|
|
||||||
activity: ProfileActivity
|
|
||||||
}
|
|
||||||
|
|
||||||
const formatDate = (value?: string | null) => {
|
|
||||||
if (!value) return 'Never'
|
|
||||||
const date = new Date(value)
|
|
||||||
if (Number.isNaN(date.valueOf())) return value
|
|
||||||
return date.toLocaleString()
|
|
||||||
}
|
|
||||||
|
|
||||||
const parseBrowser = (agent?: string | null) => {
|
|
||||||
if (!agent) return 'Unknown'
|
|
||||||
const value = agent.toLowerCase()
|
|
||||||
if (value.includes('edg/')) return 'Edge'
|
|
||||||
if (value.includes('chrome/') && !value.includes('edg/')) return 'Chrome'
|
|
||||||
if (value.includes('firefox/')) return 'Firefox'
|
|
||||||
if (value.includes('safari/') && !value.includes('chrome/')) return 'Safari'
|
|
||||||
return 'Unknown'
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function ProfilePage() {
|
export default function ProfilePage() {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const [profile, setProfile] = useState<ProfileInfo | null>(null)
|
const [profile, setProfile] = useState<ProfileInfo | null>(null)
|
||||||
const [stats, setStats] = useState<ProfileStats | null>(null)
|
|
||||||
const [activity, setActivity] = useState<ProfileActivity | null>(null)
|
|
||||||
const [currentPassword, setCurrentPassword] = useState('')
|
const [currentPassword, setCurrentPassword] = useState('')
|
||||||
const [newPassword, setNewPassword] = useState('')
|
const [newPassword, setNewPassword] = useState('')
|
||||||
const [status, setStatus] = useState<string | null>(null)
|
const [status, setStatus] = useState<string | null>(null)
|
||||||
@@ -82,21 +26,18 @@ export default function ProfilePage() {
|
|||||||
const load = async () => {
|
const load = async () => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/auth/profile`)
|
const response = await authFetch(`${baseUrl}/auth/me`)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
clearToken()
|
clearToken()
|
||||||
router.push('/login')
|
router.push('/login')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
const user = data?.user ?? {}
|
|
||||||
setProfile({
|
setProfile({
|
||||||
username: user?.username ?? 'Unknown',
|
username: data?.username ?? 'Unknown',
|
||||||
role: user?.role ?? 'user',
|
role: data?.role ?? 'user',
|
||||||
auth_provider: user?.auth_provider ?? 'local',
|
auth_provider: data?.auth_provider ?? 'local',
|
||||||
})
|
})
|
||||||
setStats(data?.stats ?? null)
|
|
||||||
setActivity(data?.activity ?? null)
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
setStatus('Could not load your profile.')
|
setStatus('Could not load your profile.')
|
||||||
@@ -150,78 +91,6 @@ export default function ProfilePage() {
|
|||||||
{profile.auth_provider}.
|
{profile.auth_provider}.
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div className="profile-grid">
|
|
||||||
<section className="profile-section">
|
|
||||||
<h2>Account stats</h2>
|
|
||||||
<div className="stat-grid">
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">Requests submitted</div>
|
|
||||||
<div className="stat-value">{stats?.total ?? 0}</div>
|
|
||||||
</div>
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">Ready to watch</div>
|
|
||||||
<div className="stat-value">{stats?.ready ?? 0}</div>
|
|
||||||
</div>
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">In progress</div>
|
|
||||||
<div className="stat-value">{stats?.in_progress ?? 0}</div>
|
|
||||||
</div>
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">Pending approval</div>
|
|
||||||
<div className="stat-value">{stats?.pending ?? 0}</div>
|
|
||||||
</div>
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">Declined</div>
|
|
||||||
<div className="stat-value">{stats?.declined ?? 0}</div>
|
|
||||||
</div>
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">Last request</div>
|
|
||||||
<div className="stat-value stat-value--small">
|
|
||||||
{formatDate(stats?.last_request_at)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">Share of all requests</div>
|
|
||||||
<div className="stat-value">
|
|
||||||
{stats?.global_total
|
|
||||||
? `${Math.round((stats.share || 0) * 1000) / 10}%`
|
|
||||||
: '0%'}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{profile?.role === 'admin' ? (
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">Most active user</div>
|
|
||||||
<div className="stat-value stat-value--small">
|
|
||||||
{stats?.most_active_user
|
|
||||||
? `${stats.most_active_user.username} (${stats.most_active_user.total})`
|
|
||||||
: 'N/A'}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
) : null}
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
<section className="profile-section">
|
|
||||||
<h2>Connection history</h2>
|
|
||||||
<div className="status-banner">
|
|
||||||
Last seen {formatDate(activity?.last_seen_at)} from {activity?.last_ip ?? 'Unknown'}.
|
|
||||||
</div>
|
|
||||||
<div className="connection-list">
|
|
||||||
{(activity?.recent ?? []).map((entry, index) => (
|
|
||||||
<div key={`${entry.ip}-${entry.last_seen_at}-${index}`} className="connection-item">
|
|
||||||
<div>
|
|
||||||
<div className="connection-label">{parseBrowser(entry.user_agent)}</div>
|
|
||||||
<div className="meta">IP: {entry.ip}</div>
|
|
||||||
<div className="meta">Last seen: {formatDate(entry.last_seen_at)}</div>
|
|
||||||
</div>
|
|
||||||
<div className="connection-count">{entry.hit_count} visits</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
{activity && activity.recent.length === 0 ? (
|
|
||||||
<div className="status-banner">No connection history yet.</div>
|
|
||||||
) : null}
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</div>
|
|
||||||
{profile?.auth_provider !== 'local' ? (
|
{profile?.auth_provider !== 'local' ? (
|
||||||
<div className="status-banner">
|
<div className="status-banner">
|
||||||
Password changes are only available for local Magent accounts.
|
Password changes are only available for local Magent accounts.
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
'use client'
|
'use client'
|
||||||
|
|
||||||
import Image from 'next/image'
|
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../../lib/auth'
|
import { authFetch, clearToken, getApiBase, getToken } from '../../lib/auth'
|
||||||
@@ -34,7 +33,6 @@ type ReleaseOption = {
|
|||||||
seeders?: number
|
seeders?: number
|
||||||
leechers?: number
|
leechers?: number
|
||||||
protocol?: string
|
protocol?: string
|
||||||
publishDate?: string
|
|
||||||
infoUrl?: string
|
infoUrl?: string
|
||||||
downloadUrl?: string
|
downloadUrl?: string
|
||||||
}
|
}
|
||||||
@@ -125,7 +123,7 @@ const friendlyState = (value: string) => {
|
|||||||
const map: Record<string, string> = {
|
const map: Record<string, string> = {
|
||||||
REQUESTED: 'Waiting for approval',
|
REQUESTED: 'Waiting for approval',
|
||||||
APPROVED: 'Approved and queued',
|
APPROVED: 'Approved and queued',
|
||||||
NEEDS_ADD: 'Push to Sonarr/Radarr',
|
NEEDS_ADD: 'Needs adding to the library',
|
||||||
ADDED_TO_ARR: 'Added to the library queue',
|
ADDED_TO_ARR: 'Added to the library queue',
|
||||||
SEARCHING: 'Searching for releases',
|
SEARCHING: 'Searching for releases',
|
||||||
GRABBED: 'Download queued',
|
GRABBED: 'Download queued',
|
||||||
@@ -157,7 +155,7 @@ const friendlyTimelineStatus = (service: string, status: string) => {
|
|||||||
}
|
}
|
||||||
if (service === 'Sonarr/Radarr') {
|
if (service === 'Sonarr/Radarr') {
|
||||||
const map: Record<string, string> = {
|
const map: Record<string, string> = {
|
||||||
missing: 'Push to Sonarr/Radarr',
|
missing: 'Not added yet',
|
||||||
added: 'Added to the library queue',
|
added: 'Added to the library queue',
|
||||||
searching: 'Searching for releases',
|
searching: 'Searching for releases',
|
||||||
available: 'Ready to watch',
|
available: 'Ready to watch',
|
||||||
@@ -252,7 +250,7 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
}
|
}
|
||||||
|
|
||||||
load()
|
load()
|
||||||
}, [params.id, router])
|
}, [params.id])
|
||||||
|
|
||||||
if (loading) {
|
if (loading) {
|
||||||
return (
|
return (
|
||||||
@@ -276,11 +274,9 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
const downloadHop = snapshot.timeline.find((hop) => hop.service === 'qBittorrent')
|
const downloadHop = snapshot.timeline.find((hop) => hop.service === 'qBittorrent')
|
||||||
const downloadState = downloadHop?.details?.summary ?? downloadHop?.status ?? 'Unknown'
|
const downloadState = downloadHop?.details?.summary ?? downloadHop?.status ?? 'Unknown'
|
||||||
const jellyfinAvailable = Boolean(snapshot.raw?.jellyfin?.available)
|
const jellyfinAvailable = Boolean(snapshot.raw?.jellyfin?.available)
|
||||||
const arrStageLabel =
|
|
||||||
snapshot.state === 'NEEDS_ADD' ? 'Push to Sonarr/Radarr' : 'Library queue'
|
|
||||||
const pipelineSteps = [
|
const pipelineSteps = [
|
||||||
{ key: 'Jellyseerr', label: 'Jellyseerr' },
|
{ key: 'Jellyseerr', label: 'Jellyseerr' },
|
||||||
{ key: 'Sonarr/Radarr', label: arrStageLabel },
|
{ key: 'Sonarr/Radarr', label: 'Library queue' },
|
||||||
{ key: 'Prowlarr', label: 'Search' },
|
{ key: 'Prowlarr', label: 'Search' },
|
||||||
{ key: 'qBittorrent', label: 'Download' },
|
{ key: 'qBittorrent', label: 'Download' },
|
||||||
{ key: 'Jellyfin', label: 'Jellyfin' },
|
{ key: 'Jellyfin', label: 'Jellyfin' },
|
||||||
@@ -312,14 +308,11 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
<div className="request-header">
|
<div className="request-header">
|
||||||
<div className="request-header-main">
|
<div className="request-header-main">
|
||||||
{resolvedPoster && (
|
{resolvedPoster && (
|
||||||
<Image
|
<img
|
||||||
className="request-poster"
|
className="request-poster"
|
||||||
src={resolvedPoster}
|
src={resolvedPoster}
|
||||||
alt={`${snapshot.title} poster`}
|
alt={`${snapshot.title} poster`}
|
||||||
width={90}
|
loading="lazy"
|
||||||
height={135}
|
|
||||||
sizes="90px"
|
|
||||||
unoptimized
|
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<div>
|
<div>
|
||||||
@@ -597,14 +590,7 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
guid: release.guid,
|
guid: release.guid,
|
||||||
indexerId: release.indexerId,
|
indexerId: release.indexerId,
|
||||||
indexerName: release.indexer,
|
|
||||||
downloadUrl: release.downloadUrl,
|
downloadUrl: release.downloadUrl,
|
||||||
title: release.title,
|
|
||||||
size: release.size,
|
|
||||||
protocol: release.protocol,
|
|
||||||
publishDate: release.publishDate,
|
|
||||||
seeders: release.seeders,
|
|
||||||
leechers: release.leechers,
|
|
||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@@ -617,8 +603,8 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
const text = await response.text()
|
const text = await response.text()
|
||||||
throw new Error(text || `Request failed: ${response.status}`)
|
throw new Error(text || `Request failed: ${response.status}`)
|
||||||
}
|
}
|
||||||
setActionMessage('Download sent to qBittorrent.')
|
setActionMessage('Download sent to Sonarr/Radarr.')
|
||||||
setModalMessage('Download sent to qBittorrent.')
|
setModalMessage('Download sent to Sonarr/Radarr.')
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error)
|
console.error(error)
|
||||||
const message = 'Download failed. Check the logs.'
|
const message = 'Download failed. Check the logs.'
|
||||||
|
|||||||
@@ -17,15 +17,14 @@ const NAV_GROUPS = [
|
|||||||
{
|
{
|
||||||
title: 'Requests',
|
title: 'Requests',
|
||||||
items: [
|
items: [
|
||||||
{ href: '/admin/requests', label: 'Request sync' },
|
{ href: '/admin/requests', label: 'Request syncing' },
|
||||||
{ href: '/admin/requests-all', label: 'All requests' },
|
{ href: '/admin/artwork', label: 'Artwork' },
|
||||||
{ href: '/admin/cache', label: 'Cache Control' },
|
{ href: '/admin/cache', label: 'Cache' },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'Admin',
|
title: 'Admin',
|
||||||
items: [
|
items: [
|
||||||
{ href: '/admin/site', label: 'Site' },
|
|
||||||
{ href: '/users', label: 'Users' },
|
{ href: '/users', label: 'Users' },
|
||||||
{ href: '/admin/logs', label: 'Activity log' },
|
{ href: '/admin/logs', label: 'Activity log' },
|
||||||
{ href: '/admin/maintenance', label: 'Maintenance' },
|
{ href: '/admin/maintenance', label: 'Maintenance' },
|
||||||
|
|||||||
@@ -32,6 +32,14 @@ export default function HeaderActions() {
|
|||||||
void load()
|
void load()
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
|
const signOut = () => {
|
||||||
|
clearToken()
|
||||||
|
setSignedIn(false)
|
||||||
|
if (typeof window !== 'undefined') {
|
||||||
|
window.location.href = '/login'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!signedIn) {
|
if (!signedIn) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
@@ -41,7 +49,11 @@ export default function HeaderActions() {
|
|||||||
<a className="header-cta header-cta--left" href="/feedback">Send feedback</a>
|
<a className="header-cta header-cta--left" href="/feedback">Send feedback</a>
|
||||||
<a href="/">Requests</a>
|
<a href="/">Requests</a>
|
||||||
<a href="/how-it-works">How it works</a>
|
<a href="/how-it-works">How it works</a>
|
||||||
|
<a href="/profile">My profile</a>
|
||||||
{role === 'admin' && <a href="/admin">Settings</a>}
|
{role === 'admin' && <a href="/admin">Settings</a>}
|
||||||
|
<button type="button" className="header-link" onClick={signOut}>
|
||||||
|
Sign out
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,15 +4,13 @@ import { useEffect, useState } from 'react'
|
|||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
||||||
|
|
||||||
export default function HeaderIdentity() {
|
export default function HeaderIdentity() {
|
||||||
const [identity, setIdentity] = useState<{ username: string; role?: string } | null>(null)
|
const [identity, setIdentity] = useState<string | null>(null)
|
||||||
const [buildNumber, setBuildNumber] = useState<string | null>(null)
|
|
||||||
const [open, setOpen] = useState(false)
|
const [open, setOpen] = useState(false)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const token = getToken()
|
const token = getToken()
|
||||||
if (!token) {
|
if (!token) {
|
||||||
setIdentity(null)
|
setIdentity(null)
|
||||||
setBuildNumber(null)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const load = async () => {
|
const load = async () => {
|
||||||
@@ -26,14 +24,7 @@ export default function HeaderIdentity() {
|
|||||||
}
|
}
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
if (data?.username) {
|
if (data?.username) {
|
||||||
setIdentity({ username: data.username, role: data.role })
|
setIdentity(`${data.username}${data.role ? ` (${data.role})` : ''}`)
|
||||||
}
|
|
||||||
const siteResponse = await fetch(`${baseUrl}/site/public`)
|
|
||||||
if (siteResponse.ok) {
|
|
||||||
const siteInfo = await siteResponse.json()
|
|
||||||
if (siteInfo?.buildNumber) {
|
|
||||||
setBuildNumber(siteInfo.buildNumber)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
@@ -47,42 +38,14 @@ export default function HeaderIdentity() {
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
const label = `${identity.username}${identity.role ? ` (${identity.role})` : ''}`
|
|
||||||
const initial = identity.username.slice(0, 1).toUpperCase()
|
|
||||||
const signOut = () => {
|
|
||||||
clearToken()
|
|
||||||
if (typeof window !== 'undefined') {
|
|
||||||
window.location.href = '/login'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="signed-in-menu">
|
<div className="signed-in-menu">
|
||||||
<button
|
<button type="button" className="signed-in" onClick={() => setOpen((prev) => !prev)}>
|
||||||
type="button"
|
Signed in as {identity}
|
||||||
className="avatar-button"
|
|
||||||
onClick={() => setOpen((prev) => !prev)}
|
|
||||||
aria-haspopup="true"
|
|
||||||
aria-expanded={open}
|
|
||||||
title={label}
|
|
||||||
>
|
|
||||||
{initial}
|
|
||||||
</button>
|
</button>
|
||||||
{open && (
|
{open && (
|
||||||
<div className="signed-in-dropdown">
|
<div className="signed-in-dropdown">
|
||||||
<div className="signed-in-header">Signed in as {label}</div>
|
<a href="/profile">My profile</a>
|
||||||
<div className="signed-in-actions">
|
|
||||||
<a href="/profile" onClick={() => setOpen(false)}>
|
|
||||||
My profile
|
|
||||||
</a>
|
|
||||||
<a href="/changelog" onClick={() => setOpen(false)}>
|
|
||||||
Changelog
|
|
||||||
</a>
|
|
||||||
<button type="button" className="signed-in-signout" onClick={signOut}>
|
|
||||||
Sign out
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
{buildNumber ? <div className="signed-in-build">Build {buildNumber}</div> : null}
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import { useEffect, useState } from 'react'
|
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
|
||||||
|
|
||||||
type BannerInfo = {
|
|
||||||
enabled: boolean
|
|
||||||
message: string
|
|
||||||
tone?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
type SiteInfo = {
|
|
||||||
buildNumber?: string
|
|
||||||
banner?: BannerInfo
|
|
||||||
}
|
|
||||||
|
|
||||||
const buildRequest = () => {
|
|
||||||
const token = getToken()
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const url = token ? `${baseUrl}/site/info` : `${baseUrl}/site/public`
|
|
||||||
const fetcher = token ? authFetch : fetch
|
|
||||||
return { token, url, fetcher }
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function SiteStatus() {
|
|
||||||
const [info, setInfo] = useState<SiteInfo | null>(null)
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
let active = true
|
|
||||||
const load = async () => {
|
|
||||||
try {
|
|
||||||
const { token, url, fetcher } = buildRequest()
|
|
||||||
const response = await fetcher(url)
|
|
||||||
if (!response.ok) {
|
|
||||||
if (response.status === 401 && token) {
|
|
||||||
clearToken()
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const data = await response.json()
|
|
||||||
if (!active) return
|
|
||||||
setInfo(data)
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
void load()
|
|
||||||
return () => {
|
|
||||||
active = false
|
|
||||||
}
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
const banner = info?.banner
|
|
||||||
const tone = banner?.tone || 'info'
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
{banner?.enabled && banner.message ? (
|
|
||||||
<div className={`site-banner site-banner--${tone}`}>{banner.message}</div>
|
|
||||||
) : null}
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,281 +0,0 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import { useEffect, useState } from 'react'
|
|
||||||
import { useParams, useRouter } from 'next/navigation'
|
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../../lib/auth'
|
|
||||||
import AdminShell from '../../ui/AdminShell'
|
|
||||||
|
|
||||||
type UserStats = {
|
|
||||||
total: number
|
|
||||||
ready: number
|
|
||||||
pending: number
|
|
||||||
approved: number
|
|
||||||
working: number
|
|
||||||
partial: number
|
|
||||||
declined: number
|
|
||||||
in_progress: number
|
|
||||||
last_request_at?: string | null
|
|
||||||
}
|
|
||||||
|
|
||||||
type AdminUser = {
|
|
||||||
id?: number
|
|
||||||
username: string
|
|
||||||
role: string
|
|
||||||
auth_provider?: string | null
|
|
||||||
last_login_at?: string | null
|
|
||||||
is_blocked?: boolean
|
|
||||||
auto_search_enabled?: boolean
|
|
||||||
jellyseerr_user_id?: number | null
|
|
||||||
}
|
|
||||||
|
|
||||||
const formatDateTime = (value?: string | null) => {
|
|
||||||
if (!value) return 'Never'
|
|
||||||
const date = new Date(value)
|
|
||||||
if (Number.isNaN(date.valueOf())) return value
|
|
||||||
return date.toLocaleString()
|
|
||||||
}
|
|
||||||
|
|
||||||
const normalizeStats = (stats: any): UserStats => ({
|
|
||||||
total: Number(stats?.total ?? 0),
|
|
||||||
ready: Number(stats?.ready ?? 0),
|
|
||||||
pending: Number(stats?.pending ?? 0),
|
|
||||||
approved: Number(stats?.approved ?? 0),
|
|
||||||
working: Number(stats?.working ?? 0),
|
|
||||||
partial: Number(stats?.partial ?? 0),
|
|
||||||
declined: Number(stats?.declined ?? 0),
|
|
||||||
in_progress: Number(stats?.in_progress ?? 0),
|
|
||||||
last_request_at: stats?.last_request_at ?? null,
|
|
||||||
})
|
|
||||||
|
|
||||||
export default function UserDetailPage() {
|
|
||||||
const params = useParams()
|
|
||||||
const router = useRouter()
|
|
||||||
const idParam = Array.isArray(params?.id) ? params.id[0] : params?.id
|
|
||||||
const [user, setUser] = useState<AdminUser | null>(null)
|
|
||||||
const [stats, setStats] = useState<UserStats | null>(null)
|
|
||||||
const [error, setError] = useState<string | null>(null)
|
|
||||||
const [loading, setLoading] = useState(true)
|
|
||||||
|
|
||||||
const loadUser = async () => {
|
|
||||||
if (!idParam) return
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(
|
|
||||||
`${baseUrl}/admin/users/id/${encodeURIComponent(idParam)}`
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
|
||||||
if (response.status === 401) {
|
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (response.status === 403) {
|
|
||||||
router.push('/')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (response.status === 404) {
|
|
||||||
setError('User not found.')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
throw new Error('Could not load user.')
|
|
||||||
}
|
|
||||||
const data = await response.json()
|
|
||||||
setUser(data?.user ?? null)
|
|
||||||
setStats(normalizeStats(data?.stats))
|
|
||||||
setError(null)
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setError('Could not load user.')
|
|
||||||
} finally {
|
|
||||||
setLoading(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const toggleUserBlock = async (blocked: boolean) => {
|
|
||||||
if (!user) return
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(
|
|
||||||
`${baseUrl}/admin/users/${encodeURIComponent(user.username)}/${blocked ? 'block' : 'unblock'}`,
|
|
||||||
{ method: 'POST' }
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('Update failed')
|
|
||||||
}
|
|
||||||
await loadUser()
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setError('Could not update user access.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const updateUserRole = async (role: string) => {
|
|
||||||
if (!user) return
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(
|
|
||||||
`${baseUrl}/admin/users/${encodeURIComponent(user.username)}/role`,
|
|
||||||
{
|
|
||||||
method: 'POST',
|
|
||||||
headers: { 'Content-Type': 'application/json' },
|
|
||||||
body: JSON.stringify({ role }),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('Update failed')
|
|
||||||
}
|
|
||||||
await loadUser()
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setError('Could not update user role.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const updateAutoSearchEnabled = async (enabled: boolean) => {
|
|
||||||
if (!user) return
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(
|
|
||||||
`${baseUrl}/admin/users/${encodeURIComponent(user.username)}/auto-search`,
|
|
||||||
{
|
|
||||||
method: 'POST',
|
|
||||||
headers: { 'Content-Type': 'application/json' },
|
|
||||||
body: JSON.stringify({ enabled }),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('Update failed')
|
|
||||||
}
|
|
||||||
await loadUser()
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setError('Could not update auto search access.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!getToken()) {
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
void loadUser()
|
|
||||||
}, [router, idParam])
|
|
||||||
|
|
||||||
if (loading) {
|
|
||||||
return <main className="card">Loading user...</main>
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<AdminShell
|
|
||||||
title={user?.username || 'User'}
|
|
||||||
subtitle="User overview and request stats."
|
|
||||||
actions={
|
|
||||||
<button type="button" onClick={() => router.push('/users')}>
|
|
||||||
Back to users
|
|
||||||
</button>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<section className="admin-section">
|
|
||||||
{error && <div className="error-banner">{error}</div>}
|
|
||||||
{!user ? (
|
|
||||||
<div className="status-banner">No user data found.</div>
|
|
||||||
) : (
|
|
||||||
<>
|
|
||||||
<div className="user-detail-card">
|
|
||||||
<div className="user-detail-layout">
|
|
||||||
<div className="user-detail-identity">
|
|
||||||
<div className="user-detail-title-row">
|
|
||||||
<strong className="user-detail-name">{user.username}</strong>
|
|
||||||
<span className={`user-grid-pill ${user.is_blocked ? 'is-blocked' : ''}`}>
|
|
||||||
{user.is_blocked ? 'Blocked' : 'Active'}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-meta-pills">
|
|
||||||
<span className="user-detail-chip">
|
|
||||||
Jellyseerr ID: {user.jellyseerr_user_id ?? user.id ?? 'Unknown'}
|
|
||||||
</span>
|
|
||||||
<span className="user-detail-chip">Role: {user.role}</span>
|
|
||||||
<span className="user-detail-chip">Login type: {user.auth_provider || 'local'}</span>
|
|
||||||
<span className="user-detail-chip">Last login: {formatDateTime(user.last_login_at)}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-controls">
|
|
||||||
<div className="user-detail-controls-title">User controls</div>
|
|
||||||
<div className="user-detail-actions">
|
|
||||||
<label className="toggle">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
checked={user.role === 'admin'}
|
|
||||||
onChange={(event) => updateUserRole(event.target.checked ? 'admin' : 'user')}
|
|
||||||
/>
|
|
||||||
<span>Make admin</span>
|
|
||||||
</label>
|
|
||||||
<label className="toggle">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
checked={Boolean(user.auto_search_enabled ?? true)}
|
|
||||||
disabled={user.role === 'admin'}
|
|
||||||
onChange={(event) => updateAutoSearchEnabled(event.target.checked)}
|
|
||||||
/>
|
|
||||||
<span>Allow auto search/download</span>
|
|
||||||
</label>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="ghost-button"
|
|
||||||
onClick={() => toggleUserBlock(!user.is_blocked)}
|
|
||||||
>
|
|
||||||
{user.is_blocked ? 'Allow access' : 'Block access'}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
{user.role === 'admin' && (
|
|
||||||
<div className="user-detail-helper">
|
|
||||||
Admins always have auto search/download access.
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-grid">
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">Total</span>
|
|
||||||
<span className="value">{stats?.total ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">Ready</span>
|
|
||||||
<span className="value">{stats?.ready ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">Pending</span>
|
|
||||||
<span className="value">{stats?.pending ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">Approved</span>
|
|
||||||
<span className="value">{stats?.approved ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">Working</span>
|
|
||||||
<span className="value">{stats?.working ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">Partial</span>
|
|
||||||
<span className="value">{stats?.partial ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">Declined</span>
|
|
||||||
<span className="value">{stats?.declined ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">In progress</span>
|
|
||||||
<span className="value">{stats?.in_progress ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat user-detail-stat--wide">
|
|
||||||
<span className="label">Last request</span>
|
|
||||||
<span className="value">{formatDateTime(stats?.last_request_at)}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</section>
|
|
||||||
</AdminShell>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -2,31 +2,15 @@
|
|||||||
|
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import Link from 'next/link'
|
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
||||||
import AdminShell from '../ui/AdminShell'
|
import AdminShell from '../ui/AdminShell'
|
||||||
|
|
||||||
type AdminUser = {
|
type AdminUser = {
|
||||||
id: number
|
|
||||||
username: string
|
username: string
|
||||||
role: string
|
role: string
|
||||||
authProvider?: string | null
|
authProvider?: string | null
|
||||||
lastLoginAt?: string | null
|
lastLoginAt?: string | null
|
||||||
isBlocked?: boolean
|
isBlocked?: boolean
|
||||||
autoSearchEnabled?: boolean
|
|
||||||
stats?: UserStats
|
|
||||||
}
|
|
||||||
|
|
||||||
type UserStats = {
|
|
||||||
total: number
|
|
||||||
ready: number
|
|
||||||
pending: number
|
|
||||||
approved: number
|
|
||||||
working: number
|
|
||||||
partial: number
|
|
||||||
declined: number
|
|
||||||
in_progress: number
|
|
||||||
last_request_at?: string | null
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const formatLastLogin = (value?: string | null) => {
|
const formatLastLogin = (value?: string | null) => {
|
||||||
@@ -36,51 +20,16 @@ const formatLastLogin = (value?: string | null) => {
|
|||||||
return date.toLocaleString()
|
return date.toLocaleString()
|
||||||
}
|
}
|
||||||
|
|
||||||
const formatLastRequest = (value?: string | null) => {
|
|
||||||
if (!value) return '—'
|
|
||||||
const date = new Date(value)
|
|
||||||
if (Number.isNaN(date.valueOf())) return value
|
|
||||||
return date.toLocaleString()
|
|
||||||
}
|
|
||||||
|
|
||||||
const emptyStats: UserStats = {
|
|
||||||
total: 0,
|
|
||||||
ready: 0,
|
|
||||||
pending: 0,
|
|
||||||
approved: 0,
|
|
||||||
working: 0,
|
|
||||||
partial: 0,
|
|
||||||
declined: 0,
|
|
||||||
in_progress: 0,
|
|
||||||
last_request_at: null,
|
|
||||||
}
|
|
||||||
|
|
||||||
const normalizeStats = (stats: any): UserStats => ({
|
|
||||||
total: Number(stats?.total ?? 0),
|
|
||||||
ready: Number(stats?.ready ?? 0),
|
|
||||||
pending: Number(stats?.pending ?? 0),
|
|
||||||
approved: Number(stats?.approved ?? 0),
|
|
||||||
working: Number(stats?.working ?? 0),
|
|
||||||
partial: Number(stats?.partial ?? 0),
|
|
||||||
declined: Number(stats?.declined ?? 0),
|
|
||||||
in_progress: Number(stats?.in_progress ?? 0),
|
|
||||||
last_request_at: stats?.last_request_at ?? null,
|
|
||||||
})
|
|
||||||
|
|
||||||
export default function UsersPage() {
|
export default function UsersPage() {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
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 [jellyseerrSyncStatus, setJellyseerrSyncStatus] = useState<string | null>(null)
|
|
||||||
const [jellyseerrSyncBusy, setJellyseerrSyncBusy] = useState(false)
|
|
||||||
const [jellyseerrResyncBusy, setJellyseerrResyncBusy] = useState(false)
|
|
||||||
const [bulkAutoSearchBusy, setBulkAutoSearchBusy] = useState(false)
|
|
||||||
|
|
||||||
const loadUsers = async () => {
|
const loadUsers = async () => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/admin/users/summary`)
|
const response = await authFetch(`${baseUrl}/admin/users`)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
if (response.status === 401) {
|
if (response.status === 401) {
|
||||||
clearToken()
|
clearToken()
|
||||||
@@ -102,9 +51,6 @@ export default function UsersPage() {
|
|||||||
authProvider: user.auth_provider ?? 'local',
|
authProvider: user.auth_provider ?? 'local',
|
||||||
lastLoginAt: user.last_login_at ?? null,
|
lastLoginAt: user.last_login_at ?? null,
|
||||||
isBlocked: Boolean(user.is_blocked),
|
isBlocked: Boolean(user.is_blocked),
|
||||||
autoSearchEnabled: Boolean(user.auto_search_enabled ?? true),
|
|
||||||
id: Number(user.id ?? 0),
|
|
||||||
stats: normalizeStats(user.stats ?? emptyStats),
|
|
||||||
}))
|
}))
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
@@ -157,86 +103,6 @@ export default function UsersPage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const syncJellyseerrUsers = async () => {
|
|
||||||
setJellyseerrSyncStatus(null)
|
|
||||||
setJellyseerrSyncBusy(true)
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(`${baseUrl}/admin/jellyseerr/users/sync`, {
|
|
||||||
method: 'POST',
|
|
||||||
})
|
|
||||||
if (!response.ok) {
|
|
||||||
const text = await response.text()
|
|
||||||
throw new Error(text || 'Sync failed')
|
|
||||||
}
|
|
||||||
const data = await response.json()
|
|
||||||
setJellyseerrSyncStatus(
|
|
||||||
`Matched ${data?.matched ?? 0} users. Skipped ${data?.skipped ?? 0}.`
|
|
||||||
)
|
|
||||||
await loadUsers()
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setJellyseerrSyncStatus('Could not sync Jellyseerr users.')
|
|
||||||
} finally {
|
|
||||||
setJellyseerrSyncBusy(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const resyncJellyseerrUsers = async () => {
|
|
||||||
const confirmed = window.confirm(
|
|
||||||
'This will remove all non-admin users and re-import from Jellyseerr. Continue?'
|
|
||||||
)
|
|
||||||
if (!confirmed) return
|
|
||||||
setJellyseerrSyncStatus(null)
|
|
||||||
setJellyseerrResyncBusy(true)
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(`${baseUrl}/admin/jellyseerr/users/resync`, {
|
|
||||||
method: 'POST',
|
|
||||||
})
|
|
||||||
if (!response.ok) {
|
|
||||||
const text = await response.text()
|
|
||||||
throw new Error(text || 'Resync failed')
|
|
||||||
}
|
|
||||||
const data = await response.json()
|
|
||||||
setJellyseerrSyncStatus(
|
|
||||||
`Re-imported ${data?.imported ?? 0} users. Cleared ${data?.cleared ?? 0}.`
|
|
||||||
)
|
|
||||||
await loadUsers()
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setJellyseerrSyncStatus('Could not resync Jellyseerr users.')
|
|
||||||
} finally {
|
|
||||||
setJellyseerrResyncBusy(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const bulkUpdateAutoSearch = async (enabled: boolean) => {
|
|
||||||
setBulkAutoSearchBusy(true)
|
|
||||||
setJellyseerrSyncStatus(null)
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(`${baseUrl}/admin/users/auto-search/bulk`, {
|
|
||||||
method: 'POST',
|
|
||||||
headers: { 'Content-Type': 'application/json' },
|
|
||||||
body: JSON.stringify({ enabled }),
|
|
||||||
})
|
|
||||||
if (!response.ok) {
|
|
||||||
const text = await response.text()
|
|
||||||
throw new Error(text || 'Bulk update failed')
|
|
||||||
}
|
|
||||||
const data = await response.json()
|
|
||||||
setJellyseerrSyncStatus(
|
|
||||||
`${enabled ? 'Enabled' : 'Disabled'} auto search/download for ${data?.updated ?? 0} non-admin users.`
|
|
||||||
)
|
|
||||||
await loadUsers()
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setError('Could not update auto search/download for all users.')
|
|
||||||
} finally {
|
|
||||||
setBulkAutoSearchBusy(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!getToken()) {
|
if (!getToken()) {
|
||||||
@@ -250,105 +116,50 @@ export default function UsersPage() {
|
|||||||
return <main className="card">Loading users...</main>
|
return <main className="card">Loading users...</main>
|
||||||
}
|
}
|
||||||
|
|
||||||
const nonAdminUsers = users.filter((user) => user.role !== 'admin')
|
|
||||||
const autoSearchEnabledCount = nonAdminUsers.filter((user) => user.autoSearchEnabled !== false).length
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<AdminShell
|
<AdminShell
|
||||||
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={syncJellyseerrUsers} disabled={jellyseerrSyncBusy}>
|
|
||||||
{jellyseerrSyncBusy ? 'Syncing Jellyseerr users...' : 'Sync Jellyseerr users'}
|
|
||||||
</button>
|
|
||||||
<button type="button" onClick={resyncJellyseerrUsers} disabled={jellyseerrResyncBusy}>
|
|
||||||
{jellyseerrResyncBusy ? 'Resyncing Jellyseerr users...' : 'Resync Jellyseerr users'}
|
|
||||||
</button>
|
|
||||||
</>
|
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<section className="admin-section">
|
<section className="admin-section">
|
||||||
{error && <div className="error-banner">{error}</div>}
|
{error && <div className="error-banner">{error}</div>}
|
||||||
{jellyseerrSyncStatus && <div className="status-banner">{jellyseerrSyncStatus}</div>}
|
|
||||||
<div className="user-bulk-toolbar">
|
|
||||||
<div className="user-bulk-summary">
|
|
||||||
<strong>Auto search/download</strong>
|
|
||||||
<span>
|
|
||||||
{autoSearchEnabledCount} of {nonAdminUsers.length} non-admin users enabled
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-bulk-actions">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => bulkUpdateAutoSearch(true)}
|
|
||||||
disabled={bulkAutoSearchBusy}
|
|
||||||
>
|
|
||||||
{bulkAutoSearchBusy ? 'Working...' : 'Enable for all users'}
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="ghost-button"
|
|
||||||
onClick={() => bulkUpdateAutoSearch(false)}
|
|
||||||
disabled={bulkAutoSearchBusy}
|
|
||||||
>
|
|
||||||
{bulkAutoSearchBusy ? 'Working...' : 'Disable for all users'}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</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>
|
||||||
) : (
|
) : (
|
||||||
<div className="user-grid">
|
<div className="admin-grid">
|
||||||
{users.map((user) => (
|
{users.map((user) => (
|
||||||
<Link
|
<div key={user.username} className="summary-card user-card">
|
||||||
key={user.username}
|
|
||||||
className="user-grid-card"
|
|
||||||
href={`/users/${user.id}`}
|
|
||||||
>
|
|
||||||
<div className="user-grid-header">
|
|
||||||
<div>
|
<div>
|
||||||
<strong>{user.username}</strong>
|
<strong>{user.username}</strong>
|
||||||
<span className="user-grid-meta">{user.role}</span>
|
<span className="meta">Role: {user.role}</span>
|
||||||
</div>
|
<span className="meta">Login type: {user.authProvider || 'local'}</span>
|
||||||
<span className={`user-grid-pill ${user.isBlocked ? 'is-blocked' : ''}`}>
|
|
||||||
{user.isBlocked ? 'Blocked' : 'Active'}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-grid-subpills">
|
|
||||||
<span className={`user-grid-pill ${user.autoSearchEnabled === false ? 'is-disabled' : ''}`}>
|
|
||||||
Auto search {user.autoSearchEnabled === false ? 'Off' : 'On'}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-grid-stats">
|
|
||||||
<div>
|
|
||||||
<span className="label">Total</span>
|
|
||||||
<span className="value">{user.stats?.total ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<span className="label">Ready</span>
|
|
||||||
<span className="value">{user.stats?.ready ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<span className="label">Pending</span>
|
|
||||||
<span className="value">{user.stats?.pending ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<span className="label">In progress</span>
|
|
||||||
<span className="value">{user.stats?.in_progress ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="user-grid-footer">
|
|
||||||
<span className="meta">Login: {user.authProvider || 'local'}</span>
|
|
||||||
<span className="meta">Last login: {formatLastLogin(user.lastLoginAt)}</span>
|
<span className="meta">Last login: {formatLastLogin(user.lastLoginAt)}</span>
|
||||||
<span className="meta">
|
|
||||||
Last request: {formatLastRequest(user.stats?.last_request_at)}
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
</Link>
|
<div className="user-actions">
|
||||||
|
<label className="toggle">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={user.role === 'admin'}
|
||||||
|
onChange={(event) =>
|
||||||
|
updateUserRole(user.username, event.target.checked ? 'admin' : 'user')
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<span>Make admin</span>
|
||||||
|
</label>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="ghost-button"
|
||||||
|
onClick={() => toggleUserBlock(user.username, !user.isBlocked)}
|
||||||
|
>
|
||||||
|
{user.isBlocked ? 'Allow access' : 'Block access'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "magent-frontend",
|
"name": "magent-frontend",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0202261541",
|
"version": "0.1.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
$ErrorActionPreference = "Stop"
|
|
||||||
|
|
||||||
$repoRoot = Resolve-Path "$PSScriptRoot\\.."
|
|
||||||
Set-Location $repoRoot
|
|
||||||
|
|
||||||
$now = Get-Date
|
|
||||||
$buildNumber = "{0}{1}{2}{3}{4}" -f $now.ToString("dd"), $now.ToString("M"), $now.ToString("yy"), $now.ToString("HH"), $now.ToString("mm")
|
|
||||||
|
|
||||||
Write-Host "Build number: $buildNumber"
|
|
||||||
|
|
||||||
git tag $buildNumber
|
|
||||||
git push origin $buildNumber
|
|
||||||
|
|
||||||
$backendImage = "rephl3xnz/magent-backend:$buildNumber"
|
|
||||||
$frontendImage = "rephl3xnz/magent-frontend:$buildNumber"
|
|
||||||
|
|
||||||
docker build -f backend/Dockerfile -t $backendImage --build-arg BUILD_NUMBER=$buildNumber .
|
|
||||||
docker build -f frontend/Dockerfile -t $frontendImage frontend
|
|
||||||
|
|
||||||
docker tag $backendImage rephl3xnz/magent-backend:latest
|
|
||||||
docker tag $frontendImage rephl3xnz/magent-frontend:latest
|
|
||||||
|
|
||||||
docker push $backendImage
|
|
||||||
docker push $frontendImage
|
|
||||||
docker push rephl3xnz/magent-backend:latest
|
|
||||||
docker push rephl3xnz/magent-frontend:latest
|
|
||||||
Reference in New Issue
Block a user