Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
75129db86c | ||
|
|
8b79371d36 | ||
|
|
dca82a1c54 | ||
|
|
422d372122 |
@@ -9,7 +9,24 @@ It retrieves metadata from Spotify and locates matching audio on YouTube.
|
|||||||
|
|
||||||
Deterministic Spotify metadata ingestion with duration-aware YouTube candidate scoring, paced queue execution, hardened Docker deployment, and local archival workflows.
|
Deterministic Spotify metadata ingestion with duration-aware YouTube candidate scoring, paced queue execution, hardened Docker deployment, and local archival workflows.
|
||||||
|
|
||||||
Current version: 3.0.0
|
Current version: 3.1.0
|
||||||
|
|
||||||
|
## What's New in 3.1.0
|
||||||
|
|
||||||
|
Jarri Spooty 3.1.0 introduces the first generation of operational truth contracts.
|
||||||
|
|
||||||
|
New capabilities include:
|
||||||
|
|
||||||
|
- Operations Snapshot API
|
||||||
|
- Candidate selection provenance
|
||||||
|
- Selected YouTube candidate persistence
|
||||||
|
- Rejected YouTube candidate persistence
|
||||||
|
- Candidate scoring visibility
|
||||||
|
- Candidate selection reasoning
|
||||||
|
- Improved Workspace diagnostics
|
||||||
|
- Backend-owned operational truth for future Workspace integrations
|
||||||
|
|
||||||
|
Spooty now exposes why a candidate was selected rather than treating YouTube matching as a black box.
|
||||||
|
|
||||||
This hardened branch focuses on:
|
This hardened branch focuses on:
|
||||||
|
|
||||||
@@ -31,7 +48,10 @@ This hardened branch focuses on:
|
|||||||
- Reduced unused dependency surface
|
- Reduced unused dependency surface
|
||||||
- Hardened filename, cover-art, subprocess, and websocket boundaries
|
- Hardened filename, cover-art, subprocess, and websocket boundaries
|
||||||
- Workspace Archive Browser MVP with scoped read-only archive listing
|
- Workspace Archive Browser MVP with scoped read-only archive listing
|
||||||
- Workspace Candidate Inspector MVP for selected track details
|
- Workspace Candidate Inspector with candidate provenance
|
||||||
|
- Operations Snapshot API
|
||||||
|
- Candidate scoring visibility
|
||||||
|
- Candidate rejection persistence
|
||||||
- Frontend archive destination field for planned per-run routing
|
- Frontend archive destination field for planned per-run routing
|
||||||
- Frontend Workspace tabs for Intake, Archive, and Diagnostics layouts
|
- Frontend Workspace tabs for Intake, Archive, and Diagnostics layouts
|
||||||
|
|
||||||
@@ -53,11 +73,15 @@ This hardened branch focuses on:
|
|||||||
- Automatic YouTube retry/fallback handling
|
- Automatic YouTube retry/fallback handling
|
||||||
- Failed YouTube candidate rejection memory
|
- Failed YouTube candidate rejection memory
|
||||||
- Deterministic yt-dlp error classification
|
- Deterministic yt-dlp error classification
|
||||||
|
- Candidate scoring visibility
|
||||||
|
- Candidate selection reasoning
|
||||||
|
- Candidate provenance persistence
|
||||||
- Hardened cover-art validation and embedding
|
- Hardened cover-art validation and embedding
|
||||||
- Explicit client-facing websocket payload shaping
|
- Explicit client-facing websocket payload shaping
|
||||||
- Draggable/resizable Workspace UI
|
- Draggable/resizable Workspace UI
|
||||||
- Archive Browser panel for downloaded file inspection
|
- Archive Browser panel for downloaded file inspection
|
||||||
- Candidate Inspector panel for selected track diagnostics
|
- Candidate Inspector panel for selected track diagnostics
|
||||||
|
- Operations Snapshot diagnostics API
|
||||||
- Frontend-persisted archive destination input
|
- Frontend-persisted archive destination input
|
||||||
- Per-tab workspace layout presets
|
- Per-tab workspace layout presets
|
||||||
- Read-only archive search, sort, and grouped file inspection
|
- Read-only archive search, sort, and grouped file inspection
|
||||||
@@ -66,7 +90,7 @@ This hardened branch focuses on:
|
|||||||
|
|
||||||
# Workspace UI
|
# Workspace UI
|
||||||
|
|
||||||
Jarri Spooty 3.0.0 introduces a draggable/resizable Workspace shell with frontend tab presets.
|
Jarri Spooty 3.1.0 introduces a draggable/resizable Workspace shell with frontend tab presets.
|
||||||
|
|
||||||
Workspace tabs:
|
Workspace tabs:
|
||||||
|
|
||||||
@@ -79,11 +103,11 @@ Each tab has its own persisted panel layout in browser localStorage. The old sin
|
|||||||
Workspace panels:
|
Workspace panels:
|
||||||
|
|
||||||
- Source Intake: Spotify connection, URL queueing, and a frontend-persisted Archive destination field
|
- Source Intake: Spotify connection, URL queueing, and a frontend-persisted Archive destination field
|
||||||
- Queue Observatory: Spotify, playlist, single-song, and archive-run metrics
|
- Queue Observatory: Spotify, playlist, single-song, archive, and runtime metrics
|
||||||
- Playlist History: existing playlist rows and delete completed/delete failed controls
|
- Playlist History: existing playlist rows and delete completed/delete failed controls
|
||||||
- Single Songs: existing single-track queue rows
|
- Single Songs: existing single-track queue rows
|
||||||
- Archive Browser: read-only browser-style listing of downloaded files inside the configured downloads root, with search, sort, file count, total size, and top-level folder grouping
|
- Archive Browser: read-only browser-style listing of downloaded files inside the configured downloads root, with search, sort, file count, total size, and top-level folder grouping
|
||||||
- Candidate Inspector: selected track details including Spotify URL, selected YouTube candidate, status, error, retry attempts, rejected candidates when available, and a Back/Clear selection action
|
- Candidate Inspector: selected track details including Spotify URL, selected YouTube candidate, candidate score, candidate reasoning, status, error classification, error summary, retry attempts, rejected candidates, and download diagnostics
|
||||||
|
|
||||||
The Archive destination field is frontend-persisted planning state. Runtime downloads still use the backend `DOWNLOADS_PATH` root. Per-run destination routing is pending backend support.
|
The Archive destination field is frontend-persisted planning state. Runtime downloads still use the backend `DOWNLOADS_PATH` root. Per-run destination routing is pending backend support.
|
||||||
|
|
||||||
@@ -93,7 +117,40 @@ The Archive Browser uses:
|
|||||||
|
|
||||||
It returns the configured downloads root and files under that root only. It does not allow arbitrary filesystem browsing, deletion, moving, renaming, or path traversal.
|
It returns the configured downloads root and files under that root only. It does not allow arbitrary filesystem browsing, deletion, moving, renaming, or path traversal.
|
||||||
|
|
||||||
Candidate alternatives are limited to the selected YouTube URL and rejected YouTube URLs already stored for the track. Full scoring history is not persisted yet.
|
Candidate Inspector displays persisted candidate provenance including:
|
||||||
|
|
||||||
|
- Selected candidate
|
||||||
|
- Candidate score
|
||||||
|
- Candidate reasoning
|
||||||
|
- Rejected candidates
|
||||||
|
- Download attempts
|
||||||
|
- Error classification
|
||||||
|
- Error summaries
|
||||||
|
|
||||||
|
Full candidate-pool history is not yet retained.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
# Operations Snapshot API
|
||||||
|
|
||||||
|
Spooty exposes deterministic operational truth through:
|
||||||
|
|
||||||
|
GET /api/operations/snapshot
|
||||||
|
|
||||||
|
This endpoint provides:
|
||||||
|
|
||||||
|
- Runtime operation state
|
||||||
|
- Queue depths
|
||||||
|
- Active searches
|
||||||
|
- Active downloads
|
||||||
|
- Playlist counts
|
||||||
|
- Track counts
|
||||||
|
- Failure summaries
|
||||||
|
- Candidate-selection metadata
|
||||||
|
|
||||||
|
The endpoint is intended for Workspace integrations and diagnostics surfaces.
|
||||||
|
|
||||||
|
Workspace consumes this truth rather than deriving operational state independently.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -119,7 +176,7 @@ Example:
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
# Quick Start (Recommended)
|
# Quick Start Recommended
|
||||||
|
|
||||||
## 1. Create Spotify Developer App
|
## 1. Create Spotify Developer App
|
||||||
|
|
||||||
@@ -144,23 +201,21 @@ Copy:
|
|||||||
|
|
||||||
Create a secure env file:
|
Create a secure env file:
|
||||||
|
|
||||||
~~~bash
|
sudo mkdir -p /etc/tokens
|
||||||
sudo mkdir -p /etc/tokens
|
|
||||||
|
|
||||||
sudo tee /etc/tokens/spotify.env > /dev/null <<'EOT'
|
sudo tee /etc/tokens/spotify.env > /dev/null <<'EOT'
|
||||||
SPOTIFY_CLIENT_ID=your_client_id
|
SPOTIFY_CLIENT_ID=your_client_id
|
||||||
SPOTIFY_CLIENT_SECRET=your_client_secret
|
SPOTIFY_CLIENT_SECRET=your_client_secret
|
||||||
EOT
|
EOT
|
||||||
|
|
||||||
sudo chown root:$USER /etc/tokens/spotify.env
|
sudo chown root:$USER /etc/tokens/spotify.env
|
||||||
sudo chmod 640 /etc/tokens/spotify.env
|
sudo chmod 640 /etc/tokens/spotify.env
|
||||||
~~~
|
|
||||||
|
|
||||||
Never commit this file.
|
Never commit this file.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 3. Export YouTube Cookies (Recommended)
|
## 3. Export YouTube Cookies Recommended
|
||||||
|
|
||||||
YouTube increasingly rate-limits or age-gates anonymous downloads.
|
YouTube increasingly rate-limits or age-gates anonymous downloads.
|
||||||
|
|
||||||
@@ -168,30 +223,26 @@ Export a Netscape-format `cookies.txt` from a logged-in browser session.
|
|||||||
|
|
||||||
Recommended storage:
|
Recommended storage:
|
||||||
|
|
||||||
~~~bash
|
sudo cp cookies.txt /etc/tokens/youtube.cookies.txt
|
||||||
sudo cp cookies.txt /etc/tokens/youtube.cookies.txt
|
sudo chown root:$USER /etc/tokens/youtube.cookies.txt
|
||||||
sudo chown root:$USER /etc/tokens/youtube.cookies.txt
|
sudo chmod 640 /etc/tokens/youtube.cookies.txt
|
||||||
sudo chmod 640 /etc/tokens/youtube.cookies.txt
|
|
||||||
~~~
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
# Docker Run
|
# Docker Run
|
||||||
|
|
||||||
~~~bash
|
docker run --rm -p 3000:3000 \
|
||||||
docker run --rm -p 3000:3000 \
|
--env-file /etc/tokens/spotify.env \
|
||||||
--env-file /etc/tokens/spotify.env \
|
-e SPOTIFY_REDIRECT_URI='http://127.0.0.1:3000/api/spotify/callback' \
|
||||||
-e SPOTIFY_REDIRECT_URI='http://127.0.0.1:3000/api/spotify/callback' \
|
-e AUTH_ENABLED=true \
|
||||||
-e AUTH_ENABLED=true \
|
-e SPOOTY_AUTH_TOKEN=change_this_token \
|
||||||
-e SPOOTY_AUTH_TOKEN=change_this_token \
|
-e YT_SEARCH_DELAY_MS=7000 \
|
||||||
-e YT_SEARCH_DELAY_MS=7000 \
|
-e YT_DOWNLOADS_PER_MINUTE=6 \
|
||||||
-e YT_DOWNLOADS_PER_MINUTE=6 \
|
-e YT_COOKIES_FILE=/spooty/config/youtube.cookies.txt \
|
||||||
-e YT_COOKIES_FILE=/spooty/config/youtube.cookies.txt \
|
-v "$PWD/downloads:/spooty/backend/downloads" \
|
||||||
-v "$PWD/downloads:/spooty/backend/downloads" \
|
-v "$PWD/spooty-config:/spooty/backend/config" \
|
||||||
-v "$PWD/spooty-config:/spooty/backend/config" \
|
-v "/etc/tokens/youtube.cookies.txt:/spooty/config/youtube.cookies.txt:ro" \
|
||||||
-v "/etc/tokens/youtube.cookies.txt:/spooty/config/youtube.cookies.txt:ro" \
|
jarri-spooty:local
|
||||||
jarri-spooty:local
|
|
||||||
~~~
|
|
||||||
|
|
||||||
Open:
|
Open:
|
||||||
|
|
||||||
@@ -209,7 +260,7 @@ Then:
|
|||||||
|
|
||||||
# Deterministic YouTube Fallback Handling
|
# Deterministic YouTube Fallback Handling
|
||||||
|
|
||||||
The hardened branch now uses direct `yt-dlp` CLI execution rather than relying entirely on wrapper abstractions.
|
The hardened branch uses direct `yt-dlp` CLI execution rather than relying entirely on wrapper abstractions.
|
||||||
|
|
||||||
This provides:
|
This provides:
|
||||||
|
|
||||||
@@ -242,10 +293,8 @@ Aggressive YouTube access can trigger:
|
|||||||
|
|
||||||
Recommended safe pacing:
|
Recommended safe pacing:
|
||||||
|
|
||||||
~~~bash
|
-e YT_SEARCH_DELAY_MS=7000
|
||||||
-e YT_SEARCH_DELAY_MS=7000
|
-e YT_DOWNLOADS_PER_MINUTE=6
|
||||||
-e YT_DOWNLOADS_PER_MINUTE=6
|
|
||||||
~~~
|
|
||||||
|
|
||||||
The hardened branch also includes additional internal pacing and retry coordination to reduce:
|
The hardened branch also includes additional internal pacing and retry coordination to reduce:
|
||||||
|
|
||||||
@@ -269,15 +318,13 @@ Never commit:
|
|||||||
|
|
||||||
Recommended `.gitignore` additions:
|
Recommended `.gitignore` additions:
|
||||||
|
|
||||||
~~~gitignore
|
downloads/
|
||||||
downloads/
|
config/
|
||||||
config/
|
spooty-config/
|
||||||
spooty-config/
|
*.sqlite
|
||||||
*.sqlite
|
cookies.txt
|
||||||
cookies.txt
|
.env
|
||||||
.env
|
.env.local
|
||||||
.env.local
|
|
||||||
~~~
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
Generated
+4
-4
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "spooty",
|
"name": "spooty",
|
||||||
"version": "3.0.0",
|
"version": "3.1.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "spooty",
|
"name": "spooty",
|
||||||
"version": "3.0.0",
|
"version": "3.1.0",
|
||||||
"workspaces": [
|
"workspaces": [
|
||||||
"src/backend",
|
"src/backend",
|
||||||
"src/frontend"
|
"src/frontend"
|
||||||
@@ -25508,7 +25508,7 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"src/backend": {
|
"src/backend": {
|
||||||
"version": "3.0.0",
|
"version": "3.1.0",
|
||||||
"license": "UNLICENSED",
|
"license": "UNLICENSED",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@nestjs/bullmq": "^10.2.3",
|
"@nestjs/bullmq": "^10.2.3",
|
||||||
@@ -25571,7 +25571,7 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"src/frontend": {
|
"src/frontend": {
|
||||||
"version": "3.0.0",
|
"version": "3.1.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "^19.2.22",
|
"@angular/animations": "^19.2.22",
|
||||||
"@angular/common": "^19.2.22",
|
"@angular/common": "^19.2.22",
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"version": "3.0.0",
|
"version": "3.1.0",
|
||||||
"name": "spooty",
|
"name": "spooty",
|
||||||
"workspaces": [
|
"workspaces": [
|
||||||
"src/backend",
|
"src/backend",
|
||||||
|
|||||||
@@ -9,7 +9,10 @@ TOKEN="${SPOOTY_AUTH_TOKEN:-test-token}"
|
|||||||
DOWNLOADS="${DOWNLOADS:-$PROJECT/test-downloads}"
|
DOWNLOADS="${DOWNLOADS:-$PROJECT/test-downloads}"
|
||||||
CONFIG_DIR="${CONFIG_DIR:-$PROJECT/spooty-config}"
|
CONFIG_DIR="${CONFIG_DIR:-$PROJECT/spooty-config}"
|
||||||
ENV_FILE="${ENV_FILE:-/etc/tokens/spotify.env}"
|
ENV_FILE="${ENV_FILE:-/etc/tokens/spotify.env}"
|
||||||
|
|
||||||
YT_COOKIES_FILE_HOST="${YT_COOKIES_FILE_HOST:-/etc/tokens/youtube.cookies.txt}"
|
YT_COOKIES_FILE_HOST="${YT_COOKIES_FILE_HOST:-/etc/tokens/youtube.cookies.txt}"
|
||||||
|
RUNTIME_SECRETS_DIR="${RUNTIME_SECRETS_DIR:-$PROJECT/spooty-runtime-secrets}"
|
||||||
|
YT_COOKIES_FILE_STAGED="${YT_COOKIES_FILE_STAGED:-$RUNTIME_SECRETS_DIR/youtube.cookies.txt}"
|
||||||
YT_COOKIES_FILE_CONTAINER="${YT_COOKIES_FILE_CONTAINER:-/spooty/config/youtube.cookies.txt}"
|
YT_COOKIES_FILE_CONTAINER="${YT_COOKIES_FILE_CONTAINER:-/spooty/config/youtube.cookies.txt}"
|
||||||
|
|
||||||
cd "$PROJECT"
|
cd "$PROJECT"
|
||||||
@@ -28,6 +31,18 @@ if [[ "${1:-}" == "--build" ]]; then
|
|||||||
$DOCKER build -t "$IMAGE" .
|
$DOCKER build -t "$IMAGE" .
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo "== Preparing runtime directories =="
|
||||||
|
mkdir -p "$DOWNLOADS" "$CONFIG_DIR" "$RUNTIME_SECRETS_DIR"
|
||||||
|
|
||||||
|
if [[ -f "$YT_COOKIES_FILE_HOST" ]]; then
|
||||||
|
echo "== Staging YouTube cookies =="
|
||||||
|
cp "$YT_COOKIES_FILE_HOST" "$YT_COOKIES_FILE_STAGED"
|
||||||
|
chmod 0666 "$YT_COOKIES_FILE_STAGED"
|
||||||
|
else
|
||||||
|
echo "ERROR: YouTube cookies file not found: $YT_COOKIES_FILE_HOST" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
echo "== Removing named container if present =="
|
echo "== Removing named container if present =="
|
||||||
$DOCKER rm -f "$CONTAINER" >/dev/null 2>&1 || true
|
$DOCKER rm -f "$CONTAINER" >/dev/null 2>&1 || true
|
||||||
|
|
||||||
@@ -37,8 +52,6 @@ if [[ -n "$PORT_CONTAINERS" ]]; then
|
|||||||
$DOCKER rm -f $PORT_CONTAINERS
|
$DOCKER rm -f $PORT_CONTAINERS
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "$DOWNLOADS" "$CONFIG_DIR"
|
|
||||||
|
|
||||||
echo "== Starting Jarri Spooty =="
|
echo "== Starting Jarri Spooty =="
|
||||||
$DOCKER run -d \
|
$DOCKER run -d \
|
||||||
--name "$CONTAINER" \
|
--name "$CONTAINER" \
|
||||||
@@ -52,7 +65,7 @@ $DOCKER run -d \
|
|||||||
-e YT_DOWNLOAD_FALLBACK_ATTEMPTS=3 \
|
-e YT_DOWNLOAD_FALLBACK_ATTEMPTS=3 \
|
||||||
-e YT_COOKIES_FILE="$YT_COOKIES_FILE_CONTAINER" \
|
-e YT_COOKIES_FILE="$YT_COOKIES_FILE_CONTAINER" \
|
||||||
-v "$DOWNLOADS:/spooty/backend/downloads" \
|
-v "$DOWNLOADS:/spooty/backend/downloads" \
|
||||||
-v "$YT_COOKIES_FILE_HOST:$YT_COOKIES_FILE_CONTAINER:ro" \
|
-v "$YT_COOKIES_FILE_STAGED:$YT_COOKIES_FILE_CONTAINER" \
|
||||||
-v "$CONFIG_DIR:/spooty/backend/config" \
|
-v "$CONFIG_DIR:/spooty/backend/config" \
|
||||||
"$IMAGE"
|
"$IMAGE"
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "backend",
|
"name": "backend",
|
||||||
"version": "3.0.0",
|
"version": "3.1.0",
|
||||||
"description": "",
|
"description": "",
|
||||||
"author": "",
|
"author": "",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
|||||||
@@ -200,7 +200,18 @@ export class TrackService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private rejectCurrentYoutubeCandidate(
|
private isPermanentYoutubeCandidateRejection(
|
||||||
|
reason: RejectionReason,
|
||||||
|
): boolean {
|
||||||
|
return [
|
||||||
|
'YOUTUBE_VIDEO_UNAVAILABLE',
|
||||||
|
'YOUTUBE_AGE_GATED',
|
||||||
|
'YOUTUBE_NO_FORMATS',
|
||||||
|
'YOUTUBE_PRIVATE_VIDEO',
|
||||||
|
].includes(reason.rejectionClass);
|
||||||
|
}
|
||||||
|
|
||||||
|
private recordCurrentYoutubeCandidateFailure(
|
||||||
track: TrackEntity,
|
track: TrackEntity,
|
||||||
reason: RejectionReason,
|
reason: RejectionReason,
|
||||||
): {
|
): {
|
||||||
@@ -212,7 +223,10 @@ export class TrackService {
|
|||||||
const rejectedCandidate = this.buildRejectedYoutubeCandidate(track, reason);
|
const rejectedCandidate = this.buildRejectedYoutubeCandidate(track, reason);
|
||||||
|
|
||||||
if (rejectedCandidate) {
|
if (rejectedCandidate) {
|
||||||
if (!rejectedUrls.includes(rejectedCandidate.url)) {
|
if (
|
||||||
|
this.isPermanentYoutubeCandidateRejection(reason) &&
|
||||||
|
!rejectedUrls.includes(rejectedCandidate.url)
|
||||||
|
) {
|
||||||
rejectedUrls.push(rejectedCandidate.url);
|
rejectedUrls.push(rejectedCandidate.url);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -299,11 +313,6 @@ export class TrackService {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const rejectedCandidateFields = this.rejectCurrentYoutubeCandidate(track, {
|
|
||||||
rejectionClass: 'MANUAL_RETRY',
|
|
||||||
rejectionSummary: 'Rejected by manual retry',
|
|
||||||
});
|
|
||||||
|
|
||||||
await this.update(id, {
|
await this.update(id, {
|
||||||
...track,
|
...track,
|
||||||
youtubeUrl: null,
|
youtubeUrl: null,
|
||||||
@@ -311,7 +320,9 @@ export class TrackService {
|
|||||||
selectedYoutubeAuthor: null,
|
selectedYoutubeAuthor: null,
|
||||||
selectedYoutubeScore: null,
|
selectedYoutubeScore: null,
|
||||||
selectedYoutubeReason: null,
|
selectedYoutubeReason: null,
|
||||||
...rejectedCandidateFields,
|
rejectedYoutubeUrls: track.rejectedYoutubeUrls || JSON.stringify([]),
|
||||||
|
rejectedYoutubeCandidatesJson:
|
||||||
|
track.rejectedYoutubeCandidatesJson || JSON.stringify([]),
|
||||||
downloadAttemptCount: 0,
|
downloadAttemptCount: 0,
|
||||||
error: null,
|
error: null,
|
||||||
status: TrackStatusEnum.New,
|
status: TrackStatusEnum.New,
|
||||||
@@ -476,7 +487,7 @@ export class TrackService {
|
|||||||
const nextAttemptCount = (track.downloadAttemptCount || 0) + 1;
|
const nextAttemptCount = (track.downloadAttemptCount || 0) + 1;
|
||||||
const maxAttempts = this.getMaxDownloadAttempts();
|
const maxAttempts = this.getMaxDownloadAttempts();
|
||||||
const rejectedCandidateFields = error
|
const rejectedCandidateFields = error
|
||||||
? this.rejectCurrentYoutubeCandidate(track, this.classifyRejection(error))
|
? this.recordCurrentYoutubeCandidateFailure(track, this.classifyRejection(error))
|
||||||
: {
|
: {
|
||||||
rejectedYoutubeUrls: this.stringifyRejectedYoutubeUrls(
|
rejectedYoutubeUrls: this.stringifyRejectedYoutubeUrls(
|
||||||
this.parseRejectedYoutubeUrls(track),
|
this.parseRejectedYoutubeUrls(track),
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "frontend",
|
"name": "frontend",
|
||||||
"version": "3.0.0",
|
"version": "3.1.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "ng serve --proxy-config proxy.conf.json",
|
"start": "ng serve --proxy-config proxy.conf.json",
|
||||||
|
|||||||
@@ -4,15 +4,18 @@
|
|||||||
<div class="brand-line">
|
<div class="brand-line">
|
||||||
<i class="fa-brands fa-spotify"></i>
|
<i class="fa-brands fa-spotify"></i>
|
||||||
<h1>Jarri Spooty</h1>
|
<h1>Jarri Spooty</h1>
|
||||||
<span class="tag version-tag">v{{version}}</span>
|
<span class="tag version-tag">v{{ version }}</span>
|
||||||
</div>
|
</div>
|
||||||
<p>Spotify metadata → YouTube candidate scoring → Local archive</p>
|
<p>Spotify metadata → YouTube candidate scoring → Local archive</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="truth-strip">
|
<div class="truth-strip">
|
||||||
<span class="truth-pill" [class.connected]="spotifyConnected">
|
<span class="truth-pill" [class.connected]="spotifyConnected">
|
||||||
<i class="fa-solid" [ngClass]="spotifyConnected ? 'fa-circle-check' : 'fa-plug'"></i>
|
<i
|
||||||
{{ spotifyConnected ? 'Spotify connected' : 'Spotify disconnected' }}
|
class="fa-solid"
|
||||||
|
[ngClass]="spotifyConnected ? 'fa-circle-check' : 'fa-plug'"
|
||||||
|
></i>
|
||||||
|
{{ spotifyConnected ? "Spotify connected" : "Spotify disconnected" }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
@@ -49,7 +52,11 @@
|
|||||||
<i class="fa-solid fa-rotate-left"></i>
|
<i class="fa-solid fa-rotate-left"></i>
|
||||||
Reset Current Tab
|
Reset Current Tab
|
||||||
</button>
|
</button>
|
||||||
<button class="button reset-button" type="button" (click)="resetAllLayouts()">
|
<button
|
||||||
|
class="button reset-button"
|
||||||
|
type="button"
|
||||||
|
(click)="resetAllLayouts()"
|
||||||
|
>
|
||||||
<i class="fa-solid fa-rotate"></i>
|
<i class="fa-solid fa-rotate"></i>
|
||||||
Reset All Tabs
|
Reset All Tabs
|
||||||
</button>
|
</button>
|
||||||
@@ -88,8 +95,11 @@
|
|||||||
[class.connected]="spotifyConnected"
|
[class.connected]="spotifyConnected"
|
||||||
(click)="connectSpotify()"
|
(click)="connectSpotify()"
|
||||||
>
|
>
|
||||||
<i class="fa-solid" [ngClass]="spotifyConnected ? 'fa-circle-check' : 'fa-plug'"></i>
|
<i
|
||||||
{{ spotifyConnected ? 'Spotify connected' : 'Connect Spotify' }}
|
class="fa-solid"
|
||||||
|
[ngClass]="spotifyConnected ? 'fa-circle-check' : 'fa-plug'"
|
||||||
|
></i>
|
||||||
|
{{ spotifyConnected ? "Spotify connected" : "Connect Spotify" }}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div class="intake-form">
|
<div class="intake-form">
|
||||||
@@ -121,7 +131,10 @@
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
<div class="truth-note">
|
<div class="truth-note">
|
||||||
<p>Runtime download root: {{ archiveListing?.root || archiveDestination || 'loading...' }}</p>
|
<p>
|
||||||
|
Runtime download root:
|
||||||
|
{{ archiveListing?.root || archiveDestination || "loading..." }}
|
||||||
|
</p>
|
||||||
<p>Per-run destination routing: pending backend support</p>
|
<p>Per-run destination routing: pending backend support</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -135,7 +148,9 @@
|
|||||||
<ng-container *ngIf="songs$ | async as songs">
|
<ng-container *ngIf="songs$ | async as songs">
|
||||||
<div class="metric-card">
|
<div class="metric-card">
|
||||||
<span>Spotify</span>
|
<span>Spotify</span>
|
||||||
<strong [class.online]="spotifyConnected">{{ spotifyConnected ? 'Connected' : 'Disconnected' }}</strong>
|
<strong [class.online]="spotifyConnected">{{
|
||||||
|
spotifyConnected ? "Connected" : "Disconnected"
|
||||||
|
}}</strong>
|
||||||
</div>
|
</div>
|
||||||
<div class="metric-card">
|
<div class="metric-card">
|
||||||
<span>Playlists</span>
|
<span>Playlists</span>
|
||||||
@@ -160,18 +175,31 @@
|
|||||||
<p>One collapsed row per playlist run.</p>
|
<p>One collapsed row per playlist run.</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="buttons has-addons">
|
<div class="buttons has-addons">
|
||||||
<button class="button is-outlined is-success" title="Remove completed from list" (click)="deleteCompleted()">
|
<button
|
||||||
|
class="button is-outlined is-success"
|
||||||
|
title="Remove completed from list"
|
||||||
|
(click)="deleteCompleted()"
|
||||||
|
>
|
||||||
<i class="fa-solid fa-check"></i>
|
<i class="fa-solid fa-check"></i>
|
||||||
</button>
|
</button>
|
||||||
<button class="button is-outlined is-danger" title="Remove failed from list" (click)="deleteFailed()">
|
<button
|
||||||
|
class="button is-outlined is-danger"
|
||||||
|
title="Remove failed from list"
|
||||||
|
(click)="deleteFailed()"
|
||||||
|
>
|
||||||
<i class="fa-solid fa-xmark"></i>
|
<i class="fa-solid fa-xmark"></i>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ng-container *ngIf="playlists$ | async as playlists">
|
<ng-container *ngIf="playlists$ | async as playlists">
|
||||||
<app-playlist-box *ngFor="let playlist of playlists" [playlist]="playlist"></app-playlist-box>
|
<app-playlist-box
|
||||||
<p *ngIf="playlists?.length === 0" class="empty-state">No playlists</p>
|
*ngFor="let playlist of playlists"
|
||||||
|
[playlist]="playlist"
|
||||||
|
></app-playlist-box>
|
||||||
|
<p *ngIf="playlists?.length === 0" class="empty-state">
|
||||||
|
No playlists
|
||||||
|
</p>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
@@ -184,7 +212,10 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ng-container *ngIf="songs$ | async as songs">
|
<ng-container *ngIf="songs$ | async as songs">
|
||||||
<app-playlist-box *ngFor="let playlist of songs" [playlist]="playlist"></app-playlist-box>
|
<app-playlist-box
|
||||||
|
*ngFor="let playlist of songs"
|
||||||
|
[playlist]="playlist"
|
||||||
|
></app-playlist-box>
|
||||||
<p *ngIf="songs?.length === 0" class="empty-state">No songs</p>
|
<p *ngIf="songs?.length === 0" class="empty-state">No songs</p>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
</section>
|
</section>
|
||||||
@@ -193,9 +224,14 @@
|
|||||||
<div class="section-toolbar">
|
<div class="section-toolbar">
|
||||||
<div>
|
<div>
|
||||||
<h2>Archive Browser</h2>
|
<h2>Archive Browser</h2>
|
||||||
<p>Root: {{ archiveListing?.root || 'loading...' }}</p>
|
<p>Root: {{ archiveListing?.root || "loading..." }}</p>
|
||||||
</div>
|
</div>
|
||||||
<button class="button is-small reset-button" type="button" [class.is-loading]="archiveLoading" (click)="refreshArchive()">
|
<button
|
||||||
|
class="button is-small reset-button"
|
||||||
|
type="button"
|
||||||
|
[class.is-loading]="archiveLoading"
|
||||||
|
(click)="refreshArchive()"
|
||||||
|
>
|
||||||
<i class="fa-solid fa-rotate"></i>
|
<i class="fa-solid fa-rotate"></i>
|
||||||
Refresh
|
Refresh
|
||||||
</button>
|
</button>
|
||||||
@@ -226,24 +262,40 @@
|
|||||||
placeholder="Search archive"
|
placeholder="Search archive"
|
||||||
/>
|
/>
|
||||||
<div class="select is-small">
|
<div class="select is-small">
|
||||||
<select [(ngModel)]="archiveSort" aria-label="Sort archive files">
|
<select
|
||||||
<option *ngFor="let sortMode of archiveSortModes" [ngValue]="sortMode">
|
[(ngModel)]="archiveSort"
|
||||||
|
aria-label="Sort archive files"
|
||||||
|
>
|
||||||
|
<option
|
||||||
|
*ngFor="let sortMode of archiveSortModes"
|
||||||
|
[ngValue]="sortMode"
|
||||||
|
>
|
||||||
{{ sortMode }}
|
{{ sortMode }}
|
||||||
</option>
|
</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p *ngIf="archiveFileCount() === 0" class="empty-state">No downloaded files found.</p>
|
<p *ngIf="archiveFileCount() === 0" class="empty-state">
|
||||||
|
No downloaded files found.
|
||||||
|
</p>
|
||||||
|
|
||||||
<section *ngFor="let group of archiveGroups()" class="archive-group">
|
<section
|
||||||
|
*ngFor="let group of archiveGroups()"
|
||||||
|
class="archive-group"
|
||||||
|
>
|
||||||
<h3>
|
<h3>
|
||||||
<i class="fa-solid fa-folder"></i>
|
<i class="fa-solid fa-folder"></i>
|
||||||
{{ group.folder }}
|
{{ group.folder }}
|
||||||
</h3>
|
</h3>
|
||||||
|
|
||||||
<div *ngFor="let file of group.files" class="archive-file-card">
|
<div *ngFor="let file of group.files" class="archive-file-card">
|
||||||
<i class="fa-solid" [ngClass]="hasFolder(file) ? 'fa-folder-tree' : 'fa-file-audio'"></i>
|
<i
|
||||||
|
class="fa-solid"
|
||||||
|
[ngClass]="
|
||||||
|
hasFolder(file) ? 'fa-folder-tree' : 'fa-file-audio'
|
||||||
|
"
|
||||||
|
></i>
|
||||||
<div>
|
<div>
|
||||||
<strong>{{ file.name }}</strong>
|
<strong>{{ file.name }}</strong>
|
||||||
<span>{{ folderPath(file) }}</span>
|
<span>{{ folderPath(file) }}</span>
|
||||||
@@ -256,47 +308,157 @@
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section *ngSwitchCase="'candidate-inspector'" class="history-panel">
|
<section *ngSwitchCase="'candidate-inspector'" class="history-panel">
|
||||||
<ng-container *ngIf="selectedTrack$ | async as selectedTrack; else noTrackSelected">
|
<ng-container
|
||||||
|
*ngIf="
|
||||||
|
selectedTrack$ | async as selectedTrack;
|
||||||
|
else noTrackSelected
|
||||||
|
"
|
||||||
|
>
|
||||||
<div class="section-toolbar">
|
<div class="section-toolbar">
|
||||||
<div>
|
<div>
|
||||||
<h2>{{ selectedTrack.artist }} - {{ selectedTrack.name }}</h2>
|
<h2>{{ selectedTrack.artist }} - {{ selectedTrack.name }}</h2>
|
||||||
<p>Status: {{ trackStatusLabel(selectedTrack.status) }}</p>
|
<p>Status: {{ trackStatusLabel(selectedTrack.status) }}</p>
|
||||||
</div>
|
</div>
|
||||||
<button class="button is-small reset-button" type="button" (click)="clearSelectedTrack()">
|
<button
|
||||||
|
class="button is-small reset-button"
|
||||||
|
type="button"
|
||||||
|
(click)="clearSelectedTrack()"
|
||||||
|
>
|
||||||
<i class="fa-solid fa-arrow-left"></i>
|
<i class="fa-solid fa-arrow-left"></i>
|
||||||
Back
|
Back
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<dl class="inspector-list">
|
<ng-container
|
||||||
<dt>Spotify URL</dt>
|
*ngIf="
|
||||||
<dd><a [href]="selectedTrack.spotifyUrl" target="_blank">{{ selectedTrack.spotifyUrl || 'none' }}</a></dd>
|
selectedTrackTruth(selectedTrack) as trackTruth;
|
||||||
<dt>Status</dt>
|
else noTrackTruth
|
||||||
<dd>{{ trackStatusLabel(selectedTrack.status) }}</dd>
|
"
|
||||||
<dt>Download attempts</dt>
|
>
|
||||||
<dd>{{ selectedTrack.downloadAttemptCount || 0 }}</dd>
|
<dl class="inspector-list">
|
||||||
<dt>Error</dt>
|
<dt>Spotify URL</dt>
|
||||||
<dd>{{ selectedTrack.error || 'none' }}</dd>
|
<dd>
|
||||||
</dl>
|
<a [href]="selectedTrack.spotifyUrl" target="_blank">{{
|
||||||
|
selectedTrack.spotifyUrl || "none"
|
||||||
|
}}</a>
|
||||||
|
</dd>
|
||||||
|
<dt>Status</dt>
|
||||||
|
<dd>{{ trackStatusLabel(selectedTrack.status) }}</dd>
|
||||||
|
<dt>Download attempts</dt>
|
||||||
|
<dd>{{ selectedTrack.downloadAttemptCount || 0 }}</dd>
|
||||||
|
<dt>Error class</dt>
|
||||||
|
<dd>{{ errorClass(trackTruth) }}</dd>
|
||||||
|
<dt>Error summary</dt>
|
||||||
|
<dd>{{ errorSummary(trackTruth) }}</dd>
|
||||||
|
<dt>Error detail</dt>
|
||||||
|
<dd>
|
||||||
|
<details
|
||||||
|
*ngIf="errorDetail(trackTruth); else noErrorDetail"
|
||||||
|
class="truth-detail"
|
||||||
|
>
|
||||||
|
<summary>Show backend evidence</summary>
|
||||||
|
<pre>{{ errorDetail(trackTruth) }}</pre>
|
||||||
|
</details>
|
||||||
|
<ng-template #noErrorDetail>none</ng-template>
|
||||||
|
</dd>
|
||||||
|
</dl>
|
||||||
|
|
||||||
<div class="candidate-options">
|
<div class="candidate-options">
|
||||||
<strong>Other options</strong>
|
<strong>Selected candidate</strong>
|
||||||
<p *ngIf="selectedTrack.youtubeUrl">
|
<ng-container
|
||||||
Selected candidate:
|
*ngIf="
|
||||||
<a [href]="selectedTrack.youtubeUrl" target="_blank">{{ selectedTrack.youtubeUrl }}</a>
|
selectedCandidate(trackTruth) as candidate;
|
||||||
</p>
|
else noSelectedCandidate
|
||||||
<p>Rejected candidates: {{ rejectedUrls(selectedTrack).length }}</p>
|
"
|
||||||
<a *ngFor="let url of rejectedUrls(selectedTrack)" [href]="url" target="_blank">{{ url }}</a>
|
>
|
||||||
<p *ngIf="!selectedTrack.youtubeUrl && rejectedUrls(selectedTrack).length === 0" class="empty-state">
|
<dl class="candidate-card">
|
||||||
Candidate alternatives are not persisted yet. Future scoring history will appear here.
|
<dt>URL</dt>
|
||||||
</p>
|
<dd>
|
||||||
</div>
|
<a [href]="candidate.url" target="_blank">{{
|
||||||
|
candidate.url
|
||||||
|
}}</a>
|
||||||
|
</dd>
|
||||||
|
<dt>Title</dt>
|
||||||
|
<dd>{{ candidate.title || "unknown" }}</dd>
|
||||||
|
<dt>Author</dt>
|
||||||
|
<dd>{{ candidate.author || "unknown" }}</dd>
|
||||||
|
<dt>Score</dt>
|
||||||
|
<dd>{{ candidate.score ?? "unknown" }}</dd>
|
||||||
|
<dt>Reason</dt>
|
||||||
|
<dd>{{ candidate.reason || "unknown" }}</dd>
|
||||||
|
</dl>
|
||||||
|
</ng-container>
|
||||||
|
<ng-template #noSelectedCandidate>
|
||||||
|
<p class="empty-state compact">No selected candidate.</p>
|
||||||
|
</ng-template>
|
||||||
|
|
||||||
|
<strong
|
||||||
|
>Rejected candidates:
|
||||||
|
{{ rejectedCandidateCount(trackTruth) }}</strong
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
*ngFor="let candidate of rejectedCandidates(trackTruth)"
|
||||||
|
class="candidate-card rejected-candidate-card"
|
||||||
|
>
|
||||||
|
<dl>
|
||||||
|
<dt>URL</dt>
|
||||||
|
<dd>
|
||||||
|
<a [href]="candidate.url" target="_blank">{{
|
||||||
|
candidate.url
|
||||||
|
}}</a>
|
||||||
|
</dd>
|
||||||
|
<dt>Title</dt>
|
||||||
|
<dd>{{ candidate.title || "unknown" }}</dd>
|
||||||
|
<dt>Author</dt>
|
||||||
|
<dd>{{ candidate.author || "unknown" }}</dd>
|
||||||
|
<dt>Score</dt>
|
||||||
|
<dd>{{ candidate.score ?? "unknown" }}</dd>
|
||||||
|
<dt>Reason</dt>
|
||||||
|
<dd>{{ candidate.reason || "unknown" }}</dd>
|
||||||
|
<dt>Rejection class</dt>
|
||||||
|
<dd>{{ candidate.rejectionClass || "unknown" }}</dd>
|
||||||
|
<dt>Rejection summary</dt>
|
||||||
|
<dd>{{ candidate.rejectionSummary || "unknown" }}</dd>
|
||||||
|
<dt>Rejected at</dt>
|
||||||
|
<dd>{{ candidate.rejectedAt || "unknown" }}</dd>
|
||||||
|
</dl>
|
||||||
|
</div>
|
||||||
|
<p
|
||||||
|
*ngIf="rejectedCandidateCount(trackTruth) === 0"
|
||||||
|
class="empty-state compact"
|
||||||
|
>
|
||||||
|
No rejected candidates.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-template #noTrackTruth>
|
||||||
|
<div class="placeholder-panel">
|
||||||
|
<i class="fa-solid fa-database"></i>
|
||||||
|
<p>
|
||||||
|
{{
|
||||||
|
operationsSnapshotError ||
|
||||||
|
"Waiting for backend operations truth."
|
||||||
|
}}
|
||||||
|
</p>
|
||||||
|
<button
|
||||||
|
class="button is-small reset-button"
|
||||||
|
type="button"
|
||||||
|
(click)="refreshOperationsSnapshot()"
|
||||||
|
>
|
||||||
|
Refresh truth
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</ng-template>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<ng-template #noTrackSelected>
|
<ng-template #noTrackSelected>
|
||||||
<div class="placeholder-panel">
|
<div class="placeholder-panel">
|
||||||
<i class="fa-solid fa-magnifying-glass-chart"></i>
|
<i class="fa-solid fa-magnifying-glass-chart"></i>
|
||||||
<p>Select a track row inside an expanded playlist to inspect Spotify, YouTube, retry, and error details.</p>
|
<p>
|
||||||
|
Select a track row inside an expanded playlist to inspect
|
||||||
|
Spotify, YouTube, retry, and error details.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<ng-container *ngIf="allTracks$ | async as allTracks">
|
<ng-container *ngIf="allTracks$ | async as allTracks">
|
||||||
<button
|
<button
|
||||||
|
|||||||
@@ -1,18 +1,27 @@
|
|||||||
import {Component, OnDestroy} from '@angular/core';
|
import { Component, OnDestroy } from '@angular/core';
|
||||||
import {FormsModule} from "@angular/forms";
|
import { FormsModule } from '@angular/forms';
|
||||||
import {CommonModule, NgFor} from "@angular/common";
|
import { CommonModule, NgFor } from '@angular/common';
|
||||||
import {PlaylistService, PlaylistStatusEnum} from "./services/playlist.service";
|
import {
|
||||||
import {PlaylistBoxComponent} from "./components/playlist-box/playlist-box.component";
|
PlaylistService,
|
||||||
import {VersionService} from "./services/version.service";
|
PlaylistStatusEnum,
|
||||||
import {map} from "rxjs";
|
} from './services/playlist.service';
|
||||||
import {HttpClient} from "@angular/common/http";
|
import { PlaylistBoxComponent } from './components/playlist-box/playlist-box.component';
|
||||||
import {ArchiveService} from "./services/archive.service";
|
import { VersionService } from './services/version.service';
|
||||||
import {ArchiveFile, ArchiveListing} from "./models/archive";
|
import { map } from 'rxjs';
|
||||||
import {Track, TrackStatusEnum} from "./models/track";
|
import { HttpClient } from '@angular/common/http';
|
||||||
import {TrackService} from "./services/track.service";
|
import { ArchiveService } from './services/archive.service';
|
||||||
|
import { ArchiveFile, ArchiveListing } from './models/archive';
|
||||||
|
import { Track, TrackStatusEnum } from './models/track';
|
||||||
|
import { TrackService } from './services/track.service';
|
||||||
|
import {
|
||||||
|
OperationsSnapshot,
|
||||||
|
RejectedCandidateTruth,
|
||||||
|
SelectedCandidateTruth,
|
||||||
|
TrackTruth,
|
||||||
|
} from './models/operations-snapshot';
|
||||||
|
|
||||||
export type SpootyPanelType =
|
export type SpootyPanelType =
|
||||||
'source-intake'
|
| 'source-intake'
|
||||||
| 'queue-observatory'
|
| 'queue-observatory'
|
||||||
| 'playlist-history'
|
| 'playlist-history'
|
||||||
| 'single-songs'
|
| 'single-songs'
|
||||||
@@ -66,20 +75,62 @@ const WORKSPACE_TAB_LABELS: Record<SpootyWorkspaceTab, string> = {
|
|||||||
const DEFAULT_TAB_PANELS: Record<SpootyWorkspaceTab, SpootyPanelInstance[]> = {
|
const DEFAULT_TAB_PANELS: Record<SpootyWorkspaceTab, SpootyPanelInstance[]> = {
|
||||||
intake: [
|
intake: [
|
||||||
makePanel('source-intake', 24, 24, 520, 336, 'intake-source-intake'),
|
makePanel('source-intake', 24, 24, 520, 336, 'intake-source-intake'),
|
||||||
makePanel('queue-observatory', 568, 24, 520, 260, 'intake-queue-observatory'),
|
makePanel(
|
||||||
|
'queue-observatory',
|
||||||
|
568,
|
||||||
|
24,
|
||||||
|
520,
|
||||||
|
260,
|
||||||
|
'intake-queue-observatory',
|
||||||
|
),
|
||||||
makePanel('playlist-history', 24, 392, 760, 448, 'intake-playlist-history'),
|
makePanel('playlist-history', 24, 392, 760, 448, 'intake-playlist-history'),
|
||||||
makePanel('single-songs', 820, 392, 520, 448, 'intake-single-songs'),
|
makePanel('single-songs', 820, 392, 520, 448, 'intake-single-songs'),
|
||||||
],
|
],
|
||||||
archive: [
|
archive: [
|
||||||
makePanel('archive-browser', 24, 24, 900, 720, 'archive-archive-browser'),
|
makePanel('archive-browser', 24, 24, 900, 720, 'archive-archive-browser'),
|
||||||
makePanel('source-intake', 960, 24, 420, 336, 'archive-source-intake'),
|
makePanel('source-intake', 960, 24, 420, 336, 'archive-source-intake'),
|
||||||
makePanel('queue-observatory', 960, 396, 420, 260, 'archive-queue-observatory'),
|
makePanel(
|
||||||
|
'queue-observatory',
|
||||||
|
960,
|
||||||
|
396,
|
||||||
|
420,
|
||||||
|
260,
|
||||||
|
'archive-queue-observatory',
|
||||||
|
),
|
||||||
],
|
],
|
||||||
diagnostics: [
|
diagnostics: [
|
||||||
makePanel('candidate-inspector', 24, 24, 620, 720, 'diagnostics-candidate-inspector'),
|
makePanel(
|
||||||
makePanel('playlist-history', 680, 24, 620, 520, 'diagnostics-playlist-history'),
|
'candidate-inspector',
|
||||||
makePanel('queue-observatory', 1320, 24, 420, 260, 'diagnostics-queue-observatory'),
|
24,
|
||||||
makePanel('archive-browser', 1320, 320, 420, 420, 'diagnostics-archive-browser'),
|
24,
|
||||||
|
620,
|
||||||
|
720,
|
||||||
|
'diagnostics-candidate-inspector',
|
||||||
|
),
|
||||||
|
makePanel(
|
||||||
|
'playlist-history',
|
||||||
|
680,
|
||||||
|
24,
|
||||||
|
620,
|
||||||
|
520,
|
||||||
|
'diagnostics-playlist-history',
|
||||||
|
),
|
||||||
|
makePanel(
|
||||||
|
'queue-observatory',
|
||||||
|
1320,
|
||||||
|
24,
|
||||||
|
420,
|
||||||
|
260,
|
||||||
|
'diagnostics-queue-observatory',
|
||||||
|
),
|
||||||
|
makePanel(
|
||||||
|
'archive-browser',
|
||||||
|
1320,
|
||||||
|
320,
|
||||||
|
420,
|
||||||
|
420,
|
||||||
|
'diagnostics-archive-browser',
|
||||||
|
),
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -106,9 +157,11 @@ export function defaultWorkspaceState(): SpootyWorkspaceState {
|
|||||||
return defaultWorkspaceStateForTab('intake');
|
return defaultWorkspaceStateForTab('intake');
|
||||||
}
|
}
|
||||||
|
|
||||||
export function defaultWorkspaceStateForTab(tab: SpootyWorkspaceTab): SpootyWorkspaceState {
|
export function defaultWorkspaceStateForTab(
|
||||||
|
tab: SpootyWorkspaceTab,
|
||||||
|
): SpootyWorkspaceState {
|
||||||
return {
|
return {
|
||||||
panels: DEFAULT_TAB_PANELS[tab].map(panel => ({...panel})),
|
panels: DEFAULT_TAB_PANELS[tab].map((panel) => ({ ...panel })),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -133,8 +186,8 @@ export function loadWorkspaceState(): SpootyWorkspaceState {
|
|||||||
|
|
||||||
const parsed = JSON.parse(raw) as SpootyWorkspaceState;
|
const parsed = JSON.parse(raw) as SpootyWorkspaceState;
|
||||||
const panels = parsed.panels
|
const panels = parsed.panels
|
||||||
?.filter(panel => panel?.id && panel?.type && PANEL_TITLES[panel.type])
|
?.filter((panel) => panel?.id && panel?.type && PANEL_TITLES[panel.type])
|
||||||
.map(panel => ({
|
.map((panel) => ({
|
||||||
...panel,
|
...panel,
|
||||||
title: PANEL_TITLES[panel.type],
|
title: PANEL_TITLES[panel.type],
|
||||||
x: snap(panel.x),
|
x: snap(panel.x),
|
||||||
@@ -143,7 +196,7 @@ export function loadWorkspaceState(): SpootyWorkspaceState {
|
|||||||
h: Math.max(MIN_PANEL_HEIGHT, snap(panel.h)),
|
h: Math.max(MIN_PANEL_HEIGHT, snap(panel.h)),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
return panels?.length ? {panels} : defaultWorkspaceState();
|
return panels?.length ? { panels } : defaultWorkspaceState();
|
||||||
} catch {
|
} catch {
|
||||||
return defaultWorkspaceState();
|
return defaultWorkspaceState();
|
||||||
}
|
}
|
||||||
@@ -156,11 +209,23 @@ export function loadWorkspaceTabsState(): SpootyWorkspaceTabsState {
|
|||||||
if (raw) {
|
if (raw) {
|
||||||
const parsed = JSON.parse(raw) as SpootyWorkspaceTabsState;
|
const parsed = JSON.parse(raw) as SpootyWorkspaceTabsState;
|
||||||
return {
|
return {
|
||||||
activeTab: parsed.activeTab && WORKSPACE_TAB_LABELS[parsed.activeTab] ? parsed.activeTab : 'intake',
|
activeTab:
|
||||||
|
parsed.activeTab && WORKSPACE_TAB_LABELS[parsed.activeTab]
|
||||||
|
? parsed.activeTab
|
||||||
|
: 'intake',
|
||||||
tabs: {
|
tabs: {
|
||||||
intake: sanitizeWorkspaceState(parsed.tabs?.intake, defaultWorkspaceStateForTab('intake')),
|
intake: sanitizeWorkspaceState(
|
||||||
archive: sanitizeWorkspaceState(parsed.tabs?.archive, defaultWorkspaceStateForTab('archive')),
|
parsed.tabs?.intake,
|
||||||
diagnostics: sanitizeWorkspaceState(parsed.tabs?.diagnostics, defaultWorkspaceStateForTab('diagnostics')),
|
defaultWorkspaceStateForTab('intake'),
|
||||||
|
),
|
||||||
|
archive: sanitizeWorkspaceState(
|
||||||
|
parsed.tabs?.archive,
|
||||||
|
defaultWorkspaceStateForTab('archive'),
|
||||||
|
),
|
||||||
|
diagnostics: sanitizeWorkspaceState(
|
||||||
|
parsed.tabs?.diagnostics,
|
||||||
|
defaultWorkspaceStateForTab('diagnostics'),
|
||||||
|
),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -182,8 +247,8 @@ function sanitizeWorkspaceState(
|
|||||||
fallback: SpootyWorkspaceState,
|
fallback: SpootyWorkspaceState,
|
||||||
): SpootyWorkspaceState {
|
): SpootyWorkspaceState {
|
||||||
const panels = state?.panels
|
const panels = state?.panels
|
||||||
?.filter(panel => panel?.id && panel?.type && PANEL_TITLES[panel.type])
|
?.filter((panel) => panel?.id && panel?.type && PANEL_TITLES[panel.type])
|
||||||
.map(panel => ({
|
.map((panel) => ({
|
||||||
...panel,
|
...panel,
|
||||||
title: PANEL_TITLES[panel.type],
|
title: PANEL_TITLES[panel.type],
|
||||||
x: snap(panel.x),
|
x: snap(panel.x),
|
||||||
@@ -192,7 +257,7 @@ function sanitizeWorkspaceState(
|
|||||||
h: Math.max(MIN_PANEL_HEIGHT, snap(panel.h)),
|
h: Math.max(MIN_PANEL_HEIGHT, snap(panel.h)),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
return panels?.length ? {panels} : fallback;
|
return panels?.length ? { panels } : fallback;
|
||||||
}
|
}
|
||||||
|
|
||||||
function snap(value: number): number {
|
function snap(value: number): number {
|
||||||
@@ -200,16 +265,16 @@ function snap(value: number): number {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
imports: [CommonModule, FormsModule, NgFor, PlaylistBoxComponent],
|
imports: [CommonModule, FormsModule, NgFor, PlaylistBoxComponent],
|
||||||
templateUrl: './app.component.html',
|
templateUrl: './app.component.html',
|
||||||
styleUrl: './app.component.scss',
|
styleUrl: './app.component.scss',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
})
|
})
|
||||||
export class AppComponent implements OnDestroy {
|
export class AppComponent implements OnDestroy {
|
||||||
|
url = '';
|
||||||
url = ''
|
private readonly spotifyUrlPattern =
|
||||||
private readonly spotifyUrlPattern = /^https:\/\/open\.spotify\.com\/(track|playlist|album|artist)\/[a-zA-Z0-9]+/;
|
/^https:\/\/open\.spotify\.com\/(track|playlist|album|artist)\/[a-zA-Z0-9]+/;
|
||||||
private interaction?: {
|
private interaction?: {
|
||||||
mode: 'drag' | 'resize';
|
mode: 'drag' | 'resize';
|
||||||
panelId: string;
|
panelId: string;
|
||||||
@@ -220,6 +285,8 @@ export class AppComponent implements OnDestroy {
|
|||||||
startPanelW: number;
|
startPanelW: number;
|
||||||
startPanelH: number;
|
startPanelH: number;
|
||||||
};
|
};
|
||||||
|
private readonly operationsRefreshMs = 5000;
|
||||||
|
private operationsRefreshTimer?: number;
|
||||||
readonly panelTypes: SpootyPanelType[] = [
|
readonly panelTypes: SpootyPanelType[] = [
|
||||||
'source-intake',
|
'source-intake',
|
||||||
'queue-observatory',
|
'queue-observatory',
|
||||||
@@ -228,7 +295,11 @@ export class AppComponent implements OnDestroy {
|
|||||||
'archive-browser',
|
'archive-browser',
|
||||||
'candidate-inspector',
|
'candidate-inspector',
|
||||||
];
|
];
|
||||||
readonly workspaceTabs: SpootyWorkspaceTab[] = ['intake', 'archive', 'diagnostics'];
|
readonly workspaceTabs: SpootyWorkspaceTab[] = [
|
||||||
|
'intake',
|
||||||
|
'archive',
|
||||||
|
'diagnostics',
|
||||||
|
];
|
||||||
readonly archiveSortModes: ArchiveSortMode[] = ['newest', 'name', 'size'];
|
readonly archiveSortModes: ArchiveSortMode[] = ['newest', 'name', 'size'];
|
||||||
selectedPanelType: SpootyPanelType = 'source-intake';
|
selectedPanelType: SpootyPanelType = 'source-intake';
|
||||||
workspaceTabsState: SpootyWorkspaceTabsState = loadWorkspaceTabsState();
|
workspaceTabsState: SpootyWorkspaceTabsState = loadWorkspaceTabsState();
|
||||||
@@ -237,8 +308,12 @@ export class AppComponent implements OnDestroy {
|
|||||||
return this.spotifyUrlPattern.test(this.url);
|
return this.spotifyUrlPattern.test(this.url);
|
||||||
}
|
}
|
||||||
createLoading$ = this.playlistService.createLoading$;
|
createLoading$ = this.playlistService.createLoading$;
|
||||||
playlists$ = this.playlistService.all$.pipe(map(items => items.filter(item => !item.isTrack)));
|
playlists$ = this.playlistService.all$.pipe(
|
||||||
songs$ = this.playlistService.all$.pipe(map(items => items.filter(item => item.isTrack)));
|
map((items) => items.filter((item) => !item.isTrack)),
|
||||||
|
);
|
||||||
|
songs$ = this.playlistService.all$.pipe(
|
||||||
|
map((items) => items.filter((item) => item.isTrack)),
|
||||||
|
);
|
||||||
allTracks$ = this.trackService.all$;
|
allTracks$ = this.trackService.all$;
|
||||||
selectedTrack$ = this.trackService.selectedTrack$;
|
selectedTrack$ = this.trackService.selectedTrack$;
|
||||||
version = this.versionService.getVersion();
|
version = this.versionService.getVersion();
|
||||||
@@ -250,6 +325,8 @@ export class AppComponent implements OnDestroy {
|
|||||||
archiveSearch = '';
|
archiveSearch = '';
|
||||||
archiveSort: ArchiveSortMode = 'newest';
|
archiveSort: ArchiveSortMode = 'newest';
|
||||||
trackStatuses = TrackStatusEnum;
|
trackStatuses = TrackStatusEnum;
|
||||||
|
operationsSnapshot?: OperationsSnapshot;
|
||||||
|
operationsSnapshotError = '';
|
||||||
|
|
||||||
get activeWorkspaceTab(): SpootyWorkspaceTab {
|
get activeWorkspaceTab(): SpootyWorkspaceTab {
|
||||||
return this.workspaceTabsState.activeTab;
|
return this.workspaceTabsState.activeTab;
|
||||||
@@ -270,10 +347,18 @@ export class AppComponent implements OnDestroy {
|
|||||||
this.checkSpotifyStatus();
|
this.checkSpotifyStatus();
|
||||||
this.fetchPlaylists();
|
this.fetchPlaylists();
|
||||||
this.refreshArchive();
|
this.refreshArchive();
|
||||||
|
this.refreshOperationsSnapshot();
|
||||||
|
this.operationsRefreshTimer = window.setInterval(
|
||||||
|
() => this.refreshOperationsSnapshot(),
|
||||||
|
this.operationsRefreshMs,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnDestroy(): void {
|
ngOnDestroy(): void {
|
||||||
this.stopWorkspaceInteraction();
|
this.stopWorkspaceInteraction();
|
||||||
|
if (this.operationsRefreshTimer) {
|
||||||
|
window.clearInterval(this.operationsRefreshTimer);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private bootstrapAuthTokenFromUrl(): void {
|
private bootstrapAuthTokenFromUrl(): void {
|
||||||
@@ -337,6 +422,18 @@ export class AppComponent implements OnDestroy {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
refreshOperationsSnapshot(): void {
|
||||||
|
this.http.get<OperationsSnapshot>('/api/operations/snapshot').subscribe({
|
||||||
|
next: (snapshot) => {
|
||||||
|
this.operationsSnapshot = snapshot;
|
||||||
|
this.operationsSnapshotError = '';
|
||||||
|
},
|
||||||
|
error: () => {
|
||||||
|
this.operationsSnapshotError = 'Operations snapshot is unavailable.';
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
formatBytes(sizeBytes: number): string {
|
formatBytes(sizeBytes: number): string {
|
||||||
if (sizeBytes < 1024) {
|
if (sizeBytes < 1024) {
|
||||||
return `${sizeBytes} B`;
|
return `${sizeBytes} B`;
|
||||||
@@ -372,31 +469,56 @@ export class AppComponent implements OnDestroy {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
rejectedUrls(track: Track): string[] {
|
|
||||||
if (Array.isArray(track.rejectedYoutubeUrls)) {
|
|
||||||
return track.rejectedYoutubeUrls;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!track.rejectedYoutubeUrls) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const parsed = JSON.parse(track.rejectedYoutubeUrls);
|
|
||||||
return Array.isArray(parsed) ? parsed.filter(item => typeof item === 'string') : [];
|
|
||||||
} catch {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
selectTrack(track: Track): void {
|
selectTrack(track: Track): void {
|
||||||
this.trackService.select(track);
|
this.trackService.select(track);
|
||||||
|
this.refreshOperationsSnapshot();
|
||||||
}
|
}
|
||||||
|
|
||||||
clearSelectedTrack(): void {
|
clearSelectedTrack(): void {
|
||||||
this.trackService.clearSelection();
|
this.trackService.clearSelection();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
selectedTrackTruth(track: Track): TrackTruth | undefined {
|
||||||
|
return this.findTrackTruth(track.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
selectedCandidate(truth?: TrackTruth): SelectedCandidateTruth | undefined {
|
||||||
|
return truth?.selectedCandidate;
|
||||||
|
}
|
||||||
|
|
||||||
|
rejectedCandidates(truth?: TrackTruth): RejectedCandidateTruth[] {
|
||||||
|
return truth?.rejectedCandidates || [];
|
||||||
|
}
|
||||||
|
|
||||||
|
rejectedCandidateCount(truth?: TrackTruth): number {
|
||||||
|
return truth?.rejectedCandidateCount || 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
errorClass(truth?: TrackTruth): string {
|
||||||
|
return truth?.errorClass || 'none';
|
||||||
|
}
|
||||||
|
|
||||||
|
errorSummary(truth?: TrackTruth): string {
|
||||||
|
return truth?.errorSummary || 'none';
|
||||||
|
}
|
||||||
|
|
||||||
|
errorDetail(truth?: TrackTruth): string {
|
||||||
|
return truth?.errorDetail || '';
|
||||||
|
}
|
||||||
|
|
||||||
|
private findTrackTruth(id: number): TrackTruth | undefined {
|
||||||
|
if (!this.operationsSnapshot) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
...this.operationsSnapshot.active.searching,
|
||||||
|
...this.operationsSnapshot.active.downloading,
|
||||||
|
...this.operationsSnapshot.recentFailures,
|
||||||
|
...this.operationsSnapshot.recentTracks,
|
||||||
|
].find((track) => track.id === id);
|
||||||
|
}
|
||||||
|
|
||||||
getWorkspaceTabLabel(tab: SpootyWorkspaceTab): string {
|
getWorkspaceTabLabel(tab: SpootyWorkspaceTab): string {
|
||||||
return WORKSPACE_TAB_LABELS[tab];
|
return WORKSPACE_TAB_LABELS[tab];
|
||||||
}
|
}
|
||||||
@@ -410,7 +532,9 @@ export class AppComponent implements OnDestroy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
resetLayout(): void {
|
resetLayout(): void {
|
||||||
this.setActiveWorkspace(defaultWorkspaceStateForTab(this.activeWorkspaceTab));
|
this.setActiveWorkspace(
|
||||||
|
defaultWorkspaceStateForTab(this.activeWorkspaceTab),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
resetAllLayouts(): void {
|
resetAllLayouts(): void {
|
||||||
@@ -422,7 +546,9 @@ export class AppComponent implements OnDestroy {
|
|||||||
const files = this.archiveListing?.files || [];
|
const files = this.archiveListing?.files || [];
|
||||||
const query = this.archiveSearch.trim().toLowerCase();
|
const query = this.archiveSearch.trim().toLowerCase();
|
||||||
const filtered = query
|
const filtered = query
|
||||||
? files.filter(file => `${file.name} ${file.path}`.toLowerCase().includes(query))
|
? files.filter((file) =>
|
||||||
|
`${file.name} ${file.path}`.toLowerCase().includes(query),
|
||||||
|
)
|
||||||
: [...files];
|
: [...files];
|
||||||
|
|
||||||
return filtered.sort((a, b) => {
|
return filtered.sort((a, b) => {
|
||||||
@@ -441,12 +567,12 @@ export class AppComponent implements OnDestroy {
|
|||||||
archiveGroups(): { folder: string; files: ArchiveFile[] }[] {
|
archiveGroups(): { folder: string; files: ArchiveFile[] }[] {
|
||||||
const groups = new Map<string, ArchiveFile[]>();
|
const groups = new Map<string, ArchiveFile[]>();
|
||||||
|
|
||||||
this.filteredArchiveFiles().forEach(file => {
|
this.filteredArchiveFiles().forEach((file) => {
|
||||||
const folder = this.topLevelFolder(file);
|
const folder = this.topLevelFolder(file);
|
||||||
groups.set(folder, [...(groups.get(folder) || []), file]);
|
groups.set(folder, [...(groups.get(folder) || []), file]);
|
||||||
});
|
});
|
||||||
|
|
||||||
return [...groups.entries()].map(([folder, files]) => ({folder, files}));
|
return [...groups.entries()].map(([folder, files]) => ({ folder, files }));
|
||||||
}
|
}
|
||||||
|
|
||||||
archiveFileCount(): number {
|
archiveFileCount(): number {
|
||||||
@@ -454,7 +580,10 @@ export class AppComponent implements OnDestroy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
archiveTotalBytes(): number {
|
archiveTotalBytes(): number {
|
||||||
return this.filteredArchiveFiles().reduce((total, file) => total + file.sizeBytes, 0);
|
return this.filteredArchiveFiles().reduce(
|
||||||
|
(total, file) => total + file.sizeBytes,
|
||||||
|
0,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
topLevelFolder(file: ArchiveFile): string {
|
topLevelFolder(file: ArchiveFile): string {
|
||||||
@@ -490,7 +619,7 @@ export class AppComponent implements OnDestroy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.setActiveWorkspace({
|
this.setActiveWorkspace({
|
||||||
panels: this.workspace.panels.filter(panel => panel.id !== panelId),
|
panels: this.workspace.panels.filter((panel) => panel.id !== panelId),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -583,7 +712,9 @@ export class AppComponent implements OnDestroy {
|
|||||||
|
|
||||||
private startWorkspaceInteraction(): void {
|
private startWorkspaceInteraction(): void {
|
||||||
document.addEventListener('pointermove', this.handlePointerMove);
|
document.addEventListener('pointermove', this.handlePointerMove);
|
||||||
document.addEventListener('pointerup', this.handlePointerUp, {once: true});
|
document.addEventListener('pointerup', this.handlePointerUp, {
|
||||||
|
once: true,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private stopWorkspaceInteraction(): void {
|
private stopWorkspaceInteraction(): void {
|
||||||
@@ -593,7 +724,7 @@ export class AppComponent implements OnDestroy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private bringPanelToFront(panelId: string): void {
|
private bringPanelToFront(panelId: string): void {
|
||||||
const panel = this.workspace.panels.find(item => item.id === panelId);
|
const panel = this.workspace.panels.find((item) => item.id === panelId);
|
||||||
|
|
||||||
if (!panel) {
|
if (!panel) {
|
||||||
return;
|
return;
|
||||||
@@ -601,16 +732,19 @@ export class AppComponent implements OnDestroy {
|
|||||||
|
|
||||||
this.setActiveWorkspace({
|
this.setActiveWorkspace({
|
||||||
panels: [
|
panels: [
|
||||||
...this.workspace.panels.filter(item => item.id !== panelId),
|
...this.workspace.panels.filter((item) => item.id !== panelId),
|
||||||
panel,
|
panel,
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private updatePanel(panelId: string, changes: Partial<SpootyPanelInstance>): void {
|
private updatePanel(
|
||||||
|
panelId: string,
|
||||||
|
changes: Partial<SpootyPanelInstance>,
|
||||||
|
): void {
|
||||||
this.setActiveWorkspace({
|
this.setActiveWorkspace({
|
||||||
panels: this.workspace.panels.map(panel =>
|
panels: this.workspace.panels.map((panel) =>
|
||||||
panel.id === panelId ? {...panel, ...changes} : panel
|
panel.id === panelId ? { ...panel, ...changes } : panel,
|
||||||
),
|
),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -627,6 +761,9 @@ export class AppComponent implements OnDestroy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private saveWorkspaceState(): void {
|
private saveWorkspaceState(): void {
|
||||||
localStorage.setItem(WORKSPACE_TABS_STORAGE_KEY, JSON.stringify(this.workspaceTabsState));
|
localStorage.setItem(
|
||||||
|
WORKSPACE_TABS_STORAGE_KEY,
|
||||||
|
JSON.stringify(this.workspaceTabsState),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,61 @@
|
|||||||
|
export interface SelectedCandidateTruth {
|
||||||
|
url: string;
|
||||||
|
title?: string;
|
||||||
|
author?: string;
|
||||||
|
score?: number;
|
||||||
|
reason?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface RejectedCandidateTruth {
|
||||||
|
url: string;
|
||||||
|
title?: string;
|
||||||
|
author?: string;
|
||||||
|
score?: number;
|
||||||
|
reason?: string;
|
||||||
|
rejectionClass?: string;
|
||||||
|
rejectionSummary?: string;
|
||||||
|
rejectedAt?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TrackTruth {
|
||||||
|
id: number;
|
||||||
|
artist: string;
|
||||||
|
name: string;
|
||||||
|
status: string;
|
||||||
|
spotifyUrl?: string;
|
||||||
|
youtubeUrl?: string;
|
||||||
|
selectedCandidate?: SelectedCandidateTruth;
|
||||||
|
downloadAttemptCount?: number;
|
||||||
|
errorClass?: string;
|
||||||
|
errorSummary?: string;
|
||||||
|
errorDetail?: string;
|
||||||
|
rejectedCandidateCount: number;
|
||||||
|
rejectedCandidates: RejectedCandidateTruth[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface OperationsSnapshot {
|
||||||
|
generatedAt: string;
|
||||||
|
runtime: {
|
||||||
|
operation: string;
|
||||||
|
spotifyConnected: boolean;
|
||||||
|
searchQueueDepth: number;
|
||||||
|
downloadQueueDepth: number;
|
||||||
|
activeSearches: number;
|
||||||
|
activeDownloads: number;
|
||||||
|
};
|
||||||
|
counters: {
|
||||||
|
playlists: number;
|
||||||
|
singleSongs: number;
|
||||||
|
tracks: number;
|
||||||
|
active: number;
|
||||||
|
completed: number;
|
||||||
|
failed: number;
|
||||||
|
retries: number;
|
||||||
|
};
|
||||||
|
active: {
|
||||||
|
searching: TrackTruth[];
|
||||||
|
downloading: TrackTruth[];
|
||||||
|
};
|
||||||
|
recentFailures: TrackTruth[];
|
||||||
|
recentTracks: TrackTruth[];
|
||||||
|
}
|
||||||
@@ -112,6 +112,62 @@ body {
|
|||||||
overflow-wrap: anywhere;
|
overflow-wrap: anywhere;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.candidate-card {
|
||||||
|
display: block;
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid rgba(126, 255, 180, 0.14);
|
||||||
|
border-radius: 8px;
|
||||||
|
background: rgba(255, 255, 255, 0.05);
|
||||||
|
}
|
||||||
|
|
||||||
|
.candidate-card,
|
||||||
|
.candidate-card dl {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.candidate-card dt {
|
||||||
|
color: #f1fff5;
|
||||||
|
font-size: 0.76rem;
|
||||||
|
font-weight: 900;
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
|
|
||||||
|
.candidate-card dd {
|
||||||
|
margin: 0 0 8px;
|
||||||
|
color: #bcd1c4;
|
||||||
|
overflow-wrap: anywhere;
|
||||||
|
}
|
||||||
|
|
||||||
|
.candidate-card dd:last-child {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.rejected-candidate-card {
|
||||||
|
border-color: rgba(255, 214, 102, 0.18);
|
||||||
|
}
|
||||||
|
|
||||||
|
.truth-detail summary {
|
||||||
|
color: #9fffc3;
|
||||||
|
cursor: pointer;
|
||||||
|
font-weight: 800;
|
||||||
|
}
|
||||||
|
|
||||||
|
.truth-detail pre {
|
||||||
|
margin-top: 8px;
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid rgba(126, 255, 180, 0.14);
|
||||||
|
border-radius: 8px;
|
||||||
|
background: rgba(0, 0, 0, 0.22);
|
||||||
|
color: #dceee4;
|
||||||
|
font-size: 0.78rem;
|
||||||
|
overflow: auto;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.empty-state.compact {
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
@media (max-width: 900px) {
|
@media (max-width: 900px) {
|
||||||
.workspace-tabs {
|
.workspace-tabs {
|
||||||
position: static;
|
position: static;
|
||||||
|
|||||||
Reference in New Issue
Block a user