Compare commits
55 Commits
v0.9.9
...
release-1.
| Author | SHA1 | Date | |
|---|---|---|---|
| 8125b766c7 | |||
| d53e2917aa | |||
| d7847652db | |||
| 24ac54d606 | |||
| 62f392ad37 | |||
| e42ae8585d | |||
| 06e0797722 | |||
| 914f478178 | |||
| fb65d646f2 | |||
| 3493bf715e | |||
| b98239ab3e | |||
| 40dc46c0c5 | |||
| d23d84ea42 | |||
| 7d6cdcbe02 | |||
| 0e95f94025 | |||
| 8b1a09fbd4 | |||
| fe0c108363 | |||
| 9e8d22ba85 | |||
| 7863658a19 | |||
| 7c97934bb9 | |||
| 3f51e24181 | |||
| ab27ebfadf | |||
| b93b41713a | |||
| ceb8c1c9eb | |||
| 86ca3bdeb2 | |||
| 22f90b7e07 | |||
| 57a4883931 | |||
| 6ba41b854b | |||
| 580b335268 | |||
| 23549f1e45 | |||
| 2c45dd0065 | |||
| 92959d80ab | |||
| 615c4c1c29 | |||
| 38eee2407b | |||
| cf4277d10c | |||
| 030480410b | |||
| 3d414b4aeb | |||
| 18bbcbf660 | |||
| 5fa3aa6665 | |||
| 52e3d680f7 | |||
| 00bccfa8b6 | |||
| aa3532dd83 | |||
| 4ec2351241 | |||
| 6480478167 | |||
| 3739e11016 | |||
| 132e02e06e | |||
| cc79685eaf | |||
| b20cf0a9d2 | |||
| eab212ea8d | |||
| 24685a5371 | |||
| 49e9ee771f | |||
| 69dc7febe2 | |||
| 7b8fc1d99b | |||
| 7a7d570852 | |||
| 3eb4b3f09f |
1
.build_number
Normal file
1
.build_number
Normal file
@@ -0,0 +1 @@
|
|||||||
|
271261539
|
||||||
11
.dockerignore
Normal file
11
.dockerignore
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
.git
|
||||||
|
.env
|
||||||
|
*.log
|
||||||
|
data/*
|
||||||
|
!data/branding/
|
||||||
|
!data/branding/**
|
||||||
|
frontend/node_modules/
|
||||||
|
frontend/.next/
|
||||||
|
backend/__pycache__/
|
||||||
|
**/__pycache__/
|
||||||
|
**/*.pyc
|
||||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,6 +1,8 @@
|
|||||||
.env
|
.env
|
||||||
.venv/
|
.venv/
|
||||||
data/
|
data/
|
||||||
|
!data/branding/
|
||||||
|
!data/branding/**
|
||||||
backend/__pycache__/
|
backend/__pycache__/
|
||||||
**/__pycache__/
|
**/__pycache__/
|
||||||
*.pyc
|
*.pyc
|
||||||
|
|||||||
122
README.md
122
README.md
@@ -1,8 +1,89 @@
|
|||||||
# Magent
|
# Magent
|
||||||
|
|
||||||
AI-powered request timeline for Jellyseerr + Arr stack.
|
Magent is a friendly, AI-assisted request tracker for Jellyseerr + Arr services. It shows a clear timeline of where a request is stuck, explains what is happening in plain English, and offers safe actions to help fix issues.
|
||||||
|
|
||||||
## Backend (FastAPI)
|
## How it works
|
||||||
|
|
||||||
|
1) Requests are pulled from Jellyseerr and stored locally.
|
||||||
|
2) Magent joins that request to Sonarr/Radarr, Prowlarr, qBittorrent, and Jellyfin using TMDB/TVDB IDs and download hashes.
|
||||||
|
3) A state engine normalizes noisy service statuses into a simple, user-friendly state.
|
||||||
|
4) The UI renders a timeline and a central status box for each request.
|
||||||
|
5) Optional AI triage summarizes the likely cause and safest next steps.
|
||||||
|
|
||||||
|
## Core features
|
||||||
|
|
||||||
|
- Request search by title/year or request ID.
|
||||||
|
- Recent requests list with posters and status.
|
||||||
|
- Timeline view across Jellyseerr, Arr, Prowlarr, qBittorrent, Jellyfin.
|
||||||
|
- Central status box with clear reason + next steps.
|
||||||
|
- Safe action buttons (search, resume, re-add, etc.).
|
||||||
|
- Admin settings for service URLs, API keys, profiles, and root folders.
|
||||||
|
- Health status for each service in the pipeline.
|
||||||
|
- Cache and sync controls (full sync, delta sync, scheduled syncs).
|
||||||
|
- Local database for speed and audit history.
|
||||||
|
- Users and access control (admin vs user, block access).
|
||||||
|
- Local account password changes via "My profile".
|
||||||
|
- Docker-first deployment for easy hosting.
|
||||||
|
|
||||||
|
## Quick start (Docker - primary)
|
||||||
|
|
||||||
|
Docker is the recommended way to run Magent. It includes the backend and frontend with sane defaults.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose up --build
|
||||||
|
```
|
||||||
|
|
||||||
|
Then open:
|
||||||
|
|
||||||
|
- Frontend: http://localhost:3000
|
||||||
|
- Backend: http://localhost:8000
|
||||||
|
|
||||||
|
### Docker setup steps
|
||||||
|
|
||||||
|
1) Create `.env` with your service URLs and API keys.
|
||||||
|
2) Run `docker compose up --build`.
|
||||||
|
3) Log in at http://localhost:3000.
|
||||||
|
4) Visit Settings to confirm service health.
|
||||||
|
|
||||||
|
### Docker environment variables (sample)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
JELLYSEERR_URL="http://localhost:5055"
|
||||||
|
JELLYSEERR_API_KEY="..."
|
||||||
|
SONARR_URL="http://localhost:8989"
|
||||||
|
SONARR_API_KEY="..."
|
||||||
|
SONARR_QUALITY_PROFILE_ID="1"
|
||||||
|
SONARR_ROOT_FOLDER="/tv"
|
||||||
|
RADARR_URL="http://localhost:7878"
|
||||||
|
RADARR_API_KEY="..."
|
||||||
|
RADARR_QUALITY_PROFILE_ID="1"
|
||||||
|
RADARR_ROOT_FOLDER="/movies"
|
||||||
|
PROWLARR_URL="http://localhost:9696"
|
||||||
|
PROWLARR_API_KEY="..."
|
||||||
|
QBIT_URL="http://localhost:8080"
|
||||||
|
QBIT_USERNAME="..."
|
||||||
|
QBIT_PASSWORD="..."
|
||||||
|
SQLITE_PATH="data/magent.db"
|
||||||
|
JWT_SECRET="change-me"
|
||||||
|
JWT_EXP_MINUTES="720"
|
||||||
|
ADMIN_USERNAME="admin"
|
||||||
|
ADMIN_PASSWORD="adminadmin"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Screenshots
|
||||||
|
|
||||||
|
Add screenshots here once available:
|
||||||
|
|
||||||
|
- `docs/screenshots/home.png`
|
||||||
|
- `docs/screenshots/request-timeline.png`
|
||||||
|
- `docs/screenshots/settings.png`
|
||||||
|
- `docs/screenshots/profile.png`
|
||||||
|
|
||||||
|
## Local development (secondary)
|
||||||
|
|
||||||
|
Use this only when you need to modify code locally.
|
||||||
|
|
||||||
|
### Backend (FastAPI)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd backend
|
cd backend
|
||||||
@@ -37,7 +118,7 @@ $env:ADMIN_USERNAME="admin"
|
|||||||
$env:ADMIN_PASSWORD="adminadmin"
|
$env:ADMIN_PASSWORD="adminadmin"
|
||||||
```
|
```
|
||||||
|
|
||||||
## Frontend (Next.js)
|
### Frontend (Next.js)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd frontend
|
cd frontend
|
||||||
@@ -49,20 +130,11 @@ Open http://localhost:3000
|
|||||||
|
|
||||||
Admin panel: http://localhost:3000/admin
|
Admin panel: http://localhost:3000/admin
|
||||||
|
|
||||||
Login uses the admin credentials above (or any other user you create in SQLite).
|
Login uses the admin credentials above (or any other local user you create in SQLite).
|
||||||
|
|
||||||
## Docker (Testing)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
docker compose up --build
|
|
||||||
```
|
|
||||||
|
|
||||||
Backend: http://localhost:8000
|
|
||||||
Frontend: http://localhost:3000
|
|
||||||
|
|
||||||
## Public Hosting Notes
|
## Public Hosting Notes
|
||||||
|
|
||||||
The frontend now proxies `/api/*` to the backend container. Set:
|
The frontend proxies `/api/*` to the backend container. Set:
|
||||||
|
|
||||||
- `NEXT_PUBLIC_API_BASE=/api` (browser uses same-origin)
|
- `NEXT_PUBLIC_API_BASE=/api` (browser uses same-origin)
|
||||||
- `BACKEND_INTERNAL_URL=http://backend:8000` (container-to-container)
|
- `BACKEND_INTERNAL_URL=http://backend:8000` (container-to-container)
|
||||||
@@ -73,3 +145,25 @@ If you prefer the browser to call the backend directly, set `NEXT_PUBLIC_API_BAS
|
|||||||
|
|
||||||
- `GET /requests/{id}/history?limit=10` recent snapshots
|
- `GET /requests/{id}/history?limit=10` recent snapshots
|
||||||
- `GET /requests/{id}/actions?limit=10` recent action logs
|
- `GET /requests/{id}/actions?limit=10` recent action logs
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
### Login fails
|
||||||
|
|
||||||
|
- Make sure `ADMIN_USERNAME` and `ADMIN_PASSWORD` are set in `.env`.
|
||||||
|
- Confirm the backend is reachable: `http://localhost:8000/health` (or see container logs).
|
||||||
|
|
||||||
|
### Services show as down
|
||||||
|
|
||||||
|
- Check the URLs and API keys in Settings.
|
||||||
|
- Verify containers can reach each service (network/DNS).
|
||||||
|
|
||||||
|
### No recent requests
|
||||||
|
|
||||||
|
- Confirm Jellyseerr credentials in Settings.
|
||||||
|
- Run a full sync from Settings -> Requests.
|
||||||
|
|
||||||
|
### Docker images not updating
|
||||||
|
|
||||||
|
- Run `docker compose up --build` again.
|
||||||
|
- If needed, run `docker compose down` first, then rebuild.
|
||||||
|
|||||||
@@ -5,10 +5,11 @@ WORKDIR /app
|
|||||||
ENV PYTHONDONTWRITEBYTECODE=1 \
|
ENV PYTHONDONTWRITEBYTECODE=1 \
|
||||||
PYTHONUNBUFFERED=1
|
PYTHONUNBUFFERED=1
|
||||||
|
|
||||||
COPY requirements.txt .
|
COPY backend/requirements.txt .
|
||||||
RUN pip install --no-cache-dir -r requirements.txt
|
RUN pip install --no-cache-dir -r requirements.txt
|
||||||
|
|
||||||
COPY app ./app
|
COPY backend/app ./app
|
||||||
|
COPY data/branding /app/data/branding
|
||||||
|
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
|
|
||||||
|
|||||||
@@ -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="Add it to the library queue",
|
title="Push to Sonarr/Radarr",
|
||||||
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",
|
||||||
)
|
)
|
||||||
|
|||||||
BIN
backend/app/assets/branding/favicon.ico
Normal file
BIN
backend/app/assets/branding/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.8 KiB |
BIN
backend/app/assets/branding/logo.png
Normal file
BIN
backend/app/assets/branding/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
@@ -1,15 +1,28 @@
|
|||||||
from typing import Dict, Any
|
from typing import Dict, Any
|
||||||
|
|
||||||
from fastapi import Depends, HTTPException, status
|
from fastapi import Depends, HTTPException, status, Request
|
||||||
from fastapi.security import OAuth2PasswordBearer
|
from fastapi.security import OAuth2PasswordBearer
|
||||||
|
|
||||||
from .db import get_user_by_username
|
from .db import get_user_by_username, upsert_user_activity
|
||||||
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:
|
||||||
@@ -25,10 +38,16 @@ def get_current_user(token: str = Depends(oauth2_scheme)) -> Dict[str, Any]:
|
|||||||
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"),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
2
backend/app/build_info.py
Normal file
2
backend/app/build_info.py
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
BUILD_NUMBER = "2901262244"
|
||||||
|
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'
|
||||||
@@ -58,3 +58,13 @@ 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,3 +35,12 @@ 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,5 +1,6 @@
|
|||||||
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
|
||||||
|
|
||||||
|
|
||||||
@@ -8,6 +9,7 @@ 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)
|
||||||
@@ -56,6 +58,9 @@ class QBittorrentClient(ApiClient):
|
|||||||
async def get_torrents_by_hashes(self, hashes: str) -> Optional[Any]:
|
async def get_torrents_by_hashes(self, hashes: str) -> Optional[Any]:
|
||||||
return await self._get("/api/v2/torrents/info", params={"hashes": hashes})
|
return await self._get("/api/v2/torrents/info", params={"hashes": hashes})
|
||||||
|
|
||||||
|
async def get_torrents_by_category(self, category: str) -> Optional[Any]:
|
||||||
|
return await self._get("/api/v2/torrents/info", params={"category": category})
|
||||||
|
|
||||||
async def get_app_version(self) -> Optional[Any]:
|
async def get_app_version(self) -> Optional[Any]:
|
||||||
return await self._get_text("/api/v2/app/version")
|
return await self._get_text("/api/v2/app/version")
|
||||||
|
|
||||||
@@ -67,3 +72,17 @@ class QBittorrentClient(ApiClient):
|
|||||||
await self._post_form("/api/v2/torrents/start", data={"hashes": hashes})
|
await self._post_form("/api/v2/torrents/start", data={"hashes": hashes})
|
||||||
return
|
return
|
||||||
raise
|
raise
|
||||||
|
|
||||||
|
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}
|
||||||
|
if category:
|
||||||
|
data["category"] = category
|
||||||
|
await self._post_form("/api/v2/torrents/add", data=data)
|
||||||
|
|||||||
@@ -21,6 +21,9 @@ 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]})
|
||||||
|
|
||||||
@@ -43,3 +46,12 @@ class RadarrClient(ApiClient):
|
|||||||
|
|
||||||
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},
|
||||||
|
)
|
||||||
|
|||||||
@@ -18,6 +18,9 @@ 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})
|
||||||
|
|
||||||
@@ -50,3 +53,12 @@ class SonarrClient(ApiClient):
|
|||||||
|
|
||||||
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,6 +2,7 @@ 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="")
|
||||||
@@ -38,6 +39,17 @@ 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")
|
||||||
@@ -70,6 +82,10 @@ 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")
|
||||||
@@ -83,6 +99,10 @@ 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")
|
||||||
@@ -101,5 +121,10 @@ class Settings(BaseSettings):
|
|||||||
default=None, validation_alias=AliasChoices("QBIT_PASSWORD", "QBITTORRENT_PASSWORD")
|
default=None, validation_alias=AliasChoices("QBIT_PASSWORD", "QBITTORRENT_PASSWORD")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
discord_webhook_url: Optional[str] = Field(
|
||||||
|
default="https://discord.com/api/webhooks/1464141924775629033/O_rvCAmIKowR04tyAN54IuMPcQFEiT-ustU3udDaMTlF62PmoI6w4-52H3ZQcjgHQOgt",
|
||||||
|
validation_alias=AliasChoices("DISCORD_WEBHOOK_URL"),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
settings = Settings()
|
settings = Settings()
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -17,6 +17,8 @@ from .routers.admin import router as admin_router
|
|||||||
from .routers.images import router as images_router
|
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.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
|
||||||
@@ -54,3 +56,5 @@ app.include_router(admin_router)
|
|||||||
app.include_router(images_router)
|
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(site_router)
|
||||||
|
|||||||
@@ -1,16 +1,25 @@
|
|||||||
from typing import Any, Dict, List
|
from typing import Any, Dict, List, Optional
|
||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from fastapi import APIRouter, HTTPException, Depends, UploadFile, File
|
from fastapi import APIRouter, HTTPException, Depends, UploadFile, File
|
||||||
|
|
||||||
from ..auth import require_admin
|
from ..auth import require_admin, get_current_user
|
||||||
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_password,
|
set_user_password,
|
||||||
@@ -20,6 +29,9 @@ 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
|
||||||
@@ -27,6 +39,14 @@ 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
|
||||||
@@ -56,10 +76,12 @@ 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",
|
||||||
@@ -74,8 +96,17 @@ 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 _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 []
|
||||||
@@ -91,6 +122,38 @@ def _normalize_root_folders(folders: Any) -> List[Dict[str, Any]]:
|
|||||||
return results
|
return results
|
||||||
|
|
||||||
|
|
||||||
|
async def _hydrate_cache_titles_from_jellyseerr(limit: int) -> int:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
|
if not client.configured():
|
||||||
|
return 0
|
||||||
|
missing = get_request_cache_missing_titles(limit)
|
||||||
|
if not missing:
|
||||||
|
return 0
|
||||||
|
hydrated = 0
|
||||||
|
for row in missing:
|
||||||
|
tmdb_id = row.get("tmdb_id")
|
||||||
|
media_type = row.get("media_type")
|
||||||
|
request_id = row.get("request_id")
|
||||||
|
if not tmdb_id or not media_type or not request_id:
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
title, year = await requests_router._hydrate_title_from_tmdb(
|
||||||
|
client, media_type, tmdb_id
|
||||||
|
)
|
||||||
|
except Exception:
|
||||||
|
logger.warning(
|
||||||
|
"Requests cache title hydrate failed: request_id=%s tmdb_id=%s",
|
||||||
|
request_id,
|
||||||
|
tmdb_id,
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
if title:
|
||||||
|
update_request_cache_title(request_id, title, year)
|
||||||
|
hydrated += 1
|
||||||
|
return hydrated
|
||||||
|
|
||||||
|
|
||||||
def _normalize_quality_profiles(profiles: Any) -> List[Dict[str, Any]]:
|
def _normalize_quality_profiles(profiles: Any) -> List[Dict[str, Any]]:
|
||||||
if not isinstance(profiles, list):
|
if not isinstance(profiles, list):
|
||||||
return []
|
return []
|
||||||
@@ -180,6 +243,9 @@ 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():
|
||||||
@@ -187,18 +253,7 @@ 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 = []
|
results = save_jellyfin_users_cache(users)
|
||||||
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}
|
||||||
|
|
||||||
|
|
||||||
@@ -207,6 +262,106 @@ 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]:
|
||||||
@@ -235,10 +390,12 @@ async def requests_sync_delta() -> Dict[str, Any]:
|
|||||||
|
|
||||||
|
|
||||||
@router.post("/requests/artwork/prefetch")
|
@router.post("/requests/artwork/prefetch")
|
||||||
async def requests_artwork_prefetch() -> Dict[str, Any]:
|
async def requests_artwork_prefetch(only_missing: bool = False) -> Dict[str, Any]:
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
state = await requests_router.start_artwork_prefetch(
|
state = await requests_router.start_artwork_prefetch(
|
||||||
runtime.jellyseerr_base_url, runtime.jellyseerr_api_key
|
runtime.jellyseerr_base_url,
|
||||||
|
runtime.jellyseerr_api_key,
|
||||||
|
only_missing=only_missing,
|
||||||
)
|
)
|
||||||
logger.info("Admin triggered artwork prefetch: status=%s", state.get("status"))
|
logger.info("Admin triggered artwork prefetch: status=%s", state.get("status"))
|
||||||
return {"status": "ok", "prefetch": state}
|
return {"status": "ok", "prefetch": state}
|
||||||
@@ -248,6 +405,25 @@ async def requests_artwork_prefetch() -> Dict[str, Any]:
|
|||||||
async def requests_artwork_status() -> Dict[str, Any]:
|
async def requests_artwork_status() -> Dict[str, Any]:
|
||||||
return {"status": "ok", "prefetch": requests_router.get_artwork_prefetch_state()}
|
return {"status": "ok", "prefetch": requests_router.get_artwork_prefetch_state()}
|
||||||
|
|
||||||
|
@router.get("/requests/artwork/summary")
|
||||||
|
async def requests_artwork_summary() -> Dict[str, Any]:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
cache_mode = (runtime.artwork_cache_mode or "remote").lower()
|
||||||
|
stats = get_request_cache_stats()
|
||||||
|
if cache_mode != "cache":
|
||||||
|
stats["cache_bytes"] = 0
|
||||||
|
stats["cache_files"] = 0
|
||||||
|
stats["missing_artwork"] = 0
|
||||||
|
summary = {
|
||||||
|
"cache_mode": cache_mode,
|
||||||
|
"cache_bytes": stats.get("cache_bytes", 0),
|
||||||
|
"cache_files": stats.get("cache_files", 0),
|
||||||
|
"missing_artwork": stats.get("missing_artwork", 0),
|
||||||
|
"total_requests": stats.get("total_requests", 0),
|
||||||
|
"updated_at": stats.get("updated_at"),
|
||||||
|
}
|
||||||
|
return {"status": "ok", "summary": summary}
|
||||||
|
|
||||||
|
|
||||||
@router.get("/requests/sync/status")
|
@router.get("/requests/sync/status")
|
||||||
async def requests_sync_status() -> Dict[str, Any]:
|
async def requests_sync_status() -> Dict[str, Any]:
|
||||||
@@ -274,7 +450,48 @@ 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]:
|
||||||
return {"rows": get_request_cache_overview(limit)}
|
repaired = repair_request_cache_titles()
|
||||||
|
if repaired:
|
||||||
|
logger.info("Requests cache titles repaired via settings view: %s", repaired)
|
||||||
|
hydrated = await _hydrate_cache_titles_from_jellyseerr(limit)
|
||||||
|
if hydrated:
|
||||||
|
logger.info("Requests cache titles hydrated via Jellyseerr: %s", hydrated)
|
||||||
|
rows = get_request_cache_overview(limit)
|
||||||
|
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")
|
||||||
@@ -326,9 +543,39 @@ 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 = get_all_users()
|
users = [user for user in get_all_users() if user.get("role") == "admin" or user.get("auth_provider") == "jellyseerr"]
|
||||||
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]:
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
|
||||||
from fastapi import APIRouter, HTTPException, status, Depends
|
from fastapi import APIRouter, HTTPException, status, Depends
|
||||||
from fastapi.security import OAuth2PasswordRequestForm
|
from fastapi.security import OAuth2PasswordRequestForm
|
||||||
|
|
||||||
@@ -7,16 +9,77 @@ from ..db import (
|
|||||||
set_last_login,
|
set_last_login,
|
||||||
get_user_by_username,
|
get_user_by_username,
|
||||||
set_user_password,
|
set_user_password,
|
||||||
|
set_jellyfin_auth_cache,
|
||||||
|
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
|
from ..security import create_access_token, verify_password
|
||||||
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:
|
||||||
user = verify_user_password(form_data.username, form_data.password)
|
user = verify_user_password(form_data.username, form_data.password)
|
||||||
@@ -39,30 +102,47 @@ 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(form_data.username, form_data.password)
|
response = await client.authenticate_by_name(username, password)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=str(exc)) from exc
|
raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=str(exc)) from exc
|
||||||
if not isinstance(response, dict) or not response.get("User"):
|
if not isinstance(response, dict) or not response.get("User"):
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyfin credentials")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyfin credentials")
|
||||||
create_user_if_missing(form_data.username, "jellyfin-user", role="user", auth_provider="jellyfin")
|
create_user_if_missing(username, "jellyfin-user", role="user", auth_provider="jellyfin")
|
||||||
user = get_user_by_username(form_data.username)
|
user = get_user_by_username(username)
|
||||||
if user and user.get("is_blocked"):
|
if user and user.get("is_blocked"):
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
||||||
try:
|
try:
|
||||||
users = await client.get_users()
|
users = await client.get_users()
|
||||||
if isinstance(users, list):
|
if isinstance(users, list):
|
||||||
for user in users:
|
save_jellyfin_users_cache(users)
|
||||||
if not isinstance(user, dict):
|
for jellyfin_user in users:
|
||||||
|
if not isinstance(jellyfin_user, dict):
|
||||||
continue
|
continue
|
||||||
name = user.get("Name")
|
name = jellyfin_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
|
||||||
token = create_access_token(form_data.username, "user")
|
set_jellyfin_auth_cache(username, password)
|
||||||
set_last_login(form_data.username)
|
if user and user.get("jellyseerr_user_id") is None and candidate_map:
|
||||||
return {"access_token": token, "token_type": "bearer", "user": {"username": form_data.username, "role": "user"}}
|
matched_id = match_jellyseerr_user_id(username, candidate_map)
|
||||||
|
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")
|
||||||
@@ -78,10 +158,19 @@ 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")
|
||||||
create_user_if_missing(form_data.username, "jellyseerr-user", role="user", auth_provider="jellyseerr")
|
jellyseerr_user_id = _extract_jellyseerr_user_id(response)
|
||||||
|
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"}}
|
||||||
@@ -92,6 +181,32 @@ 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":
|
||||||
|
|||||||
@@ -4,13 +4,17 @@ from typing import Any, Dict
|
|||||||
|
|
||||||
from fastapi import APIRouter, HTTPException, UploadFile, File
|
from fastapi import APIRouter, HTTPException, UploadFile, File
|
||||||
from fastapi.responses import FileResponse
|
from fastapi.responses import FileResponse
|
||||||
from PIL import Image
|
from PIL import Image, ImageDraw, ImageFont
|
||||||
|
|
||||||
router = APIRouter(prefix="/branding", tags=["branding"])
|
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:
|
||||||
@@ -23,20 +27,86 @@ def _resize_image(image: Image.Image, max_size: int = 300) -> Image.Image:
|
|||||||
return image
|
return image
|
||||||
|
|
||||||
|
|
||||||
|
def _load_font(size: int) -> ImageFont.ImageFont:
|
||||||
|
candidates = [
|
||||||
|
"/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf",
|
||||||
|
"/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
|
||||||
|
]
|
||||||
|
for path in candidates:
|
||||||
|
if os.path.exists(path):
|
||||||
|
try:
|
||||||
|
return ImageFont.truetype(path, size)
|
||||||
|
except OSError:
|
||||||
|
continue
|
||||||
|
return ImageFont.load_default()
|
||||||
|
|
||||||
|
|
||||||
|
def _ensure_default_branding() -> None:
|
||||||
|
if os.path.exists(_LOGO_PATH) and os.path.exists(_FAVICON_PATH):
|
||||||
|
return
|
||||||
|
_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):
|
||||||
|
image = Image.new("RGBA", (300, 300), (12, 18, 28, 255))
|
||||||
|
draw = ImageDraw.Draw(image)
|
||||||
|
font = _load_font(160)
|
||||||
|
text = "M"
|
||||||
|
box = draw.textbbox((0, 0), text, font=font)
|
||||||
|
text_w = box[2] - box[0]
|
||||||
|
text_h = box[3] - box[1]
|
||||||
|
draw.text(
|
||||||
|
((300 - text_w) / 2, (300 - text_h) / 2 - 6),
|
||||||
|
text,
|
||||||
|
font=font,
|
||||||
|
fill=(255, 255, 255, 255),
|
||||||
|
)
|
||||||
|
image.save(_LOGO_PATH, format="PNG")
|
||||||
|
if not os.path.exists(_FAVICON_PATH):
|
||||||
|
favicon = Image.open(_LOGO_PATH).copy()
|
||||||
|
favicon.thumbnail((64, 64))
|
||||||
|
try:
|
||||||
|
favicon.save(_FAVICON_PATH, format="ICO", sizes=[(32, 32), (64, 64)])
|
||||||
|
except OSError:
|
||||||
|
favicon.save(_FAVICON_PATH, format="ICO")
|
||||||
|
|
||||||
|
|
||||||
|
def _resolve_branding_paths() -> tuple[str, str]:
|
||||||
|
if _BRANDING_SOURCE == "data":
|
||||||
|
_ensure_default_branding()
|
||||||
|
return _LOGO_PATH, _FAVICON_PATH
|
||||||
|
if os.path.exists(_BUNDLED_LOGO_PATH) and os.path.exists(_BUNDLED_FAVICON_PATH):
|
||||||
|
return _BUNDLED_LOGO_PATH, _BUNDLED_FAVICON_PATH
|
||||||
|
_ensure_default_branding()
|
||||||
|
return _LOGO_PATH, _FAVICON_PATH
|
||||||
|
|
||||||
|
|
||||||
@router.get("/logo.png")
|
@router.get("/logo.png")
|
||||||
async def branding_logo() -> FileResponse:
|
async def branding_logo() -> FileResponse:
|
||||||
if not os.path.exists(_LOGO_PATH):
|
logo_path, _ = _resolve_branding_paths()
|
||||||
|
if not os.path.exists(logo_path):
|
||||||
raise HTTPException(status_code=404, detail="Logo not found")
|
raise HTTPException(status_code=404, detail="Logo not found")
|
||||||
headers = {"Cache-Control": "public, max-age=300"}
|
headers = {"Cache-Control": "no-store"}
|
||||||
return FileResponse(_LOGO_PATH, media_type="image/png", headers=headers)
|
return FileResponse(logo_path, media_type="image/png", headers=headers)
|
||||||
|
|
||||||
|
|
||||||
@router.get("/favicon.ico")
|
@router.get("/favicon.ico")
|
||||||
async def branding_favicon() -> FileResponse:
|
async def branding_favicon() -> FileResponse:
|
||||||
if not os.path.exists(_FAVICON_PATH):
|
_, favicon_path = _resolve_branding_paths()
|
||||||
|
if not os.path.exists(favicon_path):
|
||||||
raise HTTPException(status_code=404, detail="Favicon not found")
|
raise HTTPException(status_code=404, detail="Favicon not found")
|
||||||
headers = {"Cache-Control": "public, max-age=300"}
|
headers = {"Cache-Control": "no-store"}
|
||||||
return FileResponse(_FAVICON_PATH, media_type="image/x-icon", headers=headers)
|
return FileResponse(favicon_path, media_type="image/x-icon", headers=headers)
|
||||||
|
|
||||||
|
|
||||||
async def save_branding_image(file: UploadFile) -> Dict[str, Any]:
|
async def save_branding_image(file: UploadFile) -> Dict[str, Any]:
|
||||||
|
|||||||
38
backend/app/routers/feedback.py
Normal file
38
backend/app/routers/feedback.py
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
from typing import Any, Dict
|
||||||
|
import httpx
|
||||||
|
from fastapi import APIRouter, Depends, HTTPException
|
||||||
|
|
||||||
|
from ..auth import get_current_user
|
||||||
|
from ..runtime import get_runtime_settings
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/feedback", tags=["feedback"], dependencies=[Depends(get_current_user)])
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("")
|
||||||
|
async def send_feedback(payload: Dict[str, Any], user: Dict[str, str] = Depends(get_current_user)) -> dict:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
webhook_url = runtime.discord_webhook_url
|
||||||
|
if not webhook_url:
|
||||||
|
raise HTTPException(status_code=400, detail="Discord webhook not configured")
|
||||||
|
|
||||||
|
feedback_type = str(payload.get("type") or "").strip().lower()
|
||||||
|
if feedback_type not in {"bug", "feature"}:
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid feedback type")
|
||||||
|
|
||||||
|
message = str(payload.get("message") or "").strip()
|
||||||
|
if not message:
|
||||||
|
raise HTTPException(status_code=400, detail="Message is required")
|
||||||
|
if len(message) > 2000:
|
||||||
|
raise HTTPException(status_code=400, detail="Message is too long")
|
||||||
|
|
||||||
|
username = user.get("username") or "unknown"
|
||||||
|
content = f"**{feedback_type.title()}** from **{username}**\n{message}"
|
||||||
|
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
||||||
|
response = await client.post(webhook_url, json={"content": content})
|
||||||
|
response.raise_for_status()
|
||||||
|
except httpx.HTTPStatusError as exc:
|
||||||
|
raise HTTPException(status_code=502, detail=str(exc)) from exc
|
||||||
|
|
||||||
|
return {"status": "ok"}
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import mimetypes
|
import mimetypes
|
||||||
|
import logging
|
||||||
|
from typing import Optional
|
||||||
from fastapi import APIRouter, HTTPException, Response
|
from fastapi import APIRouter, HTTPException, Response
|
||||||
from fastapi.responses import FileResponse, RedirectResponse
|
from fastapi.responses import FileResponse, RedirectResponse
|
||||||
import httpx
|
import httpx
|
||||||
@@ -11,6 +13,7 @@ router = APIRouter(prefix="/images", tags=["images"])
|
|||||||
|
|
||||||
_TMDB_BASE = "https://image.tmdb.org/t/p"
|
_TMDB_BASE = "https://image.tmdb.org/t/p"
|
||||||
_ALLOWED_SIZES = {"w92", "w154", "w185", "w342", "w500", "w780", "original"}
|
_ALLOWED_SIZES = {"w92", "w154", "w185", "w342", "w500", "w780", "original"}
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
def _safe_filename(path: str) -> str:
|
def _safe_filename(path: str) -> str:
|
||||||
@@ -19,13 +22,24 @@ def _safe_filename(path: str) -> str:
|
|||||||
safe = re.sub(r"[^A-Za-z0-9_.-]", "_", trimmed)
|
safe = re.sub(r"[^A-Za-z0-9_.-]", "_", trimmed)
|
||||||
return safe or "image"
|
return safe or "image"
|
||||||
|
|
||||||
|
def tmdb_cache_path(path: str, size: str) -> Optional[str]:
|
||||||
async def cache_tmdb_image(path: str, size: str = "w342") -> bool:
|
|
||||||
if not path or "://" in path or ".." in path:
|
if not path or "://" in path or ".." in path:
|
||||||
return False
|
return None
|
||||||
if not path.startswith("/"):
|
if not path.startswith("/"):
|
||||||
path = f"/{path}"
|
path = f"/{path}"
|
||||||
if size not in _ALLOWED_SIZES:
|
if size not in _ALLOWED_SIZES:
|
||||||
|
return None
|
||||||
|
cache_dir = os.path.join(os.getcwd(), "data", "artwork", "tmdb", size)
|
||||||
|
return os.path.join(cache_dir, _safe_filename(path))
|
||||||
|
|
||||||
|
|
||||||
|
def is_tmdb_cached(path: str, size: str) -> bool:
|
||||||
|
file_path = tmdb_cache_path(path, size)
|
||||||
|
return bool(file_path and os.path.exists(file_path))
|
||||||
|
|
||||||
|
|
||||||
|
async def cache_tmdb_image(path: str, size: str = "w342") -> bool:
|
||||||
|
if not path or "://" in path or ".." in path:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
@@ -33,9 +47,10 @@ async def cache_tmdb_image(path: str, size: str = "w342") -> bool:
|
|||||||
if cache_mode != "cache":
|
if cache_mode != "cache":
|
||||||
return False
|
return False
|
||||||
|
|
||||||
cache_dir = os.path.join(os.getcwd(), "data", "artwork", "tmdb", size)
|
file_path = tmdb_cache_path(path, size)
|
||||||
os.makedirs(cache_dir, exist_ok=True)
|
if not file_path:
|
||||||
file_path = os.path.join(cache_dir, _safe_filename(path))
|
return False
|
||||||
|
os.makedirs(os.path.dirname(file_path), exist_ok=True)
|
||||||
if os.path.exists(file_path):
|
if os.path.exists(file_path):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@@ -64,9 +79,10 @@ async def tmdb_image(path: str, size: str = "w342"):
|
|||||||
if cache_mode != "cache":
|
if cache_mode != "cache":
|
||||||
return RedirectResponse(url=url)
|
return RedirectResponse(url=url)
|
||||||
|
|
||||||
cache_dir = os.path.join(os.getcwd(), "data", "artwork", "tmdb", size)
|
file_path = tmdb_cache_path(path, size)
|
||||||
os.makedirs(cache_dir, exist_ok=True)
|
if not file_path:
|
||||||
file_path = os.path.join(cache_dir, _safe_filename(path))
|
raise HTTPException(status_code=400, detail="Invalid image path")
|
||||||
|
os.makedirs(os.path.dirname(file_path), exist_ok=True)
|
||||||
headers = {"Cache-Control": "public, max-age=86400"}
|
headers = {"Cache-Control": "public, max-age=86400"}
|
||||||
if os.path.exists(file_path):
|
if os.path.exists(file_path):
|
||||||
media_type = mimetypes.guess_type(file_path)[0] or "image/jpeg"
|
media_type = mimetypes.guess_type(file_path)[0] or "image/jpeg"
|
||||||
@@ -77,6 +93,8 @@ async def tmdb_image(path: str, size: str = "w342"):
|
|||||||
if os.path.exists(file_path):
|
if os.path.exists(file_path):
|
||||||
media_type = mimetypes.guess_type(file_path)[0] or "image/jpeg"
|
media_type = mimetypes.guess_type(file_path)[0] or "image/jpeg"
|
||||||
return FileResponse(file_path, media_type=media_type, headers=headers)
|
return FileResponse(file_path, media_type=media_type, headers=headers)
|
||||||
raise HTTPException(status_code=502, detail="Image cache failed")
|
logger.warning("TMDB cache miss after fetch: path=%s size=%s", path, size)
|
||||||
except httpx.HTTPError as exc:
|
except (httpx.HTTPError, OSError) as exc:
|
||||||
raise HTTPException(status_code=502, detail=f"Image fetch failed: {exc}") from exc
|
logger.warning("TMDB cache failed: path=%s size=%s error=%s", path, size, exc)
|
||||||
|
|
||||||
|
return RedirectResponse(url=url)
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
39
backend/app/routers/site.py
Normal file
39
backend/app/routers/site.py
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
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
|
from fastapi import APIRouter, Depends, HTTPException
|
||||||
|
|
||||||
from ..auth import get_current_user
|
from ..auth import get_current_user
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
@@ -93,3 +93,42 @@ async def services_status() -> Dict[str, Any]:
|
|||||||
overall = "degraded"
|
overall = "degraded"
|
||||||
|
|
||||||
return {"overall": overall, "services": services}
|
return {"overall": overall, "services": services}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/services/{service}/test")
|
||||||
|
async def test_service(service: str) -> Dict[str, Any]:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
jellyseerr = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
|
sonarr = SonarrClient(runtime.sonarr_base_url, runtime.sonarr_api_key)
|
||||||
|
radarr = RadarrClient(runtime.radarr_base_url, runtime.radarr_api_key)
|
||||||
|
prowlarr = ProwlarrClient(runtime.prowlarr_base_url, runtime.prowlarr_api_key)
|
||||||
|
qbittorrent = QBittorrentClient(
|
||||||
|
runtime.qbittorrent_base_url, runtime.qbittorrent_username, runtime.qbittorrent_password
|
||||||
|
)
|
||||||
|
jellyfin = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
||||||
|
|
||||||
|
service_key = service.strip().lower()
|
||||||
|
checks = {
|
||||||
|
"jellyseerr": (
|
||||||
|
"Jellyseerr",
|
||||||
|
jellyseerr.configured(),
|
||||||
|
lambda: jellyseerr.get_recent_requests(take=1, skip=0),
|
||||||
|
),
|
||||||
|
"sonarr": ("Sonarr", sonarr.configured(), sonarr.get_system_status),
|
||||||
|
"radarr": ("Radarr", radarr.configured(), radarr.get_system_status),
|
||||||
|
"prowlarr": ("Prowlarr", prowlarr.configured(), prowlarr.get_health),
|
||||||
|
"qbittorrent": ("qBittorrent", qbittorrent.configured(), qbittorrent.get_app_version),
|
||||||
|
"jellyfin": ("Jellyfin", jellyfin.configured(), jellyfin.get_system_info),
|
||||||
|
}
|
||||||
|
|
||||||
|
if service_key not in checks:
|
||||||
|
raise HTTPException(status_code=404, detail="Unknown service")
|
||||||
|
|
||||||
|
name, configured, func = checks[service_key]
|
||||||
|
result = await _check(name, configured, func)
|
||||||
|
if name == "Prowlarr" and result.get("status") == "up":
|
||||||
|
health = result.get("detail")
|
||||||
|
if isinstance(health, list) and health:
|
||||||
|
result["status"] = "degraded"
|
||||||
|
result["message"] = "Health warnings"
|
||||||
|
return result
|
||||||
|
|||||||
@@ -12,7 +12,9 @@ _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():
|
||||||
@@ -21,6 +23,8 @@ 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,8 +3,14 @@ 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
|
from ..db import create_user_if_missing, set_user_jellyseerr_id
|
||||||
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__)
|
||||||
|
|
||||||
@@ -17,6 +23,9 @@ 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):
|
||||||
@@ -24,8 +33,18 @@ async def sync_jellyfin_users() -> int:
|
|||||||
name = user.get("Name")
|
name = user.get("Name")
|
||||||
if not name:
|
if not name:
|
||||||
continue
|
continue
|
||||||
if create_user_if_missing(name, "jellyfin-user", role="user", auth_provider="jellyfin"):
|
matched_id = match_jellyseerr_user_id(name, candidate_map) if candidate_map else None
|
||||||
|
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,9 +11,21 @@ from ..clients.radarr import RadarrClient
|
|||||||
from ..clients.prowlarr import ProwlarrClient
|
from ..clients.prowlarr import ProwlarrClient
|
||||||
from ..clients.qbittorrent import QBittorrentClient
|
from ..clients.qbittorrent import QBittorrentClient
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
from ..db import save_snapshot, get_request_cache_payload
|
from ..db import (
|
||||||
|
save_snapshot,
|
||||||
|
get_request_cache_payload,
|
||||||
|
get_request_cache_by_id,
|
||||||
|
get_recent_snapshots,
|
||||||
|
get_setting,
|
||||||
|
set_setting,
|
||||||
|
)
|
||||||
from ..models import ActionOption, NormalizedState, RequestType, Snapshot, TimelineHop
|
from ..models import ActionOption, NormalizedState, RequestType, Snapshot, TimelineHop
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
JELLYFIN_SCAN_COOLDOWN_SECONDS = 300
|
||||||
|
_jellyfin_scan_key = "jellyfin_scan_last_at"
|
||||||
|
|
||||||
|
|
||||||
STATUS_LABELS = {
|
STATUS_LABELS = {
|
||||||
1: "Waiting for approval",
|
1: "Waiting for approval",
|
||||||
@@ -41,6 +53,35 @@ 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")
|
||||||
@@ -185,7 +226,21 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
logging.getLogger(__name__).debug(
|
logging.getLogger(__name__).debug(
|
||||||
"snapshot cache miss: request_id=%s mode=%s", request_id, mode
|
"snapshot cache miss: request_id=%s mode=%s", request_id, mode
|
||||||
)
|
)
|
||||||
|
if cached_request is not None:
|
||||||
|
cache_meta = get_request_cache_by_id(int(request_id))
|
||||||
|
cached_title = cache_meta.get("title") if cache_meta else None
|
||||||
|
if cached_title and isinstance(cached_request, dict):
|
||||||
|
media = cached_request.get("media")
|
||||||
|
if not isinstance(media, dict):
|
||||||
|
media = {}
|
||||||
|
cached_request["media"] = media
|
||||||
|
if not media.get("title") and not media.get("name"):
|
||||||
|
media["title"] = cached_title
|
||||||
|
media["name"] = cached_title
|
||||||
|
if not cached_request.get("title") and not cached_request.get("name"):
|
||||||
|
cached_request["title"] = cached_title
|
||||||
|
|
||||||
|
allow_remote = mode == "always_js" and jellyseerr.configured()
|
||||||
if not jellyseerr.configured() and not cached_request:
|
if not jellyseerr.configured() and not cached_request:
|
||||||
timeline.append(TimelineHop(service="Jellyseerr", status="not_configured"))
|
timeline.append(TimelineHop(service="Jellyseerr", status="not_configured"))
|
||||||
timeline.append(TimelineHop(service="Sonarr/Radarr", status="not_configured"))
|
timeline.append(TimelineHop(service="Sonarr/Radarr", status="not_configured"))
|
||||||
@@ -193,9 +248,15 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
timeline.append(TimelineHop(service="qBittorrent", status="not_configured"))
|
timeline.append(TimelineHop(service="qBittorrent", status="not_configured"))
|
||||||
snapshot.timeline = timeline
|
snapshot.timeline = timeline
|
||||||
return snapshot
|
return snapshot
|
||||||
|
if cached_request is None and not allow_remote:
|
||||||
|
timeline.append(TimelineHop(service="Jellyseerr", status="cache_miss"))
|
||||||
|
snapshot.timeline = timeline
|
||||||
|
snapshot.state = NormalizedState.unknown
|
||||||
|
snapshot.state_reason = "Request not found in cache"
|
||||||
|
return snapshot
|
||||||
|
|
||||||
jelly_request = cached_request
|
jelly_request = cached_request
|
||||||
if (jelly_request is None or mode == "always_js") and jellyseerr.configured():
|
if allow_remote and (jelly_request is None or mode == "always_js"):
|
||||||
try:
|
try:
|
||||||
jelly_request = await jellyseerr.get_request(request_id)
|
jelly_request = await jellyseerr.get_request(request_id)
|
||||||
logging.getLogger(__name__).debug(
|
logging.getLogger(__name__).debug(
|
||||||
@@ -218,17 +279,25 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
jelly_status = jelly_request.get("status", "unknown")
|
jelly_status = jelly_request.get("status", "unknown")
|
||||||
jelly_status_label = _status_label(jelly_status)
|
jelly_status_label = _status_label(jelly_status)
|
||||||
jelly_type = jelly_request.get("type") or "unknown"
|
jelly_type = jelly_request.get("type") or "unknown"
|
||||||
snapshot.title = jelly_request.get("media", {}).get("title", "Unknown")
|
|
||||||
snapshot.year = jelly_request.get("media", {}).get("year")
|
|
||||||
snapshot.request_type = RequestType(jelly_type) if jelly_type in {"movie", "tv"} else RequestType.unknown
|
|
||||||
media = jelly_request.get("media", {}) if isinstance(jelly_request, dict) else {}
|
media = jelly_request.get("media", {}) if isinstance(jelly_request, dict) else {}
|
||||||
|
if not isinstance(media, dict):
|
||||||
|
media = {}
|
||||||
|
snapshot.title = (
|
||||||
|
media.get("title")
|
||||||
|
or media.get("name")
|
||||||
|
or jelly_request.get("title")
|
||||||
|
or jelly_request.get("name")
|
||||||
|
or "Unknown"
|
||||||
|
)
|
||||||
|
snapshot.year = media.get("year") or jelly_request.get("year")
|
||||||
|
snapshot.request_type = RequestType(jelly_type) if jelly_type in {"movie", "tv"} else RequestType.unknown
|
||||||
poster_path = None
|
poster_path = None
|
||||||
backdrop_path = None
|
backdrop_path = None
|
||||||
if isinstance(media, dict):
|
if isinstance(media, dict):
|
||||||
poster_path = media.get("posterPath") or media.get("poster_path")
|
poster_path = media.get("posterPath") or media.get("poster_path")
|
||||||
backdrop_path = media.get("backdropPath") or media.get("backdrop_path")
|
backdrop_path = media.get("backdropPath") or media.get("backdrop_path")
|
||||||
|
|
||||||
if snapshot.title in {None, "", "Unknown"} and jellyseerr.configured():
|
if snapshot.title in {None, "", "Unknown"} and allow_remote:
|
||||||
tmdb_id = jelly_request.get("media", {}).get("tmdbId")
|
tmdb_id = jelly_request.get("media", {}).get("tmdbId")
|
||||||
if tmdb_id:
|
if tmdb_id:
|
||||||
try:
|
try:
|
||||||
@@ -381,10 +450,6 @@ 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))
|
||||||
|
|
||||||
@@ -465,9 +530,14 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
try:
|
try:
|
||||||
download_ids = _download_ids(_queue_records(arr_queue))
|
download_ids = _download_ids(_queue_records(arr_queue))
|
||||||
torrent_list: List[Dict[str, Any]] = []
|
torrent_list: List[Dict[str, Any]] = []
|
||||||
if download_ids and qbittorrent.configured():
|
if qbittorrent.configured():
|
||||||
|
if download_ids:
|
||||||
torrents = await qbittorrent.get_torrents_by_hashes("|".join(download_ids))
|
torrents = await qbittorrent.get_torrents_by_hashes("|".join(download_ids))
|
||||||
torrent_list = torrents if isinstance(torrents, list) else []
|
torrent_list = torrents if isinstance(torrents, list) else []
|
||||||
|
else:
|
||||||
|
category = f"magent-{request_id}"
|
||||||
|
torrents = await qbittorrent.get_torrents_by_category(category)
|
||||||
|
torrent_list = torrents if isinstance(torrents, list) else []
|
||||||
summary = _summarize_qbit(torrent_list)
|
summary = _summarize_qbit(torrent_list)
|
||||||
qbit_state = summary.get("state")
|
qbit_state = summary.get("state")
|
||||||
qbit_message = summary.get("message")
|
qbit_message = summary.get("message")
|
||||||
@@ -519,7 +589,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 added to the library yet."
|
snapshot.state_reason = "Approved, but not yet added to Sonarr/Radarr."
|
||||||
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."
|
||||||
@@ -543,15 +613,22 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
actions.append(
|
actions.append(
|
||||||
ActionOption(
|
ActionOption(
|
||||||
id="readd_to_arr",
|
id="readd_to_arr",
|
||||||
label="Add to the library queue (Sonarr/Radarr)",
|
label="Push to Sonarr/Radarr",
|
||||||
risk="medium",
|
risk="medium",
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
elif arr_item and arr_state != "available":
|
elif arr_item and arr_state != "available":
|
||||||
actions.append(
|
actions.append(
|
||||||
ActionOption(
|
ActionOption(
|
||||||
id="search",
|
id="search_auto",
|
||||||
label="Search again for releases",
|
label="Search and auto-download",
|
||||||
|
risk="low",
|
||||||
|
)
|
||||||
|
)
|
||||||
|
actions.append(
|
||||||
|
ActionOption(
|
||||||
|
id="search_releases",
|
||||||
|
label="Search and choose a download",
|
||||||
risk="low",
|
risk="low",
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -592,5 +669,6 @@ 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
|
||||||
|
|||||||
144
backend/app/services/user_cache.py
Normal file
144
backend/app/services/user_cache.py
Normal file
@@ -0,0 +1,144 @@
|
|||||||
|
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)
|
||||||
BIN
data/branding/favicon.ico
Normal file
BIN
data/branding/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.8 KiB |
BIN
data/branding/logo.png
Normal file
BIN
data/branding/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
19
docker-compose.hub.yml
Normal file
19
docker-compose.hub.yml
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
services:
|
||||||
|
backend:
|
||||||
|
image: rephl3xnz/magent-backend:latest
|
||||||
|
env_file:
|
||||||
|
- ./.env
|
||||||
|
ports:
|
||||||
|
- "8000:8000"
|
||||||
|
volumes:
|
||||||
|
- ./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,8 +1,10 @@
|
|||||||
services:
|
services:
|
||||||
backend:
|
backend:
|
||||||
build:
|
build:
|
||||||
context: ./backend
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: backend/Dockerfile
|
||||||
|
args:
|
||||||
|
BUILD_NUMBER: ${BUILD_NUMBER}
|
||||||
env_file:
|
env_file:
|
||||||
- ./.env
|
- ./.env
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ COPY package.json ./
|
|||||||
RUN npm install
|
RUN npm install
|
||||||
|
|
||||||
COPY app ./app
|
COPY app ./app
|
||||||
|
COPY public ./public
|
||||||
COPY next-env.d.ts ./next-env.d.ts
|
COPY next-env.d.ts ./next-env.d.ts
|
||||||
COPY next.config.js ./next.config.js
|
COPY next.config.js ./next.config.js
|
||||||
COPY tsconfig.json ./tsconfig.json
|
COPY tsconfig.json ./tsconfig.json
|
||||||
@@ -22,6 +23,7 @@ ENV NEXT_TELEMETRY_DISABLED=1 \
|
|||||||
NODE_ENV=production
|
NODE_ENV=production
|
||||||
|
|
||||||
COPY --from=builder /app/.next ./.next
|
COPY --from=builder /app/.next ./.next
|
||||||
|
COPY --from=builder /app/public ./public
|
||||||
COPY --from=builder /app/node_modules ./node_modules
|
COPY --from=builder /app/node_modules ./node_modules
|
||||||
COPY --from=builder /app/package.json ./package.json
|
COPY --from=builder /app/package.json ./package.json
|
||||||
COPY --from=builder /app/next.config.js ./next.config.js
|
COPY --from=builder /app/next.config.js ./next.config.js
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
'use client'
|
'use client'
|
||||||
|
|
||||||
import { useEffect, useMemo, useState } from 'react'
|
import { useCallback, useEffect, useMemo, 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'
|
||||||
import AdminShell from '../ui/AdminShell'
|
import AdminShell from '../ui/AdminShell'
|
||||||
@@ -21,35 +21,39 @@ type ServiceOptions = {
|
|||||||
const SECTION_LABELS: Record<string, string> = {
|
const SECTION_LABELS: Record<string, string> = {
|
||||||
jellyseerr: 'Jellyseerr',
|
jellyseerr: 'Jellyseerr',
|
||||||
jellyfin: 'Jellyfin',
|
jellyfin: 'Jellyfin',
|
||||||
artwork: 'Artwork',
|
artwork: 'Artwork cache',
|
||||||
cache: 'Cache',
|
cache: 'Cache Control',
|
||||||
sonarr: 'Sonarr',
|
sonarr: 'Sonarr',
|
||||||
radarr: 'Radarr',
|
radarr: 'Radarr',
|
||||||
prowlarr: 'Prowlarr',
|
prowlarr: 'Prowlarr',
|
||||||
qbittorrent: 'qBittorrent',
|
qbittorrent: 'qBittorrent',
|
||||||
log: 'Activity log',
|
log: 'Activity log',
|
||||||
requests: 'Request syncing',
|
requests: 'Request sync',
|
||||||
|
site: 'Site',
|
||||||
}
|
}
|
||||||
|
|
||||||
const BOOL_SETTINGS = new Set(['jellyfin_sync_to_arr'])
|
const BOOL_SETTINGS = new Set(['jellyfin_sync_to_arr', 'site_banner_enabled'])
|
||||||
|
const TEXTAREA_SETTINGS = new Set(['site_banner_message', 'site_changelog'])
|
||||||
|
const BANNER_TONES = ['info', 'warning', 'error', 'maintenance']
|
||||||
|
|
||||||
const SECTION_DESCRIPTIONS: Record<string, string> = {
|
const SECTION_DESCRIPTIONS: Record<string, string> = {
|
||||||
jellyseerr: 'Connect the request system where users submit content.',
|
jellyseerr: 'Connect the request system where users submit content.',
|
||||||
jellyfin: 'Control Jellyfin login and availability checks.',
|
jellyfin: 'Control Jellyfin login and availability checks.',
|
||||||
artwork: 'Configure how posters and artwork are loaded.',
|
artwork: 'Cache posters/backdrops and review artwork coverage.',
|
||||||
cache: 'Manage saved request data and offline artwork.',
|
cache: 'Manage saved requests cache and refresh behavior.',
|
||||||
sonarr: 'TV automation settings.',
|
sonarr: 'TV automation settings.',
|
||||||
radarr: 'Movie automation settings.',
|
radarr: 'Movie automation settings.',
|
||||||
prowlarr: 'Indexer search settings.',
|
prowlarr: 'Indexer search settings.',
|
||||||
qbittorrent: 'Downloader connection settings.',
|
qbittorrent: 'Downloader connection settings.',
|
||||||
requests: 'Sync and refresh cadence for requests.',
|
requests: 'Control how often requests are refreshed and cleaned up.',
|
||||||
log: 'Activity log for troubleshooting.',
|
log: 'Activity log for troubleshooting.',
|
||||||
|
site: 'Sitewide banner, version, and changelog details.',
|
||||||
}
|
}
|
||||||
|
|
||||||
const SETTINGS_SECTION_MAP: Record<string, string | null> = {
|
const SETTINGS_SECTION_MAP: Record<string, string | null> = {
|
||||||
jellyseerr: 'jellyseerr',
|
jellyseerr: 'jellyseerr',
|
||||||
jellyfin: 'jellyfin',
|
jellyfin: 'jellyfin',
|
||||||
artwork: 'artwork',
|
artwork: null,
|
||||||
sonarr: 'sonarr',
|
sonarr: 'sonarr',
|
||||||
radarr: 'radarr',
|
radarr: 'radarr',
|
||||||
prowlarr: 'prowlarr',
|
prowlarr: 'prowlarr',
|
||||||
@@ -58,6 +62,7 @@ const SETTINGS_SECTION_MAP: Record<string, string | null> = {
|
|||||||
cache: null,
|
cache: null,
|
||||||
logs: 'log',
|
logs: 'log',
|
||||||
maintenance: null,
|
maintenance: null,
|
||||||
|
site: 'site',
|
||||||
}
|
}
|
||||||
|
|
||||||
const labelFromKey = (key: string) =>
|
const labelFromKey = (key: string) =>
|
||||||
@@ -68,16 +73,34 @@ const labelFromKey = (key: string) =>
|
|||||||
.replace('quality profile id', 'Quality profile ID')
|
.replace('quality profile id', 'Quality profile ID')
|
||||||
.replace('root folder', 'Root folder')
|
.replace('root folder', 'Root folder')
|
||||||
.replace('qbittorrent', 'qBittorrent')
|
.replace('qbittorrent', 'qBittorrent')
|
||||||
.replace('requests sync ttl minutes', 'Refresh saved requests if older than (minutes)')
|
.replace('requests sync ttl minutes', 'Saved request refresh TTL (minutes)')
|
||||||
.replace('requests poll interval seconds', 'Background refresh check (seconds)')
|
.replace('requests poll interval seconds', 'Full refresh check interval (seconds)')
|
||||||
.replace('requests delta sync interval minutes', 'Check for new or updated requests every (minutes)')
|
.replace('requests delta sync interval minutes', 'Delta sync interval (minutes)')
|
||||||
.replace('requests full sync time', 'Full refresh time (24h)')
|
.replace('requests full sync time', 'Daily full refresh time (24h)')
|
||||||
.replace('requests cleanup time', 'Clean up old history time (24h)')
|
.replace('requests cleanup time', 'Daily history cleanup time (24h)')
|
||||||
.replace('requests cleanup days', 'Remove history older than (days)')
|
.replace('requests cleanup days', 'History retention window (days)')
|
||||||
.replace('requests data source', 'Where requests are loaded from')
|
.replace('requests data source', 'Request source (cache vs Jellyseerr)')
|
||||||
.replace('jellyfin public url', 'Jellyfin public URL')
|
.replace('jellyfin public url', 'Jellyfin public URL')
|
||||||
.replace('jellyfin sync to arr', 'Sync Jellyfin to Sonarr/Radarr')
|
.replace('jellyfin sync to arr', 'Sync Jellyfin to Sonarr/Radarr')
|
||||||
.replace('artwork cache mode', 'Artwork cache mode')
|
.replace('artwork cache mode', 'Artwork cache mode')
|
||||||
|
.replace('site build number', 'Build number')
|
||||||
|
.replace('site banner enabled', 'Sitewide banner enabled')
|
||||||
|
.replace('site banner message', 'Sitewide banner message')
|
||||||
|
.replace('site banner tone', 'Sitewide banner tone')
|
||||||
|
.replace('site changelog', 'Changelog text')
|
||||||
|
|
||||||
|
const formatBytes = (value?: number | null) => {
|
||||||
|
if (!value || value <= 0) return '0 B'
|
||||||
|
const units = ['B', 'KB', 'MB', 'GB', 'TB']
|
||||||
|
let size = value
|
||||||
|
let unitIndex = 0
|
||||||
|
while (size >= 1024 && unitIndex < units.length - 1) {
|
||||||
|
size /= 1024
|
||||||
|
unitIndex += 1
|
||||||
|
}
|
||||||
|
const decimals = unitIndex === 0 || size >= 10 ? 0 : 1
|
||||||
|
return `${size.toFixed(decimals)} ${units[unitIndex]}`
|
||||||
|
}
|
||||||
|
|
||||||
type SettingsPageProps = {
|
type SettingsPageProps = {
|
||||||
section: string
|
section: string
|
||||||
@@ -102,12 +125,15 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
const [cacheRows, setCacheRows] = useState<any[]>([])
|
const [cacheRows, setCacheRows] = useState<any[]>([])
|
||||||
const [cacheCount, setCacheCount] = useState(50)
|
const [cacheCount, setCacheCount] = useState(50)
|
||||||
const [cacheStatus, setCacheStatus] = useState<string | null>(null)
|
const [cacheStatus, setCacheStatus] = useState<string | null>(null)
|
||||||
|
const [cacheLoading, setCacheLoading] = useState(false)
|
||||||
const [requestsSync, setRequestsSync] = useState<any | null>(null)
|
const [requestsSync, setRequestsSync] = useState<any | null>(null)
|
||||||
const [artworkPrefetch, setArtworkPrefetch] = useState<any | null>(null)
|
const [artworkPrefetch, setArtworkPrefetch] = useState<any | null>(null)
|
||||||
|
const [artworkSummary, setArtworkSummary] = useState<any | null>(null)
|
||||||
|
const [artworkSummaryStatus, setArtworkSummaryStatus] = useState<string | null>(null)
|
||||||
const [maintenanceStatus, setMaintenanceStatus] = useState<string | null>(null)
|
const [maintenanceStatus, setMaintenanceStatus] = useState<string | null>(null)
|
||||||
const [maintenanceBusy, setMaintenanceBusy] = useState(false)
|
const [maintenanceBusy, setMaintenanceBusy] = useState(false)
|
||||||
|
|
||||||
const loadSettings = async () => {
|
const loadSettings = useCallback(async () => {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/admin/settings`)
|
const response = await authFetch(`${baseUrl}/admin/settings`)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -139,9 +165,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
}
|
}
|
||||||
setFormValues(initialValues)
|
setFormValues(initialValues)
|
||||||
setStatus(null)
|
setStatus(null)
|
||||||
}
|
}, [router])
|
||||||
|
|
||||||
const loadArtworkPrefetchStatus = async () => {
|
const loadArtworkPrefetchStatus = useCallback(async () => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/admin/requests/artwork/status`)
|
const response = await authFetch(`${baseUrl}/admin/requests/artwork/status`)
|
||||||
@@ -153,10 +179,30 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
}
|
}
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
const loadArtworkSummary = useCallback(async () => {
|
||||||
|
setArtworkSummaryStatus(null)
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(`${baseUrl}/admin/requests/artwork/summary`)
|
||||||
|
if (!response.ok) {
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || 'Artwork summary fetch failed')
|
||||||
}
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
setArtworkSummary(data?.summary ?? null)
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
const message =
|
||||||
|
err instanceof Error && err.message
|
||||||
|
? err.message.replace(/^\\{\"detail\":\"|\"\\}$/g, '')
|
||||||
|
: 'Could not load artwork stats.'
|
||||||
|
setArtworkSummaryStatus(message)
|
||||||
|
}
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
const loadOptions = useCallback(async (service: 'sonarr' | 'radarr') => {
|
||||||
const loadOptions = async (service: 'sonarr' | 'radarr') => {
|
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/admin/${service}/options`)
|
const response = await authFetch(`${baseUrl}/admin/${service}/options`)
|
||||||
@@ -185,7 +231,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
setRadarrError('Could not load Radarr options.')
|
setRadarrError('Could not load Radarr options.')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}, [])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const load = async () => {
|
const load = async () => {
|
||||||
@@ -195,8 +241,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
await loadSettings()
|
await loadSettings()
|
||||||
if (section === 'artwork') {
|
if (section === 'cache' || section === 'artwork') {
|
||||||
await loadArtworkPrefetchStatus()
|
await loadArtworkPrefetchStatus()
|
||||||
|
await loadArtworkSummary()
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
@@ -213,7 +260,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
if (section === 'radarr') {
|
if (section === 'radarr') {
|
||||||
void loadOptions('radarr')
|
void loadOptions('radarr')
|
||||||
}
|
}
|
||||||
}, [router, section])
|
}, [loadArtworkPrefetchStatus, loadArtworkSummary, loadOptions, loadSettings, router, section])
|
||||||
|
|
||||||
const groupedSettings = useMemo(() => {
|
const groupedSettings = useMemo(() => {
|
||||||
const groups: Record<string, AdminSetting[]> = {}
|
const groups: Record<string, AdminSetting[]> = {}
|
||||||
@@ -228,28 +275,51 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
const settingsSection = SETTINGS_SECTION_MAP[section] ?? null
|
const settingsSection = SETTINGS_SECTION_MAP[section] ?? null
|
||||||
const visibleSections = settingsSection ? [settingsSection] : []
|
const visibleSections = settingsSection ? [settingsSection] : []
|
||||||
const isCacheSection = section === 'cache'
|
const isCacheSection = section === 'cache'
|
||||||
const cacheSettingKeys = new Set([
|
const cacheSettingKeys = new Set(['requests_sync_ttl_minutes', 'requests_data_source'])
|
||||||
'requests_sync_ttl_minutes',
|
const artworkSettingKeys = new Set(['artwork_cache_mode'])
|
||||||
'requests_data_source',
|
const hiddenSettingKeys = new Set([...cacheSettingKeys, ...artworkSettingKeys])
|
||||||
'artwork_cache_mode',
|
const requestSettingOrder = [
|
||||||
])
|
'requests_poll_interval_seconds',
|
||||||
|
'requests_delta_sync_interval_minutes',
|
||||||
|
'requests_full_sync_time',
|
||||||
|
'requests_cleanup_time',
|
||||||
|
'requests_cleanup_days',
|
||||||
|
]
|
||||||
|
const sortByOrder = (items: AdminSetting[], order: string[]) => {
|
||||||
|
const position = new Map(order.map((key, index) => [key, index]))
|
||||||
|
return [...items].sort((a, b) => {
|
||||||
|
const aIndex = position.get(a.key) ?? Number.POSITIVE_INFINITY
|
||||||
|
const bIndex = position.get(b.key) ?? Number.POSITIVE_INFINITY
|
||||||
|
if (aIndex !== bIndex) return aIndex - bIndex
|
||||||
|
return a.key.localeCompare(b.key)
|
||||||
|
})
|
||||||
|
}
|
||||||
const cacheSettings = settings.filter((setting) => cacheSettingKeys.has(setting.key))
|
const cacheSettings = settings.filter((setting) => cacheSettingKeys.has(setting.key))
|
||||||
|
const artworkSettings = settings.filter((setting) => artworkSettingKeys.has(setting.key))
|
||||||
const settingsSections = isCacheSection
|
const settingsSections = isCacheSection
|
||||||
? [{ key: 'cache', title: 'Cache settings', items: cacheSettings }]
|
? [
|
||||||
|
{ key: 'cache', title: 'Cache control', items: cacheSettings },
|
||||||
|
{ key: 'artwork', title: 'Artwork cache', items: artworkSettings },
|
||||||
|
]
|
||||||
: visibleSections.map((sectionKey) => ({
|
: visibleSections.map((sectionKey) => ({
|
||||||
key: sectionKey,
|
key: sectionKey,
|
||||||
title: SECTION_LABELS[sectionKey] ?? sectionKey,
|
title: SECTION_LABELS[sectionKey] ?? sectionKey,
|
||||||
items:
|
items: (() => {
|
||||||
|
const sectionItems = groupedSettings[sectionKey] ?? []
|
||||||
|
const filtered =
|
||||||
sectionKey === 'requests' || sectionKey === 'artwork'
|
sectionKey === 'requests' || sectionKey === 'artwork'
|
||||||
? (groupedSettings[sectionKey] ?? []).filter(
|
? sectionItems.filter((setting) => !hiddenSettingKeys.has(setting.key))
|
||||||
(setting) => !cacheSettingKeys.has(setting.key)
|
: sectionItems
|
||||||
)
|
if (sectionKey === 'requests') {
|
||||||
: groupedSettings[sectionKey] ?? [],
|
return sortByOrder(filtered, requestSettingOrder)
|
||||||
|
}
|
||||||
|
return filtered
|
||||||
|
})(),
|
||||||
}))
|
}))
|
||||||
const showLogs = section === 'logs'
|
const showLogs = section === 'logs'
|
||||||
const showMaintenance = section === 'maintenance'
|
const showMaintenance = section === 'maintenance'
|
||||||
const showRequestsExtras = section === 'requests'
|
const showRequestsExtras = section === 'requests'
|
||||||
const showArtworkExtras = section === 'artwork'
|
const showArtworkExtras = section === 'cache'
|
||||||
const showCacheExtras = section === 'cache'
|
const showCacheExtras = section === 'cache'
|
||||||
const shouldRenderSection = (sectionGroup: { key: string; items?: AdminSetting[] }) => {
|
const shouldRenderSection = (sectionGroup: { key: string; items?: AdminSetting[] }) => {
|
||||||
if (sectionGroup.items && sectionGroup.items.length > 0) return true
|
if (sectionGroup.items && sectionGroup.items.length > 0) return true
|
||||||
@@ -271,24 +341,34 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
sonarr_api_key: 'API key for Sonarr.',
|
sonarr_api_key: 'API key for Sonarr.',
|
||||||
sonarr_quality_profile_id: 'Quality profile used when adding TV shows.',
|
sonarr_quality_profile_id: 'Quality profile used when adding TV shows.',
|
||||||
sonarr_root_folder: 'Root folder where Sonarr stores TV shows.',
|
sonarr_root_folder: 'Root folder where Sonarr stores TV shows.',
|
||||||
|
sonarr_qbittorrent_category: 'qBittorrent category for manual Sonarr downloads.',
|
||||||
radarr_base_url: 'Radarr server URL for movies.',
|
radarr_base_url: 'Radarr server URL for movies.',
|
||||||
radarr_api_key: 'API key for Radarr.',
|
radarr_api_key: 'API key for Radarr.',
|
||||||
radarr_quality_profile_id: 'Quality profile used when adding movies.',
|
radarr_quality_profile_id: 'Quality profile used when adding movies.',
|
||||||
radarr_root_folder: 'Root folder where Radarr stores movies.',
|
radarr_root_folder: 'Root folder where Radarr stores movies.',
|
||||||
|
radarr_qbittorrent_category: 'qBittorrent category for manual Radarr downloads.',
|
||||||
prowlarr_base_url: 'Prowlarr server URL for indexer searches.',
|
prowlarr_base_url: 'Prowlarr server URL for indexer searches.',
|
||||||
prowlarr_api_key: 'API key for Prowlarr.',
|
prowlarr_api_key: 'API key for Prowlarr.',
|
||||||
qbittorrent_base_url: 'qBittorrent server URL for download status.',
|
qbittorrent_base_url: 'qBittorrent server URL for download status.',
|
||||||
qbittorrent_username: 'qBittorrent login username.',
|
qbittorrent_username: 'qBittorrent login username.',
|
||||||
qbittorrent_password: 'qBittorrent login password.',
|
qbittorrent_password: 'qBittorrent login password.',
|
||||||
requests_sync_ttl_minutes: 'How long saved requests stay fresh before a refresh is needed.',
|
requests_sync_ttl_minutes: 'How long saved requests stay fresh before a refresh is needed.',
|
||||||
requests_poll_interval_seconds: 'How often the background checker runs.',
|
requests_poll_interval_seconds:
|
||||||
requests_delta_sync_interval_minutes: 'How often we check for new or updated requests.',
|
'How often Magent checks if a full refresh should run.',
|
||||||
requests_full_sync_time: 'Daily time to refresh the full request list.',
|
requests_delta_sync_interval_minutes:
|
||||||
requests_cleanup_time: 'Daily time to trim old history.',
|
'How often we poll for new or updated requests.',
|
||||||
|
requests_full_sync_time: 'Daily time to rebuild the full request cache.',
|
||||||
|
requests_cleanup_time: 'Daily time to trim old request history.',
|
||||||
requests_cleanup_days: 'History older than this is removed during cleanup.',
|
requests_cleanup_days: 'History older than this is removed during cleanup.',
|
||||||
requests_data_source: 'Pick where Magent should read requests from.',
|
requests_data_source:
|
||||||
|
'Pick where Magent should read requests from. Cache-only avoids Jellyseerr lookups on reads.',
|
||||||
log_level: 'How much detail is written to the activity log.',
|
log_level: 'How much detail is written to the activity log.',
|
||||||
log_file: 'Where the activity log is stored.',
|
log_file: 'Where the activity log is stored.',
|
||||||
|
site_build_number: 'Build number shown in the account menu (auto-set from releases).',
|
||||||
|
site_banner_enabled: 'Enable a sitewide banner for announcements.',
|
||||||
|
site_banner_message: 'Short banner message for maintenance or updates.',
|
||||||
|
site_banner_tone: 'Visual tone for the banner.',
|
||||||
|
site_changelog: 'One update per line for the public changelog.',
|
||||||
}
|
}
|
||||||
|
|
||||||
const buildSelectOptions = (
|
const buildSelectOptions = (
|
||||||
@@ -446,6 +526,31 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const prefetchArtworkMissing = async () => {
|
||||||
|
setArtworkPrefetchStatus(null)
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(
|
||||||
|
`${baseUrl}/admin/requests/artwork/prefetch?only_missing=1`,
|
||||||
|
{ method: 'POST' }
|
||||||
|
)
|
||||||
|
if (!response.ok) {
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || 'Missing artwork prefetch failed')
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
setArtworkPrefetch(data?.prefetch ?? null)
|
||||||
|
setArtworkPrefetchStatus('Missing artwork caching started.')
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
const message =
|
||||||
|
err instanceof Error && err.message
|
||||||
|
? err.message.replace(/^\\{\"detail\":\"|\"\\}$/g, '')
|
||||||
|
: 'Could not cache missing artwork.'
|
||||||
|
setArtworkPrefetchStatus(message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!artworkPrefetch || artworkPrefetch.status !== 'running') {
|
if (!artworkPrefetch || artworkPrefetch.status !== 'running') {
|
||||||
return
|
return
|
||||||
@@ -463,6 +568,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
setArtworkPrefetch(data?.prefetch ?? null)
|
setArtworkPrefetch(data?.prefetch ?? null)
|
||||||
if (data?.prefetch?.status && data.prefetch.status !== 'running') {
|
if (data?.prefetch?.status && data.prefetch.status !== 'running') {
|
||||||
setArtworkPrefetchStatus(data.prefetch.message || 'Artwork caching complete.')
|
setArtworkPrefetchStatus(data.prefetch.message || 'Artwork caching complete.')
|
||||||
|
void loadArtworkSummary()
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
@@ -472,7 +578,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
active = false
|
active = false
|
||||||
clearInterval(timer)
|
clearInterval(timer)
|
||||||
}
|
}
|
||||||
}, [artworkPrefetch?.status])
|
}, [artworkPrefetch, loadArtworkSummary])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!artworkPrefetch || artworkPrefetch.status === 'running') {
|
if (!artworkPrefetch || artworkPrefetch.status === 'running') {
|
||||||
@@ -482,7 +588,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
setArtworkPrefetch(null)
|
setArtworkPrefetch(null)
|
||||||
}, 5000)
|
}, 5000)
|
||||||
return () => clearTimeout(timer)
|
return () => clearTimeout(timer)
|
||||||
}, [artworkPrefetch?.status])
|
}, [artworkPrefetch])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!requestsSync || requestsSync.status !== 'running') {
|
if (!requestsSync || requestsSync.status !== 'running') {
|
||||||
@@ -510,7 +616,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
active = false
|
active = false
|
||||||
clearInterval(timer)
|
clearInterval(timer)
|
||||||
}
|
}
|
||||||
}, [requestsSync?.status])
|
}, [requestsSync])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!requestsSync || requestsSync.status === 'running') {
|
if (!requestsSync || requestsSync.status === 'running') {
|
||||||
@@ -520,9 +626,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
setRequestsSync(null)
|
setRequestsSync(null)
|
||||||
}, 5000)
|
}, 5000)
|
||||||
return () => clearTimeout(timer)
|
return () => clearTimeout(timer)
|
||||||
}, [requestsSync?.status])
|
}, [requestsSync])
|
||||||
|
|
||||||
const loadLogs = async () => {
|
const loadLogs = useCallback(async () => {
|
||||||
setLogsStatus(null)
|
setLogsStatus(null)
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
@@ -547,7 +653,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
: 'Could not load logs.'
|
: 'Could not load logs.'
|
||||||
setLogsStatus(message)
|
setLogsStatus(message)
|
||||||
}
|
}
|
||||||
}
|
}, [logsCount])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!showLogs) {
|
if (!showLogs) {
|
||||||
@@ -558,10 +664,11 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
void loadLogs()
|
void loadLogs()
|
||||||
}, 5000)
|
}, 5000)
|
||||||
return () => clearInterval(timer)
|
return () => clearInterval(timer)
|
||||||
}, [logsCount, showLogs])
|
}, [loadLogs, showLogs])
|
||||||
|
|
||||||
const loadCache = async () => {
|
const loadCache = async () => {
|
||||||
setCacheStatus(null)
|
setCacheStatus(null)
|
||||||
|
setCacheLoading(true)
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(
|
const response = await authFetch(
|
||||||
@@ -584,6 +691,8 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
? err.message.replace(/^\\{\"detail\":\"|\"\\}$/g, '')
|
? err.message.replace(/^\\{\"detail\":\"|\"\\}$/g, '')
|
||||||
: 'Could not load cache.'
|
: 'Could not load cache.'
|
||||||
setCacheStatus(message)
|
setCacheStatus(message)
|
||||||
|
} finally {
|
||||||
|
setCacheLoading(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -698,7 +807,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
.map((sectionGroup) => (
|
.map((sectionGroup) => (
|
||||||
<section key={sectionGroup.key} className="admin-section">
|
<section key={sectionGroup.key} className="admin-section">
|
||||||
<div className="section-header">
|
<div className="section-header">
|
||||||
<h2>{sectionGroup.title}</h2>
|
<h2>
|
||||||
|
{sectionGroup.key === 'requests' ? 'Request sync controls' : sectionGroup.title}
|
||||||
|
</h2>
|
||||||
{sectionGroup.key === 'sonarr' && (
|
{sectionGroup.key === 'sonarr' && (
|
||||||
<button type="button" onClick={() => loadOptions('sonarr')}>
|
<button type="button" onClick={() => loadOptions('sonarr')}>
|
||||||
Refresh Sonarr options
|
Refresh Sonarr options
|
||||||
@@ -714,24 +825,38 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
Import Jellyfin users
|
Import Jellyfin users
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
{(showArtworkExtras && sectionGroup.key === 'artwork') ||
|
{showArtworkExtras && sectionGroup.key === 'artwork' ? (
|
||||||
(showCacheExtras && sectionGroup.key === 'cache') ? (
|
<div className="sync-actions">
|
||||||
<button type="button" onClick={prefetchArtwork}>
|
<button type="button" onClick={prefetchArtwork}>
|
||||||
Cache all artwork now
|
Cache all artwork now
|
||||||
</button>
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="ghost-button"
|
||||||
|
onClick={prefetchArtworkMissing}
|
||||||
|
>
|
||||||
|
Sync only missing artwork
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
{showRequestsExtras && sectionGroup.key === 'requests' && (
|
{showRequestsExtras && sectionGroup.key === 'requests' && (
|
||||||
|
<div className="sync-actions-block">
|
||||||
<div className="sync-actions">
|
<div className="sync-actions">
|
||||||
<button type="button" onClick={syncRequests}>
|
<button type="button" onClick={syncRequests}>
|
||||||
Full refresh
|
Run full refresh (rebuild cache)
|
||||||
</button>
|
</button>
|
||||||
<button type="button" className="ghost-button" onClick={syncRequestsDelta}>
|
<button type="button" className="ghost-button" onClick={syncRequestsDelta}>
|
||||||
Quick refresh (new changes)
|
Run delta sync (recent changes)
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
<div className="meta sync-note">
|
||||||
|
Full refresh rebuilds the entire cache. Delta sync only checks new or updated
|
||||||
|
requests.
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{SECTION_DESCRIPTIONS[sectionGroup.key] && (
|
{SECTION_DESCRIPTIONS[sectionGroup.key] && !settingsSection && (
|
||||||
<p className="section-subtitle">{SECTION_DESCRIPTIONS[sectionGroup.key]}</p>
|
<p className="section-subtitle">{SECTION_DESCRIPTIONS[sectionGroup.key]}</p>
|
||||||
)}
|
)}
|
||||||
{sectionGroup.key === 'sonarr' && sonarrError && (
|
{sectionGroup.key === 'sonarr' && sonarrError && (
|
||||||
@@ -743,17 +868,48 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
{sectionGroup.key === 'jellyfin' && jellyfinSyncStatus && (
|
{sectionGroup.key === 'jellyfin' && jellyfinSyncStatus && (
|
||||||
<div className="status-banner">{jellyfinSyncStatus}</div>
|
<div className="status-banner">{jellyfinSyncStatus}</div>
|
||||||
)}
|
)}
|
||||||
{((showArtworkExtras && sectionGroup.key === 'artwork') ||
|
{showArtworkExtras && sectionGroup.key === 'artwork' && artworkPrefetchStatus && (
|
||||||
(showCacheExtras && sectionGroup.key === 'cache')) &&
|
|
||||||
artworkPrefetchStatus && (
|
|
||||||
<div className="status-banner">{artworkPrefetchStatus}</div>
|
<div className="status-banner">{artworkPrefetchStatus}</div>
|
||||||
)}
|
)}
|
||||||
|
{showArtworkExtras && sectionGroup.key === 'artwork' && artworkSummaryStatus && (
|
||||||
|
<div className="status-banner">{artworkSummaryStatus}</div>
|
||||||
|
)}
|
||||||
|
{showArtworkExtras && sectionGroup.key === 'artwork' && (
|
||||||
|
<div className="summary">
|
||||||
|
<div className="summary-card">
|
||||||
|
<strong>Missing artwork</strong>
|
||||||
|
<p>{artworkSummary?.missing_artwork ?? '--'}</p>
|
||||||
|
<div className="meta">Requests missing poster/backdrop or cache files.</div>
|
||||||
|
</div>
|
||||||
|
<div className="summary-card">
|
||||||
|
<strong>Artwork cache size</strong>
|
||||||
|
<p>{formatBytes(artworkSummary?.cache_bytes)}</p>
|
||||||
|
<div className="meta">
|
||||||
|
{artworkSummary?.cache_files ?? '--'} cached files
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="summary-card">
|
||||||
|
<strong>Total requests</strong>
|
||||||
|
<p>{artworkSummary?.total_requests ?? '--'}</p>
|
||||||
|
<div className="meta">Requests currently tracked in cache.</div>
|
||||||
|
</div>
|
||||||
|
<div className="summary-card">
|
||||||
|
<strong>Cache mode</strong>
|
||||||
|
<p>{artworkSummary?.cache_mode ?? '--'}</p>
|
||||||
|
<div className="meta">Artwork setting applied to posters/backdrops.</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{showRequestsExtras && sectionGroup.key === 'requests' && requestsSyncStatus && (
|
{showRequestsExtras && sectionGroup.key === 'requests' && requestsSyncStatus && (
|
||||||
<div className="status-banner">{requestsSyncStatus}</div>
|
<div className="status-banner">{requestsSyncStatus}</div>
|
||||||
)}
|
)}
|
||||||
{((showArtworkExtras && sectionGroup.key === 'artwork') ||
|
{showRequestsExtras && sectionGroup.key === 'requests' && (
|
||||||
(showCacheExtras && sectionGroup.key === 'cache')) &&
|
<div className="status-banner">
|
||||||
artworkPrefetch && (
|
Full refresh checks only decide when to run a full refresh. The delta sync interval
|
||||||
|
polls for new or updated requests.
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{showArtworkExtras && sectionGroup.key === 'artwork' && artworkPrefetch && (
|
||||||
<div className="sync-progress">
|
<div className="sync-progress">
|
||||||
<div className="sync-meta">
|
<div className="sync-meta">
|
||||||
<span>Status: {artworkPrefetch.status}</span>
|
<span>Status: {artworkPrefetch.status}</span>
|
||||||
@@ -1007,6 +1163,34 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
</label>
|
</label>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
if (setting.key === 'site_banner_tone') {
|
||||||
|
return (
|
||||||
|
<label key={setting.key} data-helper={helperText || undefined}>
|
||||||
|
<span className="label-row">
|
||||||
|
<span>{labelFromKey(setting.key)}</span>
|
||||||
|
<span className="meta">
|
||||||
|
{setting.isSet ? `Source: ${setting.source}` : 'Not set'}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
<select
|
||||||
|
name={setting.key}
|
||||||
|
value={value || 'info'}
|
||||||
|
onChange={(event) =>
|
||||||
|
setFormValues((current) => ({
|
||||||
|
...current,
|
||||||
|
[setting.key]: event.target.value,
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{BANNER_TONES.map((tone) => (
|
||||||
|
<option key={tone} value={tone}>
|
||||||
|
{tone.charAt(0).toUpperCase() + tone.slice(1)}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
)
|
||||||
|
}
|
||||||
if (
|
if (
|
||||||
setting.key === 'requests_full_sync_time' ||
|
setting.key === 'requests_full_sync_time' ||
|
||||||
setting.key === 'requests_cleanup_time'
|
setting.key === 'requests_cleanup_time'
|
||||||
@@ -1080,11 +1264,42 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
<option value="always_js">Always use Jellyseerr (slower)</option>
|
<option value="always_js">Always use Jellyseerr (slower)</option>
|
||||||
<option value="prefer_cache">Use saved requests first (faster)</option>
|
<option value="prefer_cache">
|
||||||
|
Use saved requests only (fastest)
|
||||||
|
</option>
|
||||||
</select>
|
</select>
|
||||||
</label>
|
</label>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
if (TEXTAREA_SETTINGS.has(setting.key)) {
|
||||||
|
return (
|
||||||
|
<label key={setting.key} data-helper={helperText || undefined}>
|
||||||
|
<span className="label-row">
|
||||||
|
<span>{labelFromKey(setting.key)}</span>
|
||||||
|
<span className="meta">
|
||||||
|
{setting.isSet ? `Source: ${setting.source}` : 'Not set'}
|
||||||
|
{setting.sensitive && setting.isSet ? ' stored' : ''}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
<textarea
|
||||||
|
name={setting.key}
|
||||||
|
rows={setting.key === 'site_changelog' ? 6 : 3}
|
||||||
|
placeholder={
|
||||||
|
setting.key === 'site_changelog'
|
||||||
|
? 'One update per line.'
|
||||||
|
: ''
|
||||||
|
}
|
||||||
|
value={value}
|
||||||
|
onChange={(event) =>
|
||||||
|
setFormValues((current) => ({
|
||||||
|
...current,
|
||||||
|
[setting.key]: event.target.value,
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
)
|
||||||
|
}
|
||||||
return (
|
return (
|
||||||
<label key={setting.key} data-helper={helperText || undefined}>
|
<label key={setting.key} data-helper={helperText || undefined}>
|
||||||
<span className="label-row">
|
<span className="label-row">
|
||||||
@@ -1121,7 +1336,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
</form>
|
</form>
|
||||||
) : (
|
) : (
|
||||||
<div className="status-banner">
|
<div className="status-banner">
|
||||||
No settings to show here yet. Try the Cache page for artwork and saved-request controls.
|
No settings to show here yet. Try the Cache Control page for artwork and saved-request controls.
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{showLogs && (
|
{showLogs && (
|
||||||
@@ -1167,8 +1382,15 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
<option value={200}>200</option>
|
<option value={200}>200</option>
|
||||||
</select>
|
</select>
|
||||||
</label>
|
</label>
|
||||||
<button type="button" onClick={loadCache}>
|
<button type="button" onClick={loadCache} disabled={cacheLoading}>
|
||||||
Load saved requests
|
{cacheLoading ? (
|
||||||
|
<>
|
||||||
|
<span className="spinner button-spinner" aria-hidden="true" />
|
||||||
|
Loading saved requests
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
'Load saved requests'
|
||||||
|
)}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ const ALLOWED_SECTIONS = new Set([
|
|||||||
'cache',
|
'cache',
|
||||||
'logs',
|
'logs',
|
||||||
'maintenance',
|
'maintenance',
|
||||||
|
'site',
|
||||||
])
|
])
|
||||||
|
|
||||||
type PageProps = {
|
type PageProps = {
|
||||||
|
|||||||
172
frontend/app/admin/requests-all/page.tsx
Normal file
172
frontend/app/admin/requests-all/page.tsx
Normal file
@@ -0,0 +1,172 @@
|
|||||||
|
'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>
|
||||||
|
)
|
||||||
|
}
|
||||||
85
frontend/app/changelog/page.tsx
Normal file
85
frontend/app/changelog/page.tsx
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
'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>
|
||||||
|
)
|
||||||
|
}
|
||||||
120
frontend/app/feedback/page.tsx
Normal file
120
frontend/app/feedback/page.tsx
Normal file
@@ -0,0 +1,120 @@
|
|||||||
|
'use client'
|
||||||
|
|
||||||
|
import { useEffect, useState } from 'react'
|
||||||
|
import { useRouter } from 'next/navigation'
|
||||||
|
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
||||||
|
|
||||||
|
type Profile = {
|
||||||
|
username?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function FeedbackPage() {
|
||||||
|
const router = useRouter()
|
||||||
|
const [profile, setProfile] = useState<Profile | null>(null)
|
||||||
|
const [category, setCategory] = useState('bug')
|
||||||
|
const [message, setMessage] = useState('')
|
||||||
|
const [status, setStatus] = useState<string | null>(null)
|
||||||
|
const [submitting, setSubmitting] = useState(false)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!getToken()) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const load = async () => {
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(`${baseUrl}/auth/me`)
|
||||||
|
if (!response.ok) {
|
||||||
|
clearToken()
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
setProfile({ username: data?.username })
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void load()
|
||||||
|
}, [router])
|
||||||
|
|
||||||
|
const submit = async (event: React.FormEvent<HTMLFormElement>) => {
|
||||||
|
event.preventDefault()
|
||||||
|
setStatus(null)
|
||||||
|
if (!message.trim()) {
|
||||||
|
setStatus('Please write a short message before sending.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
setSubmitting(true)
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(`${baseUrl}/feedback`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
type: category,
|
||||||
|
message: message.trim(),
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
if (!response.ok) {
|
||||||
|
if (response.status === 401) {
|
||||||
|
clearToken()
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || `Request failed: ${response.status}`)
|
||||||
|
}
|
||||||
|
setMessage('')
|
||||||
|
setStatus('Thanks! Your message has been sent.')
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error)
|
||||||
|
setStatus('That did not send. Please try again.')
|
||||||
|
} finally {
|
||||||
|
setSubmitting(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main className="card">
|
||||||
|
<header className="how-hero">
|
||||||
|
<p className="eyebrow">Send feedback</p>
|
||||||
|
<h1>Help us improve Magent</h1>
|
||||||
|
<p className="lede">
|
||||||
|
Found a problem or have an idea? Send it here and we will see it right away.
|
||||||
|
</p>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<form className="auth-form" onSubmit={submit}>
|
||||||
|
<label htmlFor="feedback-user">Your username</label>
|
||||||
|
<input id="feedback-user" value={profile?.username ?? ''} readOnly />
|
||||||
|
|
||||||
|
<label htmlFor="feedback-type">What is this about?</label>
|
||||||
|
<select
|
||||||
|
id="feedback-type"
|
||||||
|
value={category}
|
||||||
|
onChange={(event) => setCategory(event.target.value)}
|
||||||
|
>
|
||||||
|
<option value="bug">Bug (something is broken)</option>
|
||||||
|
<option value="feature">Feature idea (new option)</option>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<label htmlFor="feedback-message">Tell us what happened</label>
|
||||||
|
<textarea
|
||||||
|
id="feedback-message"
|
||||||
|
rows={6}
|
||||||
|
value={message}
|
||||||
|
onChange={(event) => setMessage(event.target.value)}
|
||||||
|
placeholder="Write the details here..."
|
||||||
|
/>
|
||||||
|
|
||||||
|
{status && <div className="status-banner">{status}</div>}
|
||||||
|
|
||||||
|
<button type="submit" disabled={submitting}>
|
||||||
|
{submitting ? 'Sending...' : 'Send feedback'}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</main>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -108,7 +108,7 @@ body {
|
|||||||
grid-column: 1 / -1;
|
grid-column: 1 / -1;
|
||||||
grid-row: 2 / 3;
|
grid-row: 2 / 3;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: flex-end;
|
justify-content: flex-start;
|
||||||
}
|
}
|
||||||
|
|
||||||
.brand {
|
.brand {
|
||||||
@@ -130,6 +130,7 @@ body {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.header-actions a {
|
.header-actions a {
|
||||||
@@ -162,16 +163,16 @@ body {
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.signed-in {
|
.header-actions .header-cta {
|
||||||
font-size: 12px;
|
background: linear-gradient(120deg, rgba(255, 107, 43, 0.95), rgba(255, 168, 75, 0.95));
|
||||||
text-transform: uppercase;
|
color: #151515;
|
||||||
letter-spacing: 0.08em;
|
border: 1px solid rgba(255, 140, 60, 0.7);
|
||||||
color: var(--ink-muted);
|
box-shadow: 0 12px 24px rgba(255, 107, 43, 0.35);
|
||||||
padding: 6px 10px;
|
font-weight: 700;
|
||||||
border-radius: 999px;
|
}
|
||||||
border: 1px dashed var(--border);
|
|
||||||
background: transparent;
|
.header-actions .header-cta--left {
|
||||||
cursor: pointer;
|
margin-right: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.signed-in-menu {
|
.signed-in-menu {
|
||||||
@@ -180,12 +181,29 @@ body {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.avatar-button {
|
||||||
|
width: 44px;
|
||||||
|
height: 44px;
|
||||||
|
border-radius: 50%;
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.12);
|
||||||
|
background: linear-gradient(130deg, rgba(28, 107, 255, 0.35), rgba(17, 214, 198, 0.25));
|
||||||
|
color: var(--ink);
|
||||||
|
font-weight: 700;
|
||||||
|
letter-spacing: 0.04em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
box-shadow: 0 10px 20px rgba(28, 107, 255, 0.25);
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
.signed-in-dropdown {
|
.signed-in-dropdown {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: calc(100% + 8px);
|
top: calc(100% + 8px);
|
||||||
right: 0;
|
right: 0;
|
||||||
min-width: 180px;
|
width: min(260px, 90vw);
|
||||||
background: rgba(14, 20, 32, 0.95);
|
background: rgba(14, 20, 32, 0.96);
|
||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
border-radius: 12px;
|
border-radius: 12px;
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
@@ -193,17 +211,50 @@ body {
|
|||||||
z-index: 20;
|
z-index: 20;
|
||||||
}
|
}
|
||||||
|
|
||||||
.signed-in-dropdown a {
|
.signed-in-header {
|
||||||
|
font-size: 11px;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
padding: 8px 10px 6px;
|
||||||
|
border-bottom: 1px solid rgba(255, 255, 255, 0.08);
|
||||||
|
}
|
||||||
|
|
||||||
|
.signed-in-actions {
|
||||||
|
display: grid;
|
||||||
|
gap: 6px;
|
||||||
|
padding: 8px 4px 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.signed-in-actions a,
|
||||||
|
.signed-in-signout {
|
||||||
display: block;
|
display: block;
|
||||||
padding: 8px 12px;
|
padding: 8px 12px;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
color: var(--ink);
|
color: var(--ink);
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
text-align: center;
|
text-align: left;
|
||||||
|
background: rgba(255, 255, 255, 0.05);
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.08);
|
||||||
}
|
}
|
||||||
|
|
||||||
.signed-in-dropdown a:hover {
|
.signed-in-signout {
|
||||||
background: rgba(255, 255, 255, 0.08);
|
cursor: pointer;
|
||||||
|
font: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
|
.signed-in-actions a:hover,
|
||||||
|
.signed-in-signout:hover {
|
||||||
|
background: rgba(255, 255, 255, 0.12);
|
||||||
|
}
|
||||||
|
|
||||||
|
.signed-in-build {
|
||||||
|
margin-top: 6px;
|
||||||
|
padding: 6px 10px 8px;
|
||||||
|
font-size: 11px;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
text-align: left;
|
||||||
|
letter-spacing: 0.04em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.theme-toggle {
|
.theme-toggle {
|
||||||
@@ -332,6 +383,17 @@ select option {
|
|||||||
color: var(--ink);
|
color: var(--ink);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
textarea {
|
||||||
|
padding: 14px 16px;
|
||||||
|
border-radius: 16px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
font-size: 16px;
|
||||||
|
background: var(--input-bg);
|
||||||
|
color: var(--input-ink);
|
||||||
|
font-family: inherit;
|
||||||
|
resize: vertical;
|
||||||
|
}
|
||||||
|
|
||||||
button {
|
button {
|
||||||
padding: 12px 18px;
|
padding: 12px 18px;
|
||||||
border-radius: 999px;
|
border-radius: 999px;
|
||||||
@@ -497,6 +559,73 @@ button span {
|
|||||||
margin-top: 4px;
|
margin-top: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.profile-grid {
|
||||||
|
display: grid;
|
||||||
|
gap: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile-section {
|
||||||
|
display: grid;
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stat-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stat-card {
|
||||||
|
padding: 14px;
|
||||||
|
border-radius: 16px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
background: rgba(255, 255, 255, 0.05);
|
||||||
|
display: grid;
|
||||||
|
gap: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stat-label {
|
||||||
|
font-size: 11px;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.08em;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.stat-value {
|
||||||
|
font-size: 20px;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stat-value--small {
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.connection-list {
|
||||||
|
display: grid;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.connection-item {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 12px;
|
||||||
|
padding: 12px 14px;
|
||||||
|
border-radius: 14px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
background: rgba(255, 255, 255, 0.04);
|
||||||
|
}
|
||||||
|
|
||||||
|
.connection-label {
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.connection-count {
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
.state {
|
.state {
|
||||||
display: grid;
|
display: grid;
|
||||||
gap: 6px;
|
gap: 6px;
|
||||||
@@ -623,12 +752,28 @@ button span {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.user-card {
|
.user-card {
|
||||||
display: flex;
|
display: grid;
|
||||||
justify-content: space-between;
|
grid-template-columns: 1fr auto;
|
||||||
align-items: center;
|
align-items: start;
|
||||||
gap: 16px;
|
gap: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.user-card strong {
|
||||||
|
display: block;
|
||||||
|
font-size: 16px;
|
||||||
|
margin-bottom: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-meta {
|
||||||
|
display: grid;
|
||||||
|
gap: 6px;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-meta .meta {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
.user-actions {
|
.user-actions {
|
||||||
display: grid;
|
display: grid;
|
||||||
gap: 8px;
|
gap: 8px;
|
||||||
@@ -882,6 +1027,85 @@ button span {
|
|||||||
gap: 12px;
|
gap: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.admin-toolbar {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
gap: 16px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-toolbar-info {
|
||||||
|
color: var(--ink-muted);
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-toolbar-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 12px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-select {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-table {
|
||||||
|
display: grid;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-table-head {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 2fr 1fr 1fr 1fr;
|
||||||
|
gap: 12px;
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.08em;
|
||||||
|
padding: 0 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-table-row {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 2fr 1fr 1fr 1fr;
|
||||||
|
gap: 12px;
|
||||||
|
align-items: center;
|
||||||
|
text-align: left;
|
||||||
|
background: rgba(255, 255, 255, 0.04);
|
||||||
|
border-radius: 16px;
|
||||||
|
padding: 12px;
|
||||||
|
transition: transform 0.2s ease, box-shadow 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-table-row:hover {
|
||||||
|
transform: translateY(-1px);
|
||||||
|
box-shadow: 0 12px 24px rgba(15, 20, 45, 0.18);
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-pagination {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 10px;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: flex-end;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-pagination button {
|
||||||
|
background: rgba(255, 255, 255, 0.08);
|
||||||
|
color: var(--ink);
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-pagination span {
|
||||||
|
padding: 0 6px;
|
||||||
|
}
|
||||||
|
|
||||||
.section-header {
|
.section-header {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
@@ -902,6 +1126,17 @@ button span {
|
|||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.sync-actions-block {
|
||||||
|
display: grid;
|
||||||
|
gap: 6px;
|
||||||
|
justify-items: end;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sync-note {
|
||||||
|
margin-top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.section-header button {
|
.section-header button {
|
||||||
background: rgba(255, 255, 255, 0.08);
|
background: rgba(255, 255, 255, 0.08);
|
||||||
color: var(--ink);
|
color: var(--ink);
|
||||||
@@ -928,6 +1163,118 @@ button span {
|
|||||||
line-height: 1.4;
|
line-height: 1.4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.user-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fit, minmax(260px, 1fr));
|
||||||
|
gap: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-grid-card {
|
||||||
|
display: grid;
|
||||||
|
gap: 14px;
|
||||||
|
padding: 16px;
|
||||||
|
border-radius: 16px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
background: rgba(255, 255, 255, 0.04);
|
||||||
|
color: var(--ink);
|
||||||
|
text-decoration: none;
|
||||||
|
transition: border-color 0.2s ease, transform 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-grid-card:hover {
|
||||||
|
border-color: rgba(59, 130, 246, 0.5);
|
||||||
|
transform: translateY(-2px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-grid-header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 12px;
|
||||||
|
align-items: flex-start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-grid-meta {
|
||||||
|
display: block;
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-grid-pill {
|
||||||
|
padding: 4px 10px;
|
||||||
|
border-radius: 999px;
|
||||||
|
font-size: 12px;
|
||||||
|
border: 1px solid rgba(59, 130, 246, 0.4);
|
||||||
|
color: var(--ink);
|
||||||
|
background: rgba(59, 130, 246, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-grid-pill.is-blocked {
|
||||||
|
border-color: rgba(255, 82, 82, 0.5);
|
||||||
|
background: rgba(255, 82, 82, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-grid-stats {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-grid-stats .label {
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-grid-stats .value {
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-grid-footer {
|
||||||
|
display: grid;
|
||||||
|
gap: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-detail-card {
|
||||||
|
display: grid;
|
||||||
|
gap: 16px;
|
||||||
|
padding: 18px;
|
||||||
|
border-radius: 18px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
background: rgba(255, 255, 255, 0.04);
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-detail-header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
gap: 16px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-detail-meta {
|
||||||
|
display: flex;
|
||||||
|
gap: 12px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-detail-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-detail-grid .label {
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-detail-grid .value {
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
.label-row {
|
.label-row {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
@@ -944,6 +1291,49 @@ button span {
|
|||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.site-banner {
|
||||||
|
padding: 12px 16px;
|
||||||
|
border-radius: 12px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
background: rgba(255, 255, 255, 0.08);
|
||||||
|
color: var(--ink);
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.site-banner--info {
|
||||||
|
background: rgba(59, 130, 246, 0.18);
|
||||||
|
border-color: rgba(59, 130, 246, 0.4);
|
||||||
|
}
|
||||||
|
|
||||||
|
.site-banner--warning {
|
||||||
|
background: rgba(255, 200, 87, 0.22);
|
||||||
|
border-color: rgba(255, 200, 87, 0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
.site-banner--error {
|
||||||
|
background: rgba(255, 59, 48, 0.2);
|
||||||
|
border-color: rgba(255, 59, 48, 0.4);
|
||||||
|
}
|
||||||
|
|
||||||
|
.site-banner--maintenance {
|
||||||
|
background: rgba(255, 107, 43, 0.18);
|
||||||
|
border-color: rgba(255, 107, 43, 0.4);
|
||||||
|
}
|
||||||
|
|
||||||
|
.site-version {
|
||||||
|
position: fixed;
|
||||||
|
left: 16px;
|
||||||
|
bottom: 12px;
|
||||||
|
font-size: 12px;
|
||||||
|
letter-spacing: 0.04em;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
padding: 6px 10px;
|
||||||
|
border-radius: 999px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
background: rgba(255, 255, 255, 0.08);
|
||||||
|
z-index: 30;
|
||||||
|
}
|
||||||
|
|
||||||
.recent-header {
|
.recent-header {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
@@ -1127,6 +1517,17 @@ button span {
|
|||||||
|
|
||||||
.progress-indeterminate .progress-fill {
|
.progress-indeterminate .progress-fill {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
width: 100%;
|
||||||
|
left: 0;
|
||||||
|
top: 0;
|
||||||
|
background: linear-gradient(
|
||||||
|
90deg,
|
||||||
|
rgba(255, 255, 255, 0),
|
||||||
|
var(--accent-2),
|
||||||
|
var(--accent-3),
|
||||||
|
rgba(255, 255, 255, 0)
|
||||||
|
);
|
||||||
|
background-size: 200% 100%;
|
||||||
animation: progress-indeterminate 1.6s ease-in-out infinite;
|
animation: progress-indeterminate 1.6s ease-in-out infinite;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1205,6 +1606,24 @@ button span {
|
|||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.system-meta {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.system-test-message {
|
||||||
|
font-size: 11px;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.system-actions {
|
||||||
|
margin-left: auto;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
.system-dot {
|
.system-dot {
|
||||||
width: 10px;
|
width: 10px;
|
||||||
height: 10px;
|
height: 10px;
|
||||||
@@ -1234,10 +1653,28 @@ button span {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.system-state {
|
.system-state {
|
||||||
margin-left: auto;
|
|
||||||
color: var(--ink-muted);
|
color: var(--ink-muted);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.system-test {
|
||||||
|
padding: 4px 10px;
|
||||||
|
border-radius: 999px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
background: rgba(255, 255, 255, 0.08);
|
||||||
|
color: var(--ink-muted);
|
||||||
|
font-size: 11px;
|
||||||
|
letter-spacing: 0.02em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.system-test:hover:not(:disabled) {
|
||||||
|
background: rgba(255, 255, 255, 0.16);
|
||||||
|
}
|
||||||
|
|
||||||
|
.system-test:disabled {
|
||||||
|
opacity: 0.6;
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
.pipeline-map {
|
.pipeline-map {
|
||||||
border-radius: 16px;
|
border-radius: 16px;
|
||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
@@ -1310,13 +1747,10 @@ button span {
|
|||||||
|
|
||||||
@keyframes progress-indeterminate {
|
@keyframes progress-indeterminate {
|
||||||
0% {
|
0% {
|
||||||
transform: translateX(-50%);
|
background-position: 200% 0;
|
||||||
}
|
|
||||||
50% {
|
|
||||||
transform: translateX(120%);
|
|
||||||
}
|
}
|
||||||
100% {
|
100% {
|
||||||
transform: translateX(-50%);
|
background-position: -200% 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1332,19 +1766,83 @@ button span {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 720px) {
|
@media (max-width: 720px) {
|
||||||
|
.page {
|
||||||
|
padding: 28px 18px 60px;
|
||||||
|
gap: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
.header {
|
.header {
|
||||||
grid-template-columns: 1fr;
|
grid-template-columns: 1fr;
|
||||||
grid-template-rows: auto auto auto;
|
grid-template-rows: auto auto auto;
|
||||||
align-items: flex-start;
|
align-items: flex-start;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.header-left {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.brand-link {
|
||||||
|
width: 100%;
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.brand-logo--header {
|
||||||
|
width: 64px;
|
||||||
|
height: 64px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.brand {
|
||||||
|
font-size: 26px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tagline {
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
.header-right {
|
.header-right {
|
||||||
grid-column: 1 / -1;
|
grid-column: 1 / -1;
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
|
width: 100%;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.header-nav {
|
.header-nav {
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.signed-in-menu {
|
||||||
|
margin-left: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.avatar-button {
|
||||||
|
width: 40px;
|
||||||
|
height: 40px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.signed-in-dropdown {
|
||||||
|
right: 0;
|
||||||
|
left: auto;
|
||||||
|
width: min(260px, 92vw);
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-actions {
|
||||||
|
width: 100%;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-actions a,
|
||||||
|
.header-actions .header-link {
|
||||||
|
font-size: 12px;
|
||||||
|
padding: 8px 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-actions .header-cta--left {
|
||||||
|
grid-column: 1 / -1;
|
||||||
|
margin-right: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.summary {
|
.summary {
|
||||||
@@ -1382,6 +1880,21 @@ button span {
|
|||||||
.cache-row {
|
.cache-row {
|
||||||
grid-template-columns: 1fr;
|
grid-template-columns: 1fr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.user-card {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
.connection-item {
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: flex-start;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 480px) {
|
||||||
|
.header-actions {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Loading spinner */
|
/* Loading spinner */
|
||||||
@@ -1403,6 +1916,16 @@ button span {
|
|||||||
animation: spin 0.9s linear infinite;
|
animation: spin 0.9s linear infinite;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.button-spinner {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
border-width: 2px;
|
||||||
|
box-shadow: none;
|
||||||
|
margin-right: 8px;
|
||||||
|
vertical-align: middle;
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
|
||||||
.loading-text {
|
.loading-text {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
color: var(--ink-muted);
|
color: var(--ink-muted);
|
||||||
@@ -1472,6 +1995,91 @@ button span {
|
|||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.how-step-grid {
|
||||||
|
display: grid;
|
||||||
|
gap: 16px;
|
||||||
|
grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
|
||||||
|
}
|
||||||
|
|
||||||
|
.how-step-card {
|
||||||
|
border-radius: 18px;
|
||||||
|
padding: 18px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
background: rgba(255, 255, 255, 0.06);
|
||||||
|
display: grid;
|
||||||
|
gap: 10px;
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.how-step-card::before {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
opacity: 0.35;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.step-jellyseerr::before {
|
||||||
|
background: linear-gradient(135deg, rgba(255, 187, 92, 0.35), transparent 60%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.step-arr::before {
|
||||||
|
background: linear-gradient(135deg, rgba(94, 204, 255, 0.35), transparent 60%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.step-prowlarr::before {
|
||||||
|
background: linear-gradient(135deg, rgba(120, 255, 189, 0.35), transparent 60%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.step-qbit::before {
|
||||||
|
background: linear-gradient(135deg, rgba(255, 133, 200, 0.35), transparent 60%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.step-jellyfin::before {
|
||||||
|
background: linear-gradient(135deg, rgba(170, 140, 255, 0.35), transparent 60%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.step-badge {
|
||||||
|
width: 38px;
|
||||||
|
height: 38px;
|
||||||
|
border-radius: 50%;
|
||||||
|
display: grid;
|
||||||
|
place-items: center;
|
||||||
|
font-weight: 700;
|
||||||
|
background: rgba(255, 255, 255, 0.12);
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
color: var(--ink);
|
||||||
|
}
|
||||||
|
|
||||||
|
.step-note {
|
||||||
|
color: var(--ink-muted);
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.step-fix-title {
|
||||||
|
font-size: 13px;
|
||||||
|
letter-spacing: 0.08em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.step-fix-list {
|
||||||
|
list-style: none;
|
||||||
|
display: grid;
|
||||||
|
gap: 6px;
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.step-fix-list li {
|
||||||
|
padding: 8px 10px;
|
||||||
|
border-radius: 10px;
|
||||||
|
background: rgba(255, 255, 255, 0.08);
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
.how-callout {
|
.how-callout {
|
||||||
border-left: 4px solid var(--accent);
|
border-left: 4px solid var(--accent);
|
||||||
padding: 16px 18px;
|
padding: 16px 18px;
|
||||||
@@ -1480,3 +2088,21 @@ button span {
|
|||||||
display: grid;
|
display: grid;
|
||||||
gap: 8px;
|
gap: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.changelog-card {
|
||||||
|
gap: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.changelog-header {
|
||||||
|
display: grid;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.changelog-list {
|
||||||
|
list-style: disc;
|
||||||
|
padding-left: 22px;
|
||||||
|
display: grid;
|
||||||
|
gap: 10px;
|
||||||
|
color: var(--ink-muted);
|
||||||
|
font-size: 15px;
|
||||||
|
}
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ export default function HowItWorksPage() {
|
|||||||
<p className="eyebrow">How this works</p>
|
<p className="eyebrow">How this works</p>
|
||||||
<h1>Your request, step by step</h1>
|
<h1>Your request, step by step</h1>
|
||||||
<p className="lede">
|
<p className="lede">
|
||||||
Think of Magent as a status tracker. It checks a few helper apps that do different jobs,
|
Magent is a friendly status checker. It looks at a few helper apps, then shows you where
|
||||||
then tells you where your request is stuck and what you can safely try next.
|
your request is and what you can safely do next.
|
||||||
</p>
|
</p>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
@@ -17,32 +17,36 @@ export default function HowItWorksPage() {
|
|||||||
<h2>Jellyseerr</h2>
|
<h2>Jellyseerr</h2>
|
||||||
<p className="how-title">The request box</p>
|
<p className="how-title">The request box</p>
|
||||||
<p>
|
<p>
|
||||||
This is where you ask for a movie or show. It records your request and keeps track of
|
This is where you ask for a movie or show. It keeps the request and whether it is
|
||||||
approvals.
|
approved.
|
||||||
</p>
|
</p>
|
||||||
</article>
|
</article>
|
||||||
<article className="how-card">
|
<article className="how-card">
|
||||||
<h2>Sonarr / Radarr</h2>
|
<h2>Sonarr / Radarr</h2>
|
||||||
<p className="how-title">The librarian</p>
|
<p className="how-title">The library manager</p>
|
||||||
<p>
|
<p>
|
||||||
These apps add the item to the library, decide what quality to grab, and look for the
|
These add the request to the library list and decide what quality to look for.
|
||||||
files that match your request.
|
|
||||||
</p>
|
</p>
|
||||||
</article>
|
</article>
|
||||||
<article className="how-card">
|
<article className="how-card">
|
||||||
<h2>Prowlarr</h2>
|
<h2>Prowlarr</h2>
|
||||||
<p className="how-title">The search helper</p>
|
<p className="how-title">The search helper</p>
|
||||||
<p>
|
<p>
|
||||||
This one checks your torrent sources and reports back what it found, or if nothing is
|
This checks your search sources and reports back what it finds.
|
||||||
available yet.
|
|
||||||
</p>
|
</p>
|
||||||
</article>
|
</article>
|
||||||
<article className="how-card">
|
<article className="how-card">
|
||||||
<h2>qBittorrent</h2>
|
<h2>qBittorrent</h2>
|
||||||
<p className="how-title">The downloader</p>
|
<p className="how-title">The downloader</p>
|
||||||
<p>
|
<p>
|
||||||
If a file is found, this app downloads it. Magent can tell if it is actively
|
This downloads the file. Magent can tell if it is downloading, paused, or finished.
|
||||||
downloading, stalled, or finished.
|
</p>
|
||||||
|
</article>
|
||||||
|
<article className="how-card">
|
||||||
|
<h2>Jellyfin</h2>
|
||||||
|
<p className="how-title">The place you watch</p>
|
||||||
|
<p>
|
||||||
|
When the file is ready, Jellyfin shows it in your library so you can watch it.
|
||||||
</p>
|
</p>
|
||||||
</article>
|
</article>
|
||||||
</section>
|
</section>
|
||||||
@@ -54,13 +58,13 @@ export default function HowItWorksPage() {
|
|||||||
<strong>You request a title</strong> in Jellyseerr.
|
<strong>You request a title</strong> in Jellyseerr.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<strong>Sonarr/Radarr adds it</strong> to the library list and asks Prowlarr to search.
|
<strong>Sonarr/Radarr adds it</strong> to the library list.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<strong>Prowlarr looks for sources</strong> and sends results back.
|
<strong>Prowlarr looks for sources</strong> and sends results back.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<strong>qBittorrent downloads</strong> the best match.
|
<strong>qBittorrent downloads</strong> the match.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<strong>Sonarr/Radarr imports</strong> it into your library.
|
<strong>Sonarr/Radarr imports</strong> it into your library.
|
||||||
@@ -71,12 +75,67 @@ 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.
|
||||||
This does not mean something is broken. It usually means the release is not available
|
That does not mean it is broken. It usually means the release is not available yet.
|
||||||
yet or your search sources do not have it.
|
|
||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ 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',
|
||||||
@@ -28,13 +29,14 @@ export default function RootLayout({ children }: { children: ReactNode }) {
|
|||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div className="header-right">
|
<div className="header-right">
|
||||||
<HeaderIdentity />
|
|
||||||
<ThemeToggle />
|
<ThemeToggle />
|
||||||
|
<HeaderIdentity />
|
||||||
</div>
|
</div>
|
||||||
<div className="header-nav">
|
<div className="header-nav">
|
||||||
<HeaderActions />
|
<HeaderActions />
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
|
<SiteStatus />
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ 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)
|
||||||
@@ -30,6 +31,8 @@ export default function HomePage() {
|
|||||||
>(null)
|
>(null)
|
||||||
const [servicesLoading, setServicesLoading] = useState(false)
|
const [servicesLoading, setServicesLoading] = useState(false)
|
||||||
const [servicesError, setServicesError] = useState<string | null>(null)
|
const [servicesError, setServicesError] = useState<string | null>(null)
|
||||||
|
const [serviceTesting, setServiceTesting] = useState<Record<string, boolean>>({})
|
||||||
|
const [serviceTestResults, setServiceTestResults] = useState<Record<string, string | null>>({})
|
||||||
|
|
||||||
const submit = (event: React.FormEvent) => {
|
const submit = (event: React.FormEvent) => {
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
@@ -42,6 +45,61 @@ export default function HomePage() {
|
|||||||
void runSearch(trimmed)
|
void runSearch(trimmed)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const toServiceSlug = (name: string) => name.toLowerCase().replace(/[^a-z0-9]/g, '')
|
||||||
|
|
||||||
|
const updateServiceStatus = (name: string, status: string, message?: string) => {
|
||||||
|
setServicesStatus((prev) => {
|
||||||
|
if (!prev) return prev
|
||||||
|
return {
|
||||||
|
...prev,
|
||||||
|
services: prev.services.map((service) =>
|
||||||
|
service.name === name ? { ...service, status, message } : service
|
||||||
|
),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const testService = async (name: string) => {
|
||||||
|
const slug = toServiceSlug(name)
|
||||||
|
setServiceTesting((prev) => ({ ...prev, [name]: true }))
|
||||||
|
setServiceTestResults((prev) => ({ ...prev, [name]: null }))
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(`${baseUrl}/status/services/${slug}/test`, {
|
||||||
|
method: 'POST',
|
||||||
|
})
|
||||||
|
if (!response.ok) {
|
||||||
|
if (response.status === 401) {
|
||||||
|
clearToken()
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || `Service test failed: ${response.status}`)
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
const status = data?.status ?? 'unknown'
|
||||||
|
const message =
|
||||||
|
data?.message ||
|
||||||
|
(status === 'up'
|
||||||
|
? 'API OK'
|
||||||
|
: status === 'down'
|
||||||
|
? 'API unreachable'
|
||||||
|
: status === 'degraded'
|
||||||
|
? 'Health warnings'
|
||||||
|
: status === 'not_configured'
|
||||||
|
? 'Not configured'
|
||||||
|
: 'Unknown')
|
||||||
|
setServiceTestResults((prev) => ({ ...prev, [name]: message }))
|
||||||
|
updateServiceStatus(name, status, data?.message)
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error)
|
||||||
|
setServiceTestResults((prev) => ({ ...prev, [name]: 'Test failed' }))
|
||||||
|
} finally {
|
||||||
|
setServiceTesting((prev) => ({ ...prev, [name]: false }))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!getToken()) {
|
if (!getToken()) {
|
||||||
router.push('/login')
|
router.push('/login')
|
||||||
@@ -94,6 +152,7 @@ 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,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
@@ -179,6 +238,13 @@ 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">
|
||||||
@@ -214,10 +280,17 @@ export default function HomePage() {
|
|||||||
return order.map((name) => {
|
return order.map((name) => {
|
||||||
const item = items.find((entry) => entry.name === name)
|
const item = items.find((entry) => entry.name === name)
|
||||||
const status = item?.status ?? 'unknown'
|
const status = item?.status ?? 'unknown'
|
||||||
|
const testing = serviceTesting[name] ?? false
|
||||||
return (
|
return (
|
||||||
<div key={name} className={`system-item system-${status}`}>
|
<div key={name} className={`system-item system-${status}`}>
|
||||||
<span className="system-dot" />
|
<span className="system-dot" />
|
||||||
|
<div className="system-meta">
|
||||||
<span className="system-name">{name}</span>
|
<span className="system-name">{name}</span>
|
||||||
|
{serviceTestResults[name] && (
|
||||||
|
<span className="system-test-message">{serviceTestResults[name]}</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="system-actions">
|
||||||
<span className="system-state">
|
<span className="system-state">
|
||||||
{status === 'up'
|
{status === 'up'
|
||||||
? 'Up'
|
? 'Up'
|
||||||
@@ -229,6 +302,15 @@ export default function HomePage() {
|
|||||||
? 'Not configured'
|
? 'Not configured'
|
||||||
: 'Unknown'}
|
: 'Unknown'}
|
||||||
</span>
|
</span>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="system-test"
|
||||||
|
onClick={() => void testService(name)}
|
||||||
|
disabled={testing}
|
||||||
|
>
|
||||||
|
{testing ? 'Testing...' : 'Test'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
@@ -239,11 +321,12 @@ 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 last</span>
|
<span>Show</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>
|
||||||
@@ -290,6 +373,7 @@ 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,9 +10,65 @@ 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)
|
||||||
@@ -26,18 +82,21 @@ export default function ProfilePage() {
|
|||||||
const load = async () => {
|
const load = async () => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/auth/me`)
|
const response = await authFetch(`${baseUrl}/auth/profile`)
|
||||||
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: data?.username ?? 'Unknown',
|
username: user?.username ?? 'Unknown',
|
||||||
role: data?.role ?? 'user',
|
role: user?.role ?? 'user',
|
||||||
auth_provider: data?.auth_provider ?? 'local',
|
auth_provider: user?.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.')
|
||||||
@@ -91,6 +150,78 @@ 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,5 +1,6 @@
|
|||||||
'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'
|
||||||
@@ -33,7 +34,9 @@ type ReleaseOption = {
|
|||||||
seeders?: number
|
seeders?: number
|
||||||
leechers?: number
|
leechers?: number
|
||||||
protocol?: string
|
protocol?: string
|
||||||
|
publishDate?: string
|
||||||
infoUrl?: string
|
infoUrl?: string
|
||||||
|
downloadUrl?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
type SnapshotHistory = {
|
type SnapshotHistory = {
|
||||||
@@ -122,7 +125,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: 'Needs adding to the library',
|
NEEDS_ADD: 'Push to Sonarr/Radarr',
|
||||||
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',
|
||||||
@@ -154,7 +157,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: 'Not added yet',
|
missing: 'Push to Sonarr/Radarr',
|
||||||
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',
|
||||||
@@ -249,7 +252,7 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
}
|
}
|
||||||
|
|
||||||
load()
|
load()
|
||||||
}, [params.id])
|
}, [params.id, router])
|
||||||
|
|
||||||
if (loading) {
|
if (loading) {
|
||||||
return (
|
return (
|
||||||
@@ -273,9 +276,11 @@ 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: 'Library queue' },
|
{ key: 'Sonarr/Radarr', label: arrStageLabel },
|
||||||
{ key: 'Prowlarr', label: 'Search' },
|
{ key: 'Prowlarr', label: 'Search' },
|
||||||
{ key: 'qBittorrent', label: 'Download' },
|
{ key: 'qBittorrent', label: 'Download' },
|
||||||
{ key: 'Jellyfin', label: 'Jellyfin' },
|
{ key: 'Jellyfin', label: 'Jellyfin' },
|
||||||
@@ -307,11 +312,14 @@ 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 && (
|
||||||
<img
|
<Image
|
||||||
className="request-poster"
|
className="request-poster"
|
||||||
src={resolvedPoster}
|
src={resolvedPoster}
|
||||||
alt={`${snapshot.title} poster`}
|
alt={`${snapshot.title} poster`}
|
||||||
loading="lazy"
|
width={90}
|
||||||
|
height={135}
|
||||||
|
sizes="90px"
|
||||||
|
unoptimized
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<div>
|
<div>
|
||||||
@@ -484,7 +492,8 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
}
|
}
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const actionMap: Record<string, string> = {
|
const actionMap: Record<string, string> = {
|
||||||
search: 'actions/search',
|
search_releases: 'actions/search',
|
||||||
|
search_auto: 'actions/search_auto',
|
||||||
resume_torrent: 'actions/qbit/resume',
|
resume_torrent: 'actions/qbit/resume',
|
||||||
readd_to_arr: 'actions/readd',
|
readd_to_arr: 'actions/readd',
|
||||||
}
|
}
|
||||||
@@ -493,7 +502,7 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
setActionMessage('This action is not wired yet.')
|
setActionMessage('This action is not wired yet.')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (action.id === 'search') {
|
if (action.id === 'search_releases') {
|
||||||
setActionMessage(null)
|
setActionMessage(null)
|
||||||
setReleaseOptions([])
|
setReleaseOptions([])
|
||||||
setSearchRan(false)
|
setSearchRan(false)
|
||||||
@@ -513,7 +522,7 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
throw new Error(text || `Request failed: ${response.status}`)
|
throw new Error(text || `Request failed: ${response.status}`)
|
||||||
}
|
}
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
if (action.id === 'search') {
|
if (action.id === 'search_releases') {
|
||||||
if (Array.isArray(data.releases)) {
|
if (Array.isArray(data.releases)) {
|
||||||
setReleaseOptions(data.releases)
|
setReleaseOptions(data.releases)
|
||||||
}
|
}
|
||||||
@@ -526,6 +535,10 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
setModalMessage('Search complete. Pick an option below if you want to download.')
|
setModalMessage('Search complete. Pick an option below if you want to download.')
|
||||||
}
|
}
|
||||||
setActionMessage(`${action.label} started.`)
|
setActionMessage(`${action.label} started.`)
|
||||||
|
} else if (action.id === 'search_auto') {
|
||||||
|
const message = data?.message ?? 'Search sent to Sonarr/Radarr.'
|
||||||
|
setActionMessage(message)
|
||||||
|
setModalMessage(message)
|
||||||
} else {
|
} else {
|
||||||
const message = data?.message ?? `${action.label} started.`
|
const message = data?.message ?? `${action.label} started.`
|
||||||
setActionMessage(message)
|
setActionMessage(message)
|
||||||
@@ -565,6 +578,7 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
<span>{release.seeders ?? 0} seeders · {formatBytes(release.size)}</span>
|
<span>{release.seeders ?? 0} seeders · {formatBytes(release.size)}</span>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
|
disabled={!release.guid || !release.indexerId}
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
if (!snapshot || !release.guid || !release.indexerId) {
|
if (!snapshot || !release.guid || !release.indexerId) {
|
||||||
setActionMessage('Missing details to start the download.')
|
setActionMessage('Missing details to start the download.')
|
||||||
@@ -583,6 +597,14 @@ 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,
|
||||||
|
title: release.title,
|
||||||
|
size: release.size,
|
||||||
|
protocol: release.protocol,
|
||||||
|
publishDate: release.publishDate,
|
||||||
|
seeders: release.seeders,
|
||||||
|
leechers: release.leechers,
|
||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@@ -595,8 +617,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 Sonarr/Radarr.')
|
setActionMessage('Download sent to qBittorrent.')
|
||||||
setModalMessage('Download sent to Sonarr/Radarr.')
|
setModalMessage('Download sent to qBittorrent.')
|
||||||
} 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,14 +17,15 @@ const NAV_GROUPS = [
|
|||||||
{
|
{
|
||||||
title: 'Requests',
|
title: 'Requests',
|
||||||
items: [
|
items: [
|
||||||
{ href: '/admin/requests', label: 'Request syncing' },
|
{ href: '/admin/requests', label: 'Request sync' },
|
||||||
{ href: '/admin/artwork', label: 'Artwork' },
|
{ href: '/admin/requests-all', label: 'All requests' },
|
||||||
{ href: '/admin/cache', label: 'Cache' },
|
{ href: '/admin/cache', label: 'Cache Control' },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
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' },
|
||||||
|
|||||||
@@ -1,17 +1,10 @@
|
|||||||
'use client'
|
'use client'
|
||||||
|
|
||||||
import { useEffect } from 'react'
|
import { useEffect } from 'react'
|
||||||
import { getApiBase } from '../lib/auth'
|
|
||||||
|
|
||||||
const STORAGE_KEY = 'branding_version'
|
|
||||||
|
|
||||||
export default function BrandingFavicon() {
|
export default function BrandingFavicon() {
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const baseUrl = getApiBase()
|
const href = '/api/branding/favicon.ico'
|
||||||
const version =
|
|
||||||
(typeof window !== 'undefined' && window.localStorage.getItem(STORAGE_KEY)) || ''
|
|
||||||
const versionSuffix = version ? `?v=${encodeURIComponent(version)}` : ''
|
|
||||||
const href = `${baseUrl}/branding/favicon.ico${versionSuffix}`
|
|
||||||
let link = document.querySelector("link[rel='icon']") as HTMLLinkElement | null
|
let link = document.querySelector("link[rel='icon']") as HTMLLinkElement | null
|
||||||
if (!link) {
|
if (!link) {
|
||||||
link = document.createElement('link')
|
link = document.createElement('link')
|
||||||
|
|||||||
@@ -1,36 +1,14 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import { useEffect, useState } from 'react'
|
|
||||||
import { getApiBase } from '../lib/auth'
|
|
||||||
|
|
||||||
const STORAGE_KEY = 'branding_version'
|
|
||||||
|
|
||||||
type BrandingLogoProps = {
|
type BrandingLogoProps = {
|
||||||
className?: string
|
className?: string
|
||||||
alt?: string
|
alt?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function BrandingLogo({ className, alt = 'Magent logo' }: BrandingLogoProps) {
|
export default function BrandingLogo({ className, alt = 'Magent logo' }: BrandingLogoProps) {
|
||||||
const [src, setSrc] = useState<string | null>(null)
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const version =
|
|
||||||
(typeof window !== 'undefined' && window.localStorage.getItem(STORAGE_KEY)) || ''
|
|
||||||
const versionSuffix = version ? `?v=${encodeURIComponent(version)}` : ''
|
|
||||||
setSrc(`${baseUrl}/branding/logo.png${versionSuffix}`)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
if (!src) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<img
|
<img
|
||||||
className={className}
|
className={className}
|
||||||
src={src}
|
src="/api/branding/logo.png"
|
||||||
alt={alt}
|
alt={alt}
|
||||||
onError={() => setSrc(null)}
|
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,27 +32,16 @@ export default function HeaderActions() {
|
|||||||
void load()
|
void load()
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
const signOut = () => {
|
if (!signedIn) {
|
||||||
clearToken()
|
return null
|
||||||
setSignedIn(false)
|
|
||||||
if (typeof window !== 'undefined') {
|
|
||||||
window.location.href = '/login'
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="header-actions">
|
<div className="header-actions">
|
||||||
|
<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>
|
||||||
{signedIn && <a href="/profile">My profile</a>}
|
|
||||||
{role === 'admin' && <a href="/admin">Settings</a>}
|
{role === 'admin' && <a href="/admin">Settings</a>}
|
||||||
{signedIn ? (
|
|
||||||
<button type="button" className="header-link" onClick={signOut}>
|
|
||||||
Sign out
|
|
||||||
</button>
|
|
||||||
) : (
|
|
||||||
<a href="/login">Sign in</a>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,13 +4,15 @@ 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<string | null>(null)
|
const [identity, setIdentity] = useState<{ username: string; role?: 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 () => {
|
||||||
@@ -24,7 +26,14 @@ export default function HeaderIdentity() {
|
|||||||
}
|
}
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
if (data?.username) {
|
if (data?.username) {
|
||||||
setIdentity(`${data.username}${data.role ? ` (${data.role})` : ''}`)
|
setIdentity({ username: data.username, 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)
|
||||||
@@ -38,14 +47,42 @@ 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 type="button" className="signed-in" onClick={() => setOpen((prev) => !prev)}>
|
<button
|
||||||
Signed in as {identity}
|
type="button"
|
||||||
|
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">
|
||||||
<a href="/profile">My profile</a>
|
<div className="signed-in-header">Signed in as {label}</div>
|
||||||
|
<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>
|
||||||
|
|||||||
62
frontend/app/ui/SiteStatus.tsx
Normal file
62
frontend/app/ui/SiteStatus.tsx
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
'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}
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
234
frontend/app/users/[id]/page.tsx
Normal file
234
frontend/app/users/[id]/page.tsx
Normal file
@@ -0,0 +1,234 @@
|
|||||||
|
'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
|
||||||
|
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.')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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-header">
|
||||||
|
<div>
|
||||||
|
<strong>{user.username}</strong>
|
||||||
|
<div className="user-detail-meta">
|
||||||
|
<span className="meta">Jellyseerr ID: {user.jellyseerr_user_id ?? user.id ?? 'Unknown'}</span>
|
||||||
|
<span className="meta">Role: {user.role}</span>
|
||||||
|
<span className="meta">Login type: {user.auth_provider || 'local'}</span>
|
||||||
|
<span className="meta">Last login: {formatDateTime(user.last_login_at)}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="user-actions">
|
||||||
|
<label className="toggle">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={user.role === 'admin'}
|
||||||
|
onChange={(event) => updateUserRole(event.target.checked ? 'admin' : 'user')}
|
||||||
|
/>
|
||||||
|
<span>Make admin</span>
|
||||||
|
</label>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="ghost-button"
|
||||||
|
onClick={() => toggleUserBlock(!user.is_blocked)}
|
||||||
|
>
|
||||||
|
{user.is_blocked ? 'Allow access' : 'Block access'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-grid">
|
||||||
|
<div>
|
||||||
|
<span className="label">Total</span>
|
||||||
|
<span className="value">{stats?.total ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span className="label">Ready</span>
|
||||||
|
<span className="value">{stats?.ready ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span className="label">Pending</span>
|
||||||
|
<span className="value">{stats?.pending ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span className="label">Approved</span>
|
||||||
|
<span className="value">{stats?.approved ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span className="label">Working</span>
|
||||||
|
<span className="value">{stats?.working ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span className="label">Partial</span>
|
||||||
|
<span className="value">{stats?.partial ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span className="label">Declined</span>
|
||||||
|
<span className="value">{stats?.declined ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span className="label">In progress</span>
|
||||||
|
<span className="value">{stats?.in_progress ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span className="label">Last request</span>
|
||||||
|
<span className="value">{formatDateTime(stats?.last_request_at)}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
</AdminShell>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -2,15 +2,30 @@
|
|||||||
|
|
||||||
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
|
||||||
|
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) => {
|
||||||
@@ -20,18 +35,50 @@ 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 [passwordInputs, setPasswordInputs] = useState<Record<string, string>>({})
|
const [jellyseerrSyncStatus, setJellyseerrSyncStatus] = useState<string | null>(null)
|
||||||
const [passwordStatus, setPasswordStatus] = useState<Record<string, string>>({})
|
const [jellyseerrSyncBusy, setJellyseerrSyncBusy] = useState(false)
|
||||||
|
const [jellyseerrResyncBusy, setJellyseerrResyncBusy] = useState(false)
|
||||||
|
|
||||||
const loadUsers = async () => {
|
const loadUsers = async () => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/admin/users`)
|
const response = await authFetch(`${baseUrl}/admin/users/summary`)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
if (response.status === 401) {
|
if (response.status === 401) {
|
||||||
clearToken()
|
clearToken()
|
||||||
@@ -53,6 +100,8 @@ 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),
|
||||||
|
id: Number(user.id ?? 0),
|
||||||
|
stats: normalizeStats(user.stats ?? emptyStats),
|
||||||
}))
|
}))
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
@@ -105,40 +154,57 @@ export default function UsersPage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const updateUserPassword = async (username: string) => {
|
const syncJellyseerrUsers = async () => {
|
||||||
const newPassword = passwordInputs[username] || ''
|
setJellyseerrSyncStatus(null)
|
||||||
if (!newPassword || newPassword.length < 8) {
|
setJellyseerrSyncBusy(true)
|
||||||
setPasswordStatus((current) => ({
|
|
||||||
...current,
|
|
||||||
[username]: 'Password must be at least 8 characters.',
|
|
||||||
}))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(
|
const response = await authFetch(`${baseUrl}/admin/jellyseerr/users/sync`, {
|
||||||
`${baseUrl}/admin/users/${encodeURIComponent(username)}/password`,
|
|
||||||
{
|
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
})
|
||||||
body: JSON.stringify({ password: newPassword }),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
const text = await response.text()
|
const text = await response.text()
|
||||||
throw new Error(text || 'Update failed')
|
throw new Error(text || 'Sync failed')
|
||||||
}
|
}
|
||||||
setPasswordInputs((current) => ({ ...current, [username]: '' }))
|
const data = await response.json()
|
||||||
setPasswordStatus((current) => ({
|
setJellyseerrSyncStatus(
|
||||||
...current,
|
`Matched ${data?.matched ?? 0} users. Skipped ${data?.skipped ?? 0}.`
|
||||||
[username]: 'Password updated.',
|
)
|
||||||
}))
|
await loadUsers()
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
setPasswordStatus((current) => ({
|
setJellyseerrSyncStatus('Could not sync Jellyseerr users.')
|
||||||
...current,
|
} finally {
|
||||||
[username]: 'Could not update password.',
|
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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -159,66 +225,67 @@ export default function UsersPage() {
|
|||||||
title="Users"
|
title="Users"
|
||||||
subtitle="Manage who can use Magent."
|
subtitle="Manage who can use Magent."
|
||||||
actions={
|
actions={
|
||||||
|
<>
|
||||||
<button type="button" onClick={loadUsers}>
|
<button type="button" onClick={loadUsers}>
|
||||||
Reload list
|
Reload list
|
||||||
</button>
|
</button>
|
||||||
|
<button type="button" onClick={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>}
|
||||||
{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="admin-grid">
|
<div className="user-grid">
|
||||||
{users.map((user) => (
|
{users.map((user) => (
|
||||||
<div key={user.username} className="summary-card user-card">
|
<Link
|
||||||
|
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="meta">Role: {user.role}</span>
|
<span className="user-grid-meta">{user.role}</span>
|
||||||
<span className="meta">Login type: {user.authProvider || 'local'}</span>
|
</div>
|
||||||
|
<span className={`user-grid-pill ${user.isBlocked ? 'is-blocked' : ''}`}>
|
||||||
|
{user.isBlocked ? 'Blocked' : 'Active'}
|
||||||
|
</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>
|
||||||
<div className="user-actions">
|
</Link>
|
||||||
<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>
|
|
||||||
{user.authProvider === 'local' && (
|
|
||||||
<div className="user-actions">
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
placeholder="New password (min 8 chars)"
|
|
||||||
value={passwordInputs[user.username] || ''}
|
|
||||||
onChange={(event) =>
|
|
||||||
setPasswordInputs((current) => ({
|
|
||||||
...current,
|
|
||||||
[user.username]: event.target.value,
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
<button type="button" onClick={() => updateUserPassword(user.username)}>
|
|
||||||
Set password
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{passwordStatus[user.username] && (
|
|
||||||
<div className="meta">{passwordStatus[user.username]}</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "magent-frontend",
|
"name": "magent-frontend",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.1.0",
|
"version": "2901262244",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
|
|||||||
13
frontend/public/branding-icon.svg
Normal file
13
frontend/public/branding-icon.svg
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
|
||||||
|
<defs>
|
||||||
|
<linearGradient id="magentIconGlow" x1="0" y1="0" x2="1" y2="1">
|
||||||
|
<stop offset="0%" stop-color="#ff6b2b"/>
|
||||||
|
<stop offset="100%" stop-color="#ffa84b"/>
|
||||||
|
</linearGradient>
|
||||||
|
</defs>
|
||||||
|
<rect width="64" height="64" rx="14" fill="#0e1624"/>
|
||||||
|
<path
|
||||||
|
d="M18 50V14h8l6 11 6-11h8v36h-8V32l-6 10-6-10v18h-8z"
|
||||||
|
fill="url(#magentIconGlow)"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 457 B |
14
frontend/public/branding-logo.svg
Normal file
14
frontend/public/branding-logo.svg
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" viewBox="0 0 300 300">
|
||||||
|
<defs>
|
||||||
|
<linearGradient id="magentGlow" x1="0" y1="0" x2="1" y2="1">
|
||||||
|
<stop offset="0%" stop-color="#ff6b2b"/>
|
||||||
|
<stop offset="100%" stop-color="#ffa84b"/>
|
||||||
|
</linearGradient>
|
||||||
|
</defs>
|
||||||
|
<rect width="300" height="300" rx="56" fill="#0e1624"/>
|
||||||
|
<rect x="24" y="24" width="252" height="252" rx="44" fill="#121d31"/>
|
||||||
|
<path
|
||||||
|
d="M80 220V80h28l42 70 42-70h28v140h-28v-88l-42 66-42-66v88H80z"
|
||||||
|
fill="url(#magentGlow)"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 537 B |
26
scripts/build_release.ps1
Normal file
26
scripts/build_release.ps1
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
$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