Compare commits
2
Commits
80ecc2f7e7
...
3ebd35e51d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3ebd35e51d | ||
|
|
09e74a57a2 |
@@ -261,7 +261,7 @@ func (q *Queries) InsertSkipEvent(ctx context.Context, arg InsertSkipEventParams
|
|||||||
}
|
}
|
||||||
|
|
||||||
const listRecentSessionTracks = `-- name: ListRecentSessionTracks :many
|
const listRecentSessionTracks = `-- name: ListRecentSessionTracks :many
|
||||||
SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at FROM tracks t
|
SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at, t.emptied_at FROM tracks t
|
||||||
JOIN play_events pe ON pe.track_id = t.id
|
JOIN play_events pe ON pe.track_id = t.id
|
||||||
WHERE pe.session_id = $1
|
WHERE pe.session_id = $1
|
||||||
AND pe.started_at < $2
|
AND pe.started_at < $2
|
||||||
@@ -312,6 +312,7 @@ func (q *Queries) ListRecentSessionTracks(ctx context.Context, arg ListRecentSes
|
|||||||
&i.SongKey,
|
&i.SongKey,
|
||||||
&i.SourceVerdict,
|
&i.SourceVerdict,
|
||||||
&i.SourceVerdictAt,
|
&i.SourceVerdictAt,
|
||||||
|
&i.EmptiedAt,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
const listUserHistory = `-- name: ListUserHistory :many
|
const listUserHistory = `-- name: ListUserHistory :many
|
||||||
SELECT pe.id AS event_id,
|
SELECT pe.id AS event_id,
|
||||||
pe.started_at,
|
pe.started_at,
|
||||||
t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at,
|
t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at, t.emptied_at,
|
||||||
albums.title AS album_title,
|
albums.title AS album_title,
|
||||||
artists.name AS artist_name
|
artists.name AS artist_name
|
||||||
FROM play_events pe
|
FROM play_events pe
|
||||||
@@ -86,6 +86,7 @@ func (q *Queries) ListUserHistory(ctx context.Context, arg ListUserHistoryParams
|
|||||||
&i.Track.SongKey,
|
&i.Track.SongKey,
|
||||||
&i.Track.SourceVerdict,
|
&i.Track.SourceVerdict,
|
||||||
&i.Track.SourceVerdictAt,
|
&i.Track.SourceVerdictAt,
|
||||||
|
&i.Track.EmptiedAt,
|
||||||
&i.AlbumTitle,
|
&i.AlbumTitle,
|
||||||
&i.ArtistName,
|
&i.ArtistName,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
|
|||||||
@@ -281,7 +281,7 @@ func (q *Queries) ListLikedTrackIDs(ctx context.Context, userID pgtype.UUID) ([]
|
|||||||
}
|
}
|
||||||
|
|
||||||
const listLikedTrackRows = `-- name: ListLikedTrackRows :many
|
const listLikedTrackRows = `-- name: ListLikedTrackRows :many
|
||||||
SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at FROM tracks t
|
SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at, t.emptied_at FROM tracks t
|
||||||
JOIN (SELECT DISTINCT ON (lt.song_key) l.track_id, l.liked_at
|
JOIN (SELECT DISTINCT ON (lt.song_key) l.track_id, l.liked_at
|
||||||
FROM general_likes l
|
FROM general_likes l
|
||||||
JOIN tracks lt ON lt.id = l.track_id
|
JOIN tracks lt ON lt.id = l.track_id
|
||||||
@@ -335,6 +335,7 @@ func (q *Queries) ListLikedTrackRows(ctx context.Context, arg ListLikedTrackRows
|
|||||||
&i.SongKey,
|
&i.SongKey,
|
||||||
&i.SourceVerdict,
|
&i.SourceVerdict,
|
||||||
&i.SourceVerdictAt,
|
&i.SourceVerdictAt,
|
||||||
|
&i.EmptiedAt,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ cand AS (
|
|||||||
AND lower(p.title) = lower(m.title)
|
AND lower(p.title) = lower(m.title)
|
||||||
WHERE m.missing_since IS NOT NULL
|
WHERE m.missing_since IS NOT NULL
|
||||||
AND (m.mbid IS NULL OR p.mbid IS NULL OR m.mbid = p.mbid)
|
AND (m.mbid IS NULL OR p.mbid IS NULL OR m.mbid = p.mbid)
|
||||||
|
AND (m.emptied_at IS DISTINCT FROM m.missing_since OR p.added_at > m.emptied_at)
|
||||||
),
|
),
|
||||||
pairs AS (
|
pairs AS (
|
||||||
-- A pair both rules found is one candidate, credited to the stronger rule.
|
-- A pair both rules found is one candidate, credited to the stronger rule.
|
||||||
@@ -87,6 +88,10 @@ type ListMissingTrackPairsRow struct {
|
|||||||
// A pair whose MBIDs are both set and differ is not a title match: the tags say
|
// A pair whose MBIDs are both set and differ is not a title match: the tags say
|
||||||
// they are different recordings. The caller folds a pair only when each side has
|
// they are different recordings. The caller folds a pair only when each side has
|
||||||
// exactly one candidate; anything else is ambiguous and left alone.
|
// exactly one candidate; anything else is ambiguous and left alone.
|
||||||
|
//
|
||||||
|
// A slot the duplicate resolver emptied (emptied_at, migration 0095) pairs by
|
||||||
|
// title only with a track added since: the album held no copy of the song as
|
||||||
|
// long as it is, so one already there under the title is another song.
|
||||||
func (q *Queries) ListMissingTrackPairs(ctx context.Context) ([]ListMissingTrackPairsRow, error) {
|
func (q *Queries) ListMissingTrackPairs(ctx context.Context) ([]ListMissingTrackPairsRow, error) {
|
||||||
rows, err := q.db.Query(ctx, listMissingTrackPairs)
|
rows, err := q.db.Query(ctx, listMissingTrackPairs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -926,6 +926,7 @@ type Track struct {
|
|||||||
SongKey pgtype.UUID
|
SongKey pgtype.UUID
|
||||||
SourceVerdict *string
|
SourceVerdict *string
|
||||||
SourceVerdictAt pgtype.Timestamptz
|
SourceVerdictAt pgtype.Timestamptz
|
||||||
|
EmptiedAt pgtype.Timestamptz
|
||||||
}
|
}
|
||||||
|
|
||||||
type TrackAcoustidLookup struct {
|
type TrackAcoustidLookup struct {
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ WITH plays AS (
|
|||||||
WHERE user_id = $2 AND was_skipped = false
|
WHERE user_id = $2 AND was_skipped = false
|
||||||
GROUP BY track_id
|
GROUP BY track_id
|
||||||
)
|
)
|
||||||
SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at,
|
SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at, t.emptied_at,
|
||||||
albums.title AS album_title,
|
albums.title AS album_title,
|
||||||
artists.name AS artist_name
|
artists.name AS artist_name
|
||||||
FROM plays p
|
FROM plays p
|
||||||
@@ -275,6 +275,7 @@ func (q *Queries) ListMostPlayedTracksForArtist(ctx context.Context, arg ListMos
|
|||||||
&i.Track.SongKey,
|
&i.Track.SongKey,
|
||||||
&i.Track.SourceVerdict,
|
&i.Track.SourceVerdict,
|
||||||
&i.Track.SourceVerdictAt,
|
&i.Track.SourceVerdictAt,
|
||||||
|
&i.Track.EmptiedAt,
|
||||||
&i.AlbumTitle,
|
&i.AlbumTitle,
|
||||||
&i.ArtistName,
|
&i.ArtistName,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
@@ -295,7 +296,7 @@ WITH plays AS (
|
|||||||
WHERE user_id = $1 AND was_skipped = false
|
WHERE user_id = $1 AND was_skipped = false
|
||||||
GROUP BY track_id
|
GROUP BY track_id
|
||||||
)
|
)
|
||||||
SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at,
|
SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at, t.emptied_at,
|
||||||
albums.title AS album_title,
|
albums.title AS album_title,
|
||||||
artists.name AS artist_name
|
artists.name AS artist_name
|
||||||
FROM plays p
|
FROM plays p
|
||||||
@@ -364,6 +365,7 @@ func (q *Queries) ListMostPlayedTracksForUser(ctx context.Context, arg ListMostP
|
|||||||
&i.Track.SongKey,
|
&i.Track.SongKey,
|
||||||
&i.Track.SourceVerdict,
|
&i.Track.SourceVerdict,
|
||||||
&i.Track.SourceVerdictAt,
|
&i.Track.SourceVerdictAt,
|
||||||
|
&i.Track.EmptiedAt,
|
||||||
&i.AlbumTitle,
|
&i.AlbumTitle,
|
||||||
&i.ArtistName,
|
&i.ArtistName,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
@@ -703,7 +705,7 @@ func (q *Queries) ListRediscoverArtistsForUser(ctx context.Context, arg ListRedi
|
|||||||
|
|
||||||
const loadRadioCandidates = `-- name: LoadRadioCandidates :many
|
const loadRadioCandidates = `-- name: LoadRadioCandidates :many
|
||||||
SELECT
|
SELECT
|
||||||
t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at,
|
t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at, t.emptied_at,
|
||||||
(l.user_id IS NOT NULL)::bool AS is_liked,
|
(l.user_id IS NOT NULL)::bool AS is_liked,
|
||||||
pe.last_played_at::timestamptz AS last_played_at,
|
pe.last_played_at::timestamptz AS last_played_at,
|
||||||
pe.play_count,
|
pe.play_count,
|
||||||
@@ -789,6 +791,7 @@ func (q *Queries) LoadRadioCandidates(ctx context.Context, arg LoadRadioCandidat
|
|||||||
&i.Track.SongKey,
|
&i.Track.SongKey,
|
||||||
&i.Track.SourceVerdict,
|
&i.Track.SourceVerdict,
|
||||||
&i.Track.SourceVerdictAt,
|
&i.Track.SourceVerdictAt,
|
||||||
|
&i.Track.EmptiedAt,
|
||||||
&i.IsLiked,
|
&i.IsLiked,
|
||||||
&i.LastPlayedAt,
|
&i.LastPlayedAt,
|
||||||
&i.PlayCount,
|
&i.PlayCount,
|
||||||
@@ -937,7 +940,7 @@ random_fill AS (
|
|||||||
LIMIT $9
|
LIMIT $9
|
||||||
)
|
)
|
||||||
SELECT
|
SELECT
|
||||||
t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at,
|
t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at, t.emptied_at,
|
||||||
(l.user_id IS NOT NULL)::bool AS is_liked,
|
(l.user_id IS NOT NULL)::bool AS is_liked,
|
||||||
pe.last_played_at::timestamptz AS last_played_at,
|
pe.last_played_at::timestamptz AS last_played_at,
|
||||||
pe.play_count,
|
pe.play_count,
|
||||||
@@ -1069,6 +1072,7 @@ func (q *Queries) LoadRadioCandidatesV2(ctx context.Context, arg LoadRadioCandid
|
|||||||
&i.Track.SongKey,
|
&i.Track.SongKey,
|
||||||
&i.Track.SourceVerdict,
|
&i.Track.SourceVerdict,
|
||||||
&i.Track.SourceVerdictAt,
|
&i.Track.SourceVerdictAt,
|
||||||
|
&i.Track.EmptiedAt,
|
||||||
&i.IsLiked,
|
&i.IsLiked,
|
||||||
&i.LastPlayedAt,
|
&i.LastPlayedAt,
|
||||||
&i.PlayCount,
|
&i.PlayCount,
|
||||||
|
|||||||
@@ -299,7 +299,7 @@ func (q *Queries) FlagSuspectSourceTracks(ctx context.Context, pattern string) (
|
|||||||
}
|
}
|
||||||
|
|
||||||
const getTrackByID = `-- name: GetTrackByID :one
|
const getTrackByID = `-- name: GetTrackByID :one
|
||||||
SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version, tag_read_version, missing_since, mbid_source, song_id, song_key, source_verdict, source_verdict_at FROM tracks WHERE id = $1
|
SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version, tag_read_version, missing_since, mbid_source, song_id, song_key, source_verdict, source_verdict_at, emptied_at FROM tracks WHERE id = $1
|
||||||
`
|
`
|
||||||
|
|
||||||
func (q *Queries) GetTrackByID(ctx context.Context, id pgtype.UUID) (Track, error) {
|
func (q *Queries) GetTrackByID(ctx context.Context, id pgtype.UUID) (Track, error) {
|
||||||
@@ -330,12 +330,13 @@ func (q *Queries) GetTrackByID(ctx context.Context, id pgtype.UUID) (Track, erro
|
|||||||
&i.SongKey,
|
&i.SongKey,
|
||||||
&i.SourceVerdict,
|
&i.SourceVerdict,
|
||||||
&i.SourceVerdictAt,
|
&i.SourceVerdictAt,
|
||||||
|
&i.EmptiedAt,
|
||||||
)
|
)
|
||||||
return i, err
|
return i, err
|
||||||
}
|
}
|
||||||
|
|
||||||
const getTrackByPath = `-- name: GetTrackByPath :one
|
const getTrackByPath = `-- name: GetTrackByPath :one
|
||||||
SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version, tag_read_version, missing_since, mbid_source, song_id, song_key, source_verdict, source_verdict_at FROM tracks WHERE file_path = $1
|
SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version, tag_read_version, missing_since, mbid_source, song_id, song_key, source_verdict, source_verdict_at, emptied_at FROM tracks WHERE file_path = $1
|
||||||
`
|
`
|
||||||
|
|
||||||
func (q *Queries) GetTrackByPath(ctx context.Context, filePath string) (Track, error) {
|
func (q *Queries) GetTrackByPath(ctx context.Context, filePath string) (Track, error) {
|
||||||
@@ -366,12 +367,13 @@ func (q *Queries) GetTrackByPath(ctx context.Context, filePath string) (Track, e
|
|||||||
&i.SongKey,
|
&i.SongKey,
|
||||||
&i.SourceVerdict,
|
&i.SourceVerdict,
|
||||||
&i.SourceVerdictAt,
|
&i.SourceVerdictAt,
|
||||||
|
&i.EmptiedAt,
|
||||||
)
|
)
|
||||||
return i, err
|
return i, err
|
||||||
}
|
}
|
||||||
|
|
||||||
const getTracksByIDs = `-- name: GetTracksByIDs :many
|
const getTracksByIDs = `-- name: GetTracksByIDs :many
|
||||||
SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version, tag_read_version, missing_since, mbid_source, song_id, song_key, source_verdict, source_verdict_at FROM tracks WHERE id = ANY($1::uuid[])
|
SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version, tag_read_version, missing_since, mbid_source, song_id, song_key, source_verdict, source_verdict_at, emptied_at FROM tracks WHERE id = ANY($1::uuid[])
|
||||||
`
|
`
|
||||||
|
|
||||||
// Batched lookup used by /api/library/sync to hydrate upsert payloads
|
// Batched lookup used by /api/library/sync to hydrate upsert payloads
|
||||||
@@ -410,6 +412,7 @@ func (q *Queries) GetTracksByIDs(ctx context.Context, dollar_1 []pgtype.UUID) ([
|
|||||||
&i.SongKey,
|
&i.SongKey,
|
||||||
&i.SourceVerdict,
|
&i.SourceVerdict,
|
||||||
&i.SourceVerdictAt,
|
&i.SourceVerdictAt,
|
||||||
|
&i.EmptiedAt,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -422,7 +425,7 @@ func (q *Queries) GetTracksByIDs(ctx context.Context, dollar_1 []pgtype.UUID) ([
|
|||||||
}
|
}
|
||||||
|
|
||||||
const listArtistTracksForUser = `-- name: ListArtistTracksForUser :many
|
const listArtistTracksForUser = `-- name: ListArtistTracksForUser :many
|
||||||
SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at,
|
SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at, t.emptied_at,
|
||||||
albums.title AS album_title,
|
albums.title AS album_title,
|
||||||
artists.name AS artist_name
|
artists.name AS artist_name
|
||||||
FROM tracks t
|
FROM tracks t
|
||||||
@@ -487,6 +490,7 @@ func (q *Queries) ListArtistTracksForUser(ctx context.Context, arg ListArtistTra
|
|||||||
&i.Track.SongKey,
|
&i.Track.SongKey,
|
||||||
&i.Track.SourceVerdict,
|
&i.Track.SourceVerdict,
|
||||||
&i.Track.SourceVerdictAt,
|
&i.Track.SourceVerdictAt,
|
||||||
|
&i.Track.EmptiedAt,
|
||||||
&i.AlbumTitle,
|
&i.AlbumTitle,
|
||||||
&i.ArtistName,
|
&i.ArtistName,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
@@ -587,7 +591,7 @@ func (q *Queries) ListMissingTracks(ctx context.Context, arg ListMissingTracksPa
|
|||||||
}
|
}
|
||||||
|
|
||||||
const listRandomTracksForUser = `-- name: ListRandomTracksForUser :many
|
const listRandomTracksForUser = `-- name: ListRandomTracksForUser :many
|
||||||
SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at,
|
SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version, t.tag_read_version, t.missing_since, t.mbid_source, t.song_id, t.song_key, t.source_verdict, t.source_verdict_at, t.emptied_at,
|
||||||
albums.title AS album_title,
|
albums.title AS album_title,
|
||||||
artists.name AS artist_name
|
artists.name AS artist_name
|
||||||
FROM tracks t
|
FROM tracks t
|
||||||
@@ -649,6 +653,7 @@ func (q *Queries) ListRandomTracksForUser(ctx context.Context, arg ListRandomTra
|
|||||||
&i.Track.SongKey,
|
&i.Track.SongKey,
|
||||||
&i.Track.SourceVerdict,
|
&i.Track.SourceVerdict,
|
||||||
&i.Track.SourceVerdictAt,
|
&i.Track.SourceVerdictAt,
|
||||||
|
&i.Track.EmptiedAt,
|
||||||
&i.AlbumTitle,
|
&i.AlbumTitle,
|
||||||
&i.ArtistName,
|
&i.ArtistName,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
@@ -836,7 +841,7 @@ func (q *Queries) ListTrackPathsForReconcile(ctx context.Context) ([]ListTrackPa
|
|||||||
}
|
}
|
||||||
|
|
||||||
const listTracksByAlbum = `-- name: ListTracksByAlbum :many
|
const listTracksByAlbum = `-- name: ListTracksByAlbum :many
|
||||||
SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version, tag_read_version, missing_since, mbid_source, song_id, song_key, source_verdict, source_verdict_at FROM tracks
|
SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version, tag_read_version, missing_since, mbid_source, song_id, song_key, source_verdict, source_verdict_at, emptied_at FROM tracks
|
||||||
WHERE album_id = $1
|
WHERE album_id = $1
|
||||||
AND NOT EXISTS (
|
AND NOT EXISTS (
|
||||||
SELECT 1 FROM quarantine q
|
SELECT 1 FROM quarantine q
|
||||||
@@ -887,6 +892,7 @@ func (q *Queries) ListTracksByAlbum(ctx context.Context, arg ListTracksByAlbumPa
|
|||||||
&i.SongKey,
|
&i.SongKey,
|
||||||
&i.SourceVerdict,
|
&i.SourceVerdict,
|
||||||
&i.SourceVerdictAt,
|
&i.SourceVerdictAt,
|
||||||
|
&i.EmptiedAt,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -936,6 +942,21 @@ func (q *Queries) ListTracksMissingMbidWithPath(ctx context.Context, limit int32
|
|||||||
return items, nil
|
return items, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const markTracksEmptied = `-- name: MarkTracksEmptied :exec
|
||||||
|
UPDATE tracks
|
||||||
|
SET emptied_at = missing_since
|
||||||
|
WHERE id = ANY($1::uuid[])
|
||||||
|
AND missing_since IS NOT NULL
|
||||||
|
`
|
||||||
|
|
||||||
|
// Stamps rows the duplicate resolver emptied, whose song the album holds no
|
||||||
|
// other copy of, with the time they went missing (migration 0095): missing-pair
|
||||||
|
// folding then waits for a copy fetched again.
|
||||||
|
func (q *Queries) MarkTracksEmptied(ctx context.Context, ids []pgtype.UUID) error {
|
||||||
|
_, err := q.db.Exec(ctx, markTracksEmptied, ids)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
const markTracksMissing = `-- name: MarkTracksMissing :execrows
|
const markTracksMissing = `-- name: MarkTracksMissing :execrows
|
||||||
UPDATE tracks
|
UPDATE tracks
|
||||||
SET missing_since = now()
|
SET missing_since = now()
|
||||||
@@ -960,7 +981,7 @@ func (q *Queries) MarkTracksMissing(ctx context.Context, ids []pgtype.UUID) (int
|
|||||||
}
|
}
|
||||||
|
|
||||||
const searchTracks = `-- name: SearchTracks :many
|
const searchTracks = `-- name: SearchTracks :many
|
||||||
SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version, tag_read_version, missing_since, mbid_source, song_id, song_key, source_verdict, source_verdict_at FROM tracks
|
SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version, tag_read_version, missing_since, mbid_source, song_id, song_key, source_verdict, source_verdict_at, emptied_at FROM tracks
|
||||||
WHERE title ILIKE '%' || $1::text || '%'
|
WHERE title ILIKE '%' || $1::text || '%'
|
||||||
AND NOT EXISTS (
|
AND NOT EXISTS (
|
||||||
SELECT 1 FROM quarantine q
|
SELECT 1 FROM quarantine q
|
||||||
@@ -1018,6 +1039,7 @@ func (q *Queries) SearchTracks(ctx context.Context, arg SearchTracksParams) ([]T
|
|||||||
&i.SongKey,
|
&i.SongKey,
|
||||||
&i.SourceVerdict,
|
&i.SourceVerdict,
|
||||||
&i.SourceVerdictAt,
|
&i.SourceVerdictAt,
|
||||||
|
&i.EmptiedAt,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -1096,7 +1118,7 @@ ON CONFLICT (file_path) DO UPDATE SET
|
|||||||
-- next scan can short-circuit them again (#2499).
|
-- next scan can short-circuit them again (#2499).
|
||||||
tag_read_version = EXCLUDED.tag_read_version,
|
tag_read_version = EXCLUDED.tag_read_version,
|
||||||
updated_at = now()
|
updated_at = now()
|
||||||
RETURNING id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version, tag_read_version, missing_since, mbid_source, song_id, song_key, source_verdict, source_verdict_at
|
RETURNING id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version, tag_read_version, missing_since, mbid_source, song_id, song_key, source_verdict, source_verdict_at, emptied_at
|
||||||
`
|
`
|
||||||
|
|
||||||
type UpsertTrackParams struct {
|
type UpsertTrackParams struct {
|
||||||
@@ -1160,6 +1182,7 @@ func (q *Queries) UpsertTrack(ctx context.Context, arg UpsertTrackParams) (Track
|
|||||||
&i.SongKey,
|
&i.SongKey,
|
||||||
&i.SourceVerdict,
|
&i.SourceVerdict,
|
||||||
&i.SourceVerdictAt,
|
&i.SourceVerdictAt,
|
||||||
|
&i.EmptiedAt,
|
||||||
)
|
)
|
||||||
return i, err
|
return i, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE tracks DROP COLUMN emptied_at;
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
-- 0095_tracks_emptied_at.up.sql — a slot the duplicate resolver emptied
|
||||||
|
-- waits for a copy fetched again (Scribe milestone #498).
|
||||||
|
--
|
||||||
|
-- When the resolver removes a file filed under another song's title and the
|
||||||
|
-- album holds no copy of that song as long as the song is, the row is marked
|
||||||
|
-- missing and stamped here with the same time. Missing-pair folding then pairs
|
||||||
|
-- it by title only with a track added after that time, a copy fetched again,
|
||||||
|
-- and not with one already on the album: on 2026-10-20 an emptied "Open the
|
||||||
|
-- Gateway" was folded into a file tagged so that holds another song.
|
||||||
|
--
|
||||||
|
-- The stamp counts only while it equals missing_since: a row whose file came
|
||||||
|
-- back and later went missing again is an ordinary missing row.
|
||||||
|
ALTER TABLE tracks ADD COLUMN emptied_at timestamptz;
|
||||||
@@ -25,6 +25,10 @@
|
|||||||
-- A pair whose MBIDs are both set and differ is not a title match: the tags say
|
-- A pair whose MBIDs are both set and differ is not a title match: the tags say
|
||||||
-- they are different recordings. The caller folds a pair only when each side has
|
-- they are different recordings. The caller folds a pair only when each side has
|
||||||
-- exactly one candidate; anything else is ambiguous and left alone.
|
-- exactly one candidate; anything else is ambiguous and left alone.
|
||||||
|
--
|
||||||
|
-- A slot the duplicate resolver emptied (emptied_at, migration 0095) pairs by
|
||||||
|
-- title only with a track added since: the album held no copy of the song as
|
||||||
|
-- long as it is, so one already there under the title is another song.
|
||||||
WITH grp AS (
|
WITH grp AS (
|
||||||
SELECT id AS album_id, COALESCE(release_group_mbid, id::text) AS g
|
SELECT id AS album_id, COALESCE(release_group_mbid, id::text) AS g
|
||||||
FROM albums
|
FROM albums
|
||||||
@@ -47,6 +51,7 @@ cand AS (
|
|||||||
AND lower(p.title) = lower(m.title)
|
AND lower(p.title) = lower(m.title)
|
||||||
WHERE m.missing_since IS NOT NULL
|
WHERE m.missing_since IS NOT NULL
|
||||||
AND (m.mbid IS NULL OR p.mbid IS NULL OR m.mbid = p.mbid)
|
AND (m.mbid IS NULL OR p.mbid IS NULL OR m.mbid = p.mbid)
|
||||||
|
AND (m.emptied_at IS DISTINCT FROM m.missing_since OR p.added_at > m.emptied_at)
|
||||||
),
|
),
|
||||||
pairs AS (
|
pairs AS (
|
||||||
-- A pair both rules found is one candidate, credited to the stronger rule.
|
-- A pair both rules found is one candidate, credited to the stronger rule.
|
||||||
|
|||||||
@@ -226,6 +226,15 @@ UPDATE tracks
|
|||||||
SET mbid = NULL, mbid_source = NULL
|
SET mbid = NULL, mbid_source = NULL
|
||||||
WHERE id = ANY(sqlc.arg(ids)::uuid[]);
|
WHERE id = ANY(sqlc.arg(ids)::uuid[]);
|
||||||
|
|
||||||
|
-- name: MarkTracksEmptied :exec
|
||||||
|
-- Stamps rows the duplicate resolver emptied, whose song the album holds no
|
||||||
|
-- other copy of, with the time they went missing (migration 0095): missing-pair
|
||||||
|
-- folding then waits for a copy fetched again.
|
||||||
|
UPDATE tracks
|
||||||
|
SET emptied_at = missing_since
|
||||||
|
WHERE id = ANY(sqlc.arg(ids)::uuid[])
|
||||||
|
AND missing_since IS NOT NULL;
|
||||||
|
|
||||||
-- name: ClearTracksMissing :execrows
|
-- name: ClearTracksMissing :execrows
|
||||||
-- Clears the mark on rows whose file is back. Runs independently of the mtime
|
-- Clears the mark on rows whose file is back. Runs independently of the mtime
|
||||||
-- skip check, so a file that reappears unchanged is un-marked even though the
|
-- skip check, so a file that reappears unchanged is un-marked even though the
|
||||||
|
|||||||
@@ -27,7 +27,10 @@ import (
|
|||||||
// - On one album, a song is held once: the extra copies are merged into the
|
// - On one album, a song is held once: the extra copies are merged into the
|
||||||
// best by ProposeSurvivor.
|
// best by ProposeSurvivor.
|
||||||
// - Across releases, each copy belongs to its own release (a single and its
|
// - Across releases, each copy belongs to its own release (a single and its
|
||||||
// album): nothing is removed, and the copies are linked as one song.
|
// album): nothing is removed, and the copies are linked as one song. An
|
||||||
|
// album holding the song twice among them still holds it once: its extra
|
||||||
|
// copies are merged into its best (Humanz held Saturnz Barz twice beside
|
||||||
|
// the single, #5401).
|
||||||
// - Except that a video rip is no release's copy. When every copy but one is
|
// - Except that a video rip is no release's copy. When every copy but one is
|
||||||
// a rip, across releases or under another title, the rips are merged into
|
// a rip, across releases or under another title, the rips are merged into
|
||||||
// the one that is not.
|
// the one that is not.
|
||||||
@@ -215,6 +218,10 @@ func ResolveDuplicatesWith(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
folded, foldedNames := foldAlbumCopies(ctx, pool, logger, dataDir, groups, merged, resolveMergeCap-res.Merged)
|
||||||
|
res.Merged += folded
|
||||||
|
mergedNames = append(mergedNames, foldedNames...)
|
||||||
|
|
||||||
res.Dismissed = dismissDistinct(ctx, pool, logger, groups, merged)
|
res.Dismissed = dismissDistinct(ctx, pool, logger, groups, merged)
|
||||||
wrong, names := settleWrongSlots(ctx, pool, logger, groups, merged, src)
|
wrong, names := settleWrongSlots(ctx, pool, logger, groups, merged, src)
|
||||||
res.WrongFiles = wrong
|
res.WrongFiles = wrong
|
||||||
@@ -235,6 +242,123 @@ func ResolveDuplicatesWith(
|
|||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// foldAlbumCopies merges, in each cross-release group, the extra copies one
|
||||||
|
// album holds of the song into the best of that album's copies: the one that
|
||||||
|
// is not a video rip when only one is not, else ProposeSurvivor's choice. The
|
||||||
|
// copies on other releases stay and are linked as one song. At most budget
|
||||||
|
// copies go. It returns how many went and the songs they were, and drops them
|
||||||
|
// from their groups.
|
||||||
|
func foldAlbumCopies(
|
||||||
|
ctx context.Context, pool *pgxpool.Pool, logger *slog.Logger, dataDir string,
|
||||||
|
groups []*resolveGroup, merged map[pgtype.UUID]bool, budget int,
|
||||||
|
) (int, []string) {
|
||||||
|
n := 0
|
||||||
|
var names []string
|
||||||
|
for _, g := range groups {
|
||||||
|
if g.class != ClassCrossRelease || merged[g.id] || ctx.Err() != nil || n >= budget {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
onAlbum := map[string][]int{}
|
||||||
|
for i, m := range g.members {
|
||||||
|
k := syncpkg.FormatUUID(m.AlbumID) + "\x00" + MatchTitleKey(m.Title, m.ArtistName)
|
||||||
|
onAlbum[k] = append(onAlbum[k], i)
|
||||||
|
}
|
||||||
|
gone := map[int]bool{}
|
||||||
|
for _, copies := range onAlbum {
|
||||||
|
if len(copies) < 2 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
keep, reason := albumCopySurvivor(g, copies)
|
||||||
|
for _, i := range copies {
|
||||||
|
if i == keep || n >= budget {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err := foldAlbumCopy(ctx, pool, logger, dataDir, g, i, keep, reason); err != nil {
|
||||||
|
logger.Warn("duplicate resolve: merging an album's extra copy failed",
|
||||||
|
"group_id", syncpkg.FormatUUID(g.id), "path", g.members[i].FilePath, "err", err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
gone[i] = true
|
||||||
|
n++
|
||||||
|
if len(names) < notifyItems {
|
||||||
|
names = append(names, TrackLabel(g.members[i].ArtistName, g.members[i].Title))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(gone) > 0 {
|
||||||
|
kept := g.members[:0:0]
|
||||||
|
for i, m := range g.members {
|
||||||
|
if !gone[i] {
|
||||||
|
kept = append(kept, m)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
g.members = kept
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return n, names
|
||||||
|
}
|
||||||
|
|
||||||
|
// albumCopySurvivor picks which of one album's copies (indexes into the
|
||||||
|
// group's members) to keep, and why.
|
||||||
|
func albumCopySurvivor(g *resolveGroup, copies []int) (int, string) {
|
||||||
|
notRip := -1
|
||||||
|
for _, i := range copies {
|
||||||
|
if isRip(g.members[i]) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if notRip >= 0 {
|
||||||
|
notRip = -1
|
||||||
|
break
|
||||||
|
}
|
||||||
|
notRip = i
|
||||||
|
}
|
||||||
|
if notRip >= 0 {
|
||||||
|
return notRip, "the copy that is not a video rip"
|
||||||
|
}
|
||||||
|
all := survivorCandidates(g)
|
||||||
|
cands := make([]SurvivorCandidate, len(copies))
|
||||||
|
for j, i := range copies {
|
||||||
|
cands[j] = all[i]
|
||||||
|
}
|
||||||
|
id, reason := ProposeSurvivor(cands)
|
||||||
|
for _, i := range copies {
|
||||||
|
if all[i].TrackID == id {
|
||||||
|
return i, reason
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return copies[0], reason
|
||||||
|
}
|
||||||
|
|
||||||
|
// foldAlbumCopy replaces one of an album's copies with the copy kept, history
|
||||||
|
// and all, and records it as the resolver's merge.
|
||||||
|
func foldAlbumCopy(
|
||||||
|
ctx context.Context, pool *pgxpool.Pool, logger *slog.Logger, dataDir string,
|
||||||
|
g *resolveGroup, gone, keep int, reason string,
|
||||||
|
) error {
|
||||||
|
from, into := g.members[gone], g.members[keep]
|
||||||
|
moved, err := ReplaceTrack(ctx, pool, logger, dataDir, from.TrackID, into.TrackID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
audit.WriteOrLog(ctx, pool, logger, pgtype.UUID{}, pgtype.UUID{}, audit.ActionDuplicateMerge, map[string]any{
|
||||||
|
"automatic": true,
|
||||||
|
"group_id": syncpkg.FormatUUID(g.id),
|
||||||
|
"tier": g.tier,
|
||||||
|
"class": string(g.class),
|
||||||
|
"survivor_track_id": syncpkg.FormatUUID(into.TrackID),
|
||||||
|
"survivor_path": into.FilePath,
|
||||||
|
"survivor_reason": reason + "; the album held the song twice",
|
||||||
|
"removed": []map[string]string{
|
||||||
|
{"track_id": syncpkg.FormatUUID(from.TrackID), "file_path": from.FilePath},
|
||||||
|
},
|
||||||
|
"moved": map[string]any{
|
||||||
|
"play_events": moved.PlayEvents, "skip_events": moved.SkipEvents,
|
||||||
|
"likes": moved.Likes, "playlist_entries": moved.PlaylistEntries,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// linkCrossRelease links each cross-release group's copies as one song
|
// linkCrossRelease links each cross-release group's copies as one song
|
||||||
// (#5438): a like on one is a like on all, and the Liked list, shuffle and the
|
// (#5438): a like on one is a like on all, and the Liked list, shuffle and the
|
||||||
// mixes count the song once. A group the pass merged has nothing left to link. Linking an already-linked group changes nothing,
|
// mixes count the song once. A group the pass merged has nothing left to link. Linking an already-linked group changes nothing,
|
||||||
|
|||||||
@@ -417,6 +417,54 @@ func TestResolveDuplicates_RemovesACopyFromAnotherSongsSlot_Integration(t *testi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A slot emptied of another song's file folds into a copy of its own song the
|
||||||
|
// album already holds (Savant's VOID DLC "Weeper" beside Void's). A copy under
|
||||||
|
// the title that is not as long as the song is another song (the emptied "Open
|
||||||
|
// the Gateway" folded into a file holding Onward, 2026-10-20): the slot waits
|
||||||
|
// for a copy fetched again, and folds into that.
|
||||||
|
func TestResolveDuplicates_EmptiedSlotFoldsOnlyIntoItsOwnSong_Integration(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
name string
|
||||||
|
heldMs int32
|
||||||
|
foldsFirst int
|
||||||
|
}{
|
||||||
|
{"the album holds Reach", 281500, 1},
|
||||||
|
{"the album holds a file titled Reach that is not", 220000, 0},
|
||||||
|
} {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
f := newOneAlbumFixture(t, "acoustic", "Void", "Reach")
|
||||||
|
ctx := context.Background()
|
||||||
|
q := dbq.New(f.pool)
|
||||||
|
seedTrackList(t, f.pool, f.album, map[string]int{"Void": 220500, "Reach": 281000})
|
||||||
|
held := func(name string, ms int32) {
|
||||||
|
t.Helper()
|
||||||
|
if _, err := q.UpsertTrack(ctx, dbq.UpsertTrackParams{
|
||||||
|
Title: "Reach", AlbumID: f.album.ID, ArtistID: f.a.ArtistID,
|
||||||
|
DurationMs: ms, FilePath: filepath.Join(filepath.Dir(f.aPath), name), FileSize: 100, FileFormat: "m4a",
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
held("17 - Reach (other edition).m4a", tc.heldMs)
|
||||||
|
res, err := ResolveDuplicates(ctx, f.pool, nil, "", true)
|
||||||
|
if err != nil || res.WrongFiles != 1 {
|
||||||
|
t.Fatalf("resolve = %+v, %v; want Reach's slot emptied", res, err)
|
||||||
|
}
|
||||||
|
pairs, err := PairMissingTracks(ctx, f.pool, nil)
|
||||||
|
if err != nil || pairs.Folded() != tc.foldsFirst {
|
||||||
|
t.Fatalf("missing-pair pass = %+v, %v; want %d folded", pairs, err, tc.foldsFirst)
|
||||||
|
}
|
||||||
|
if tc.foldsFirst == 1 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
held("17 - Reach (fetched again).m4a", 281200)
|
||||||
|
if pairs, err := PairMissingTracks(ctx, f.pool, nil); err != nil || pairs.Folded() != 1 {
|
||||||
|
t.Fatalf("missing-pair pass after the fetch = %+v, %v; want the slot folded into the copy fetched", pairs, err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// One recording filling two slots whose songs are both clearly something else
|
// One recording filling two slots whose songs are both clearly something else
|
||||||
// (Shnabubula's whole album in one file): both copies go, nothing is kept.
|
// (Shnabubula's whole album in one file): both copies go, nothing is kept.
|
||||||
func TestResolveDuplicates_RemovesEveryCopyWhenNoSlotIsTheirs_Integration(t *testing.T) {
|
func TestResolveDuplicates_RemovesEveryCopyWhenNoSlotIsTheirs_Integration(t *testing.T) {
|
||||||
|
|||||||
@@ -238,7 +238,8 @@ func settleWrongSlots(
|
|||||||
// Set aside before the files go: a pass that dies between the two
|
// Set aside before the files go: a pass that dies between the two
|
||||||
// still does not fetch the same files again.
|
// still does not fetch the same files again.
|
||||||
blocked := blockReleasesHolding(ctx, pool, logger, g)
|
blocked := blockReleasesHolding(ctx, pool, logger, g)
|
||||||
n, err := removeWrongSlots(ctx, pool, logger, g, keep, losers, blocked)
|
emptied := emptiedSlots(ctx, q, logger, g, losers, tracks)
|
||||||
|
n, err := removeWrongSlots(ctx, pool, logger, g, keep, losers, emptied, blocked)
|
||||||
removed += n
|
removed += n
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Warn("duplicate resolve: removing wrong-slot copies failed", "group_id", syncpkg.FormatUUID(g.id), "err", err)
|
logger.Warn("duplicate resolve: removing wrong-slot copies failed", "group_id", syncpkg.FormatUUID(g.id), "err", err)
|
||||||
@@ -385,6 +386,46 @@ func blockReleasesHolding(ctx context.Context, pool *pgxpool.Pool, logger *slog.
|
|||||||
return names
|
return names
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// emptiedSlots is the losers whose song the album holds no other copy of:
|
||||||
|
// no present track on it under that title as long as the song's slot. Those
|
||||||
|
// wait for a copy fetched again (migration 0095). The rest are the song held
|
||||||
|
// twice, and missing-pair folding folds them into the copy held: Savant's
|
||||||
|
// VOID DLC "Weeper" beside Void's. A failed read counts every loser as
|
||||||
|
// emptied, which only makes the album wait for a copy it may not need.
|
||||||
|
func emptiedSlots(
|
||||||
|
ctx context.Context, q *dbq.Queries, logger *slog.Logger, g *resolveGroup, losers []int, tracks []dbq.MbReleaseTrack,
|
||||||
|
) []pgtype.UUID {
|
||||||
|
held, err := q.ListTracksByAlbum(ctx, dbq.ListTracksByAlbumParams{AlbumID: g.members[0].AlbumID})
|
||||||
|
if err != nil {
|
||||||
|
logger.Warn("duplicate resolve: reading the album's tracks failed", "group_id", syncpkg.FormatUUID(g.id), "err", err)
|
||||||
|
}
|
||||||
|
inGroup := map[pgtype.UUID]bool{}
|
||||||
|
for _, m := range g.members {
|
||||||
|
inGroup[m.TrackID] = true
|
||||||
|
}
|
||||||
|
var emptied []pgtype.UUID
|
||||||
|
for _, i := range losers {
|
||||||
|
m := g.members[i]
|
||||||
|
key := MatchTitleKey(m.Title, m.ArtistName)
|
||||||
|
covered := false
|
||||||
|
for _, h := range held {
|
||||||
|
if covered || h.MissingSince.Valid || inGroup[h.ID] || MatchTitleKey(h.Title, m.ArtistName) != key {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, t := range tracks {
|
||||||
|
if t.LengthMs > 0 && MatchTitleKey(t.Title, m.ArtistName) == key && absMs(t.LengthMs-h.DurationMs) <= slotFit {
|
||||||
|
covered = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !covered {
|
||||||
|
emptied = append(emptied, m.TrackID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return emptied
|
||||||
|
}
|
||||||
|
|
||||||
// neverRead reports whether the catalogue has never read a release group's
|
// neverRead reports whether the catalogue has never read a release group's
|
||||||
// releases. A group read and found empty is not asked about again: the
|
// releases. A group read and found empty is not asked about again: the
|
||||||
// catalogue's own refresh revisits it.
|
// catalogue's own refresh revisits it.
|
||||||
@@ -397,12 +438,14 @@ func neverRead(ctx context.Context, q *dbq.Queries, rg string) bool {
|
|||||||
// the same transaction that closes the group. The row is kept, with its likes
|
// the same transaction that closes the group. The row is kept, with its likes
|
||||||
// and plays: it is the slot, and a good copy fetched again takes it over. Its
|
// and plays: it is the slot, and a good copy fetched again takes it over. Its
|
||||||
// recording MBID is dropped, being the wrong file's, so missing-pair folding
|
// recording MBID is dropped, being the wrong file's, so missing-pair folding
|
||||||
// does not fold the slot into the copy that was kept. blocked names the
|
// does not fold the slot into the copy that was kept. The slots in emptied
|
||||||
// releases set aside, for the record. A file that cannot be removed stops the
|
// are stamped to wait for a copy fetched again (emptiedSlots). blocked names
|
||||||
// group; the ones already gone are still marked, and the group waits for the
|
// the releases set aside, for the record. A file that cannot be removed stops
|
||||||
// next pass.
|
// the group; the ones already gone are still marked, and the group waits for
|
||||||
|
// the next pass.
|
||||||
func removeWrongSlots(
|
func removeWrongSlots(
|
||||||
ctx context.Context, pool *pgxpool.Pool, logger *slog.Logger, g *resolveGroup, keep int, losers []int, blocked []string,
|
ctx context.Context, pool *pgxpool.Pool, logger *slog.Logger, g *resolveGroup, keep int, losers []int,
|
||||||
|
emptied []pgtype.UUID, blocked []string,
|
||||||
) (int, error) {
|
) (int, error) {
|
||||||
var gone []pgtype.UUID
|
var gone []pgtype.UUID
|
||||||
var removedFiles []map[string]string
|
var removedFiles []map[string]string
|
||||||
@@ -429,6 +472,9 @@ func removeWrongSlots(
|
|||||||
if err := tq.ClearTrackMbids(ctx, gone); err != nil {
|
if err := tq.ClearTrackMbids(ctx, gone); err != nil {
|
||||||
return fmt.Errorf("clear mbids: %w", err)
|
return fmt.Errorf("clear mbids: %w", err)
|
||||||
}
|
}
|
||||||
|
if err := tq.MarkTracksEmptied(ctx, emptied); err != nil {
|
||||||
|
return fmt.Errorf("mark emptied: %w", err)
|
||||||
|
}
|
||||||
if err := logTrackChanges(ctx, tq, gone); err != nil {
|
if err := logTrackChanges(ctx, tq, gone); err != nil {
|
||||||
return fmt.Errorf("log changes: %w", err)
|
return fmt.Errorf("log changes: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ package library
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgtype"
|
"github.com/jackc/pgx/v5/pgtype"
|
||||||
@@ -218,3 +220,68 @@ func songKeys(t *testing.T, q *dbq.Queries, ids ...pgtype.UUID) []pgtype.UUID {
|
|||||||
}
|
}
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A cross-release group whose album holds the song twice (Humanz: Saturnz
|
||||||
|
// Barz as a FLAC and a YouTube mp3, beside the single, #5401): the album's
|
||||||
|
// extra copy is merged into its FLAC, the single stays, and the two copies
|
||||||
|
// left are linked as one song.
|
||||||
|
func TestResolveDuplicates_FoldsAnAlbumsExtraCopyInACrossReleaseGroup_Integration(t *testing.T) {
|
||||||
|
pool := newPool(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
q := dbq.New(pool)
|
||||||
|
dir := t.TempDir()
|
||||||
|
artist, err := q.UpsertArtist(ctx, dbq.UpsertArtistParams{Name: "Gorillaz", SortName: "Gorillaz"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
track := func(album, name, format string) dbq.Track {
|
||||||
|
t.Helper()
|
||||||
|
a, err := q.UpsertAlbum(ctx, dbq.UpsertAlbumParams{Title: album, SortTitle: album, ArtistID: artist.ID})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
path := filepath.Join(dir, album, name)
|
||||||
|
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := os.WriteFile(path, []byte("audio"), 0o644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
tr, err := q.UpsertTrack(ctx, dbq.UpsertTrackParams{
|
||||||
|
Title: "Saturnz Barz", AlbumID: a.ID, ArtistID: artist.ID,
|
||||||
|
DurationMs: 181000, FilePath: path, FileSize: 100, FileFormat: format,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
return tr
|
||||||
|
}
|
||||||
|
flac := track("Humanz", "04 Saturnz Barz.flac", "flac")
|
||||||
|
mp3 := track("Humanz", "06 Saturnz Barz (feat. Popcaan).mp3", "mp3")
|
||||||
|
single := track("Saturnz Barz", "01 Saturnz Barz.mp3", "mp3")
|
||||||
|
var groupID pgtype.UUID
|
||||||
|
if err := pool.QueryRow(ctx,
|
||||||
|
`INSERT INTO duplicate_groups (member_key, tier) VALUES ('humanz-saturnz', 'exact') RETURNING id`,
|
||||||
|
).Scan(&groupID); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := pool.Exec(ctx, `INSERT INTO duplicate_group_members (group_id, track_id) VALUES ($1, $2), ($1, $3), ($1, $4)`,
|
||||||
|
groupID, flac.ID, mp3.ID, single.ID); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
res, err := ResolveDuplicates(ctx, pool, nil, "", true)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if res.Merged != 1 || exists(mp3.FilePath) || !exists(flac.FilePath) || !exists(single.FilePath) {
|
||||||
|
t.Fatalf("result %+v, mp3 %v flac %v single %v; want only the album's mp3 merged away",
|
||||||
|
res, exists(mp3.FilePath), exists(flac.FilePath), exists(single.FilePath))
|
||||||
|
}
|
||||||
|
if _, err := q.GetTrackByID(ctx, mp3.ID); err == nil {
|
||||||
|
t.Error("the album's extra copy is still a track")
|
||||||
|
}
|
||||||
|
if res.SongsLinked != 1 {
|
||||||
|
t.Errorf("songs linked = %d, want the FLAC and the single linked as one song", res.SongsLinked)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user