andrew
59c369c9e2
Playlist detail page's status section (and the new two-column compare view) was never rendering: the router awaited status_service.playlist_status(), but that function is plain sync, so awaiting its dict return raised "object dict can't be used in 'await' expression" on every load, silently caught and shown as a generic fetch error. Removed the erroneous await. find-fuzzy-dupes.py's --apply and --apply-pairs both deleted by a `path::` regex query even though the beets id was already available in scope -- same mixed-path-storage issue (pre/post beets-2.11-upgrade items store absolute vs. library-relative paths) dedup-library.sh already worked around by deleting via id instead. This silently failed to match for most confirmed fuzzy-audio deletions (verified: 19 of 20 in one run). Added a delete_id column to dedup_candidates, threaded through the scan/apply pipeline, and switched both delete call sites to `id:`. Dedup scans also never checked whether a pair was already sitting in the pending list, so every re-scan (including the daily schedule) added a new row for the same unreviewed duplicate -- cleaned up 38 redundant rows already in production and added a check so future scans skip a pair that's already pending. Dashboard gets a Public IP stat card (cached 10 min, fetched via ipify) as a quick confidence check that outbound traffic is actually routed through gluetun's VPN and not the home connection.
53 lines
1.8 KiB
Python
53 lines
1.8 KiB
Python
import asyncio
|
|
import time
|
|
|
|
from fastapi import APIRouter, Depends, Request
|
|
from fastapi.templating import Jinja2Templates
|
|
from sqlalchemy import select
|
|
|
|
from app.db import get_db
|
|
from app.models import JobRun
|
|
from app.security.deps import require_auth
|
|
from app.services import beets_service, credential_service, network_service, playlist_service, scheduler_service
|
|
|
|
router = APIRouter(tags=["dashboard"])
|
|
templates = Jinja2Templates(directory="app/templates")
|
|
|
|
_RECENT_TRACKS_WINDOW_SECONDS = 24 * 60 * 60
|
|
|
|
|
|
def _human_bytes(n: int) -> str:
|
|
size = float(n)
|
|
for unit in ("B", "KB", "MB", "GB", "TB"):
|
|
if size < 1024 or unit == "TB":
|
|
return f"{size:.1f} {unit}"
|
|
size /= 1024
|
|
return f"{size:.1f} TB"
|
|
|
|
|
|
@router.get("/")
|
|
async def dashboard(request: Request, user: dict = Depends(require_auth), db=Depends(get_db)):
|
|
stats = beets_service.stats()
|
|
playlists = playlist_service.list_all(db)
|
|
recent_runs = list(
|
|
db.execute(select(JobRun).order_by(JobRun.started_at.desc()).limit(10)).scalars()
|
|
)
|
|
recent_tracks = beets_service.recently_added(time.time() - _RECENT_TRACKS_WINDOW_SECONDS)
|
|
public_ip = await asyncio.to_thread(network_service.public_ip)
|
|
return templates.TemplateResponse(
|
|
request,
|
|
"dashboard.html",
|
|
{
|
|
"user": user,
|
|
"stats": stats,
|
|
"total_size_human": _human_bytes(stats.get("total_bytes", 0)),
|
|
"playlist_count": len(playlists),
|
|
"active_playlist_count": len([p for p in playlists if p.active]),
|
|
"recent_runs": recent_runs,
|
|
"recent_tracks": recent_tracks,
|
|
"auth_states": credential_service.auth_states(db),
|
|
"humanize_job_key": scheduler_service.humanize_job_key,
|
|
"public_ip": public_ip,
|
|
},
|
|
)
|