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:
@@ -1101,7 +1101,9 @@ func insertSystemPlaylist(ctx context.Context, qtx *dbq.Queries, userID pgtype.U
|
||||
}
|
||||
|
||||
// oneCopyPerSong keeps the first of a song's copies on different releases
|
||||
// (M498 #5438): a mix holds the song once, in its best-ranked place.
|
||||
// (M498 #5438): a mix holds the song once, in its best-ranked place. A video
|
||||
// rip held back from the mixes (#5439) is left out, and a clean copy of the
|
||||
// same song can take its place.
|
||||
func oneCopyPerSong(ctx context.Context, qtx *dbq.Queries, tracks []rankedCandidate) ([]rankedCandidate, error) {
|
||||
ids := make([]pgtype.UUID, len(tracks))
|
||||
for i, t := range tracks {
|
||||
@@ -1111,14 +1113,18 @@ func oneCopyPerSong(ctx context.Context, qtx *dbq.Queries, tracks []rankedCandid
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("song keys: %w", err)
|
||||
}
|
||||
songOf := make(map[pgtype.UUID]pgtype.UUID, len(rows))
|
||||
songOf := make(map[pgtype.UUID]dbq.ListTrackSongKeysRow, len(rows))
|
||||
for _, r := range rows {
|
||||
songOf[r.ID] = r.SongKey
|
||||
songOf[r.ID] = r
|
||||
}
|
||||
seen := make(map[pgtype.UUID]bool, len(tracks))
|
||||
out := tracks[:0:0]
|
||||
for _, t := range tracks {
|
||||
song, ok := songOf[t.TrackID]
|
||||
row, ok := songOf[t.TrackID]
|
||||
if ok && row.HeldBack {
|
||||
continue
|
||||
}
|
||||
song := row.SongKey
|
||||
if ok && seen[song] {
|
||||
continue
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user