feat: video rips and stray copies handle themselves (M498 #5439)
release / govulncheck (push) Successful in 25s
release / web (push) Failing after 26s
release / go (push) Failing after 58s
release / Attach APK to the Release (tag releases only) (push) Canceled after 0s
release / Build + push container image (push) Canceled after 0s
release / Verify release artifacts (tag releases only) (push) Canceled after 0s
release / integration (push) Canceled after 3m25s
release / Build signed APK (releases and dev) (push) Canceled after 3m26s
release / android (push) Canceled after 3m28s
release / govulncheck (push) Successful in 25s
release / web (push) Failing after 26s
release / go (push) Failing after 58s
release / Attach APK to the Release (tag releases only) (push) Canceled after 0s
release / Build + push container image (push) Canceled after 0s
release / Verify release artifacts (tag releases only) (push) Canceled after 0s
release / integration (push) Canceled after 3m25s
release / Build signed APK (releases and dev) (push) Canceled after 3m26s
release / android (push) Canceled after 3m28s
- The resolver also merges cross-release and mismatch groups where Lidarr
maps exactly one copy: the others fulfil nothing, so removing them opens no
hole (D-a rule 1). That covers a rip beside the clean copy on another
release and a wrong-file import Lidarr holds unmapped. With two or more
mapped copies each fulfils its own release and nothing is removed.
- A track whose file name carries a video-rip marker is held back from radio
and the system mixes (tracks.source_verdict, migration 0077). It still plays
when chosen. A renamed file is released; the operator's "fine" sticks.
- Suspect sources shows what was done to each track, with "This one is fine"
and "Hold back again" (PUT /api/admin/library/suspect-sources/{id}).
- The Liked list prefers a copy that is not held back.
Replacing a rip that has no clean copy is left for the operator to decide.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -20,14 +20,15 @@ DELETE FROM general_likes
|
||||
RETURNING track_id;
|
||||
|
||||
-- name: ListLikedTrackRows :many
|
||||
-- One row per liked song: of its copies, the one present on disk, then the
|
||||
-- one liked first.
|
||||
-- One row per liked song: of its copies, the one present on disk, then one
|
||||
-- that is not a held-back video rip, then the one liked first.
|
||||
SELECT t.* FROM tracks t
|
||||
JOIN (SELECT DISTINCT ON (lt.song_key) l.track_id, l.liked_at
|
||||
FROM general_likes l
|
||||
JOIN tracks lt ON lt.id = l.track_id
|
||||
WHERE l.user_id = $1
|
||||
ORDER BY lt.song_key, (lt.missing_since IS NOT NULL), l.liked_at, lt.id) l
|
||||
ORDER BY lt.song_key, (lt.missing_since IS NOT NULL),
|
||||
(lt.source_verdict IS NOT DISTINCT FROM 'suspect'), l.liked_at, lt.id) l
|
||||
ON l.track_id = t.id
|
||||
ORDER BY l.liked_at DESC, t.id
|
||||
LIMIT $2 OFFSET $3;
|
||||
|
||||
@@ -40,7 +40,10 @@ UPDATE tracks SET song_id = NULL
|
||||
AND id IN (SELECT track_id FROM duplicate_group_members WHERE group_id = sqlc.arg(group_id));
|
||||
|
||||
-- name: ListTrackSongKeys :many
|
||||
SELECT id, song_key FROM tracks WHERE id = ANY(sqlc.arg(ids)::uuid[]);
|
||||
-- What the mix writer needs to place a track: its song, and whether it is a
|
||||
-- video rip held back from the mixes (#5439).
|
||||
SELECT id, song_key, (source_verdict IS NOT DISTINCT FROM 'suspect')::boolean AS held_back
|
||||
FROM tracks WHERE id = ANY(sqlc.arg(ids)::uuid[]);
|
||||
|
||||
-- name: MergeInheritSongLink :exec
|
||||
-- A merge keeps the removed copy's song link: when the copy being removed was
|
||||
|
||||
@@ -285,7 +285,9 @@ SELECT t.id,
|
||||
albums.id AS album_id,
|
||||
albums.title AS album_title,
|
||||
artists.id AS artist_id,
|
||||
artists.name AS artist_name
|
||||
artists.name AS artist_name,
|
||||
t.source_verdict,
|
||||
t.source_verdict_at
|
||||
FROM tracks t
|
||||
JOIN albums ON albums.id = t.album_id
|
||||
JOIN artists ON artists.id = t.artist_id
|
||||
@@ -299,3 +301,29 @@ SELECT t.id,
|
||||
SELECT COUNT(*) FROM tracks t
|
||||
WHERE t.missing_since IS NULL
|
||||
AND regexp_replace(t.file_path, '^.*/', '') ~* sqlc.arg(pattern)::text;
|
||||
|
||||
-- name: FlagSuspectSourceTracks :execrows
|
||||
-- Holds back present tracks whose basename carries a video-rip marker (M498
|
||||
-- #5439), the same pattern the report lists. A track the operator called fine
|
||||
-- keeps that verdict.
|
||||
UPDATE tracks
|
||||
SET source_verdict = 'suspect', source_verdict_at = now()
|
||||
WHERE missing_since IS NULL
|
||||
AND source_verdict IS NULL
|
||||
AND regexp_replace(file_path, '^.*/', '') ~* sqlc.arg(pattern)::text;
|
||||
|
||||
-- name: ClearStaleSuspectSourceTracks :execrows
|
||||
-- A held-back track whose name no longer carries a marker (renamed, retagged
|
||||
-- by Lidarr) is released again.
|
||||
UPDATE tracks
|
||||
SET source_verdict = NULL, source_verdict_at = NULL
|
||||
WHERE source_verdict = 'suspect'
|
||||
AND NOT regexp_replace(file_path, '^.*/', '') ~* sqlc.arg(pattern)::text;
|
||||
|
||||
-- name: SetTrackSourceVerdict :execrows
|
||||
-- The operator's call on a flagged track: 'fine' lets it back into radio and
|
||||
-- the mixes for good; 'suspect' holds it back again.
|
||||
UPDATE tracks
|
||||
SET source_verdict = sqlc.arg(verdict)::text, source_verdict_at = now()
|
||||
WHERE id = sqlc.arg(id)
|
||||
AND source_verdict IS NOT NULL;
|
||||
|
||||
Reference in New Issue
Block a user