bvandeusen
e2432caa65
tracks.mbid was 100% NULL: the scanner only extracted album + artist MBIDs, never the recording MBID. The ListenBrainz similarity worker is gated on tracks.mbid IS NOT NULL, so track_similarity could never populate — starving For-You/radio's strongest candidate source (lb_similar) on every library. - mbids.go: add extractRecordingMBID (mbz.Recording / Picard musicbrainz_recordingid). Separate fn so extractMBIDs' signature + unit tests stay untouched. - scanner.go: persist recording MBID via UpsertTrack (heals on the file_path conflict, so re-scans backfill for free). - BackfillTrackMBIDs: one-shot pass mirroring BackfillMBIDs, wired as scan Stage 2b (idempotent via SetTrackMbidIfNull, gated by BackfillCap, log-only progress). - migration 0029: tracks_mbid_unique (0002, written when the column was always NULL) wrongly assumes one MBID == one track. A recording appears on multiple releases, so rows legitimately share a recording MBID. Replace with a non-unique partial index. Zero-risk: column is 100% NULL at migration time. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
54 lines
2.0 KiB
Go
54 lines
2.0 KiB
Go
package library
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/dhowden/tag"
|
|
"github.com/dhowden/tag/mbz"
|
|
)
|
|
|
|
// extractMBIDs reads MusicBrainz album and artist IDs from a tag.Metadata.
|
|
//
|
|
// Delegates to dhowden/tag/mbz, which knows the per-format Raw() conventions:
|
|
// - Vorbis (FLAC/OGG) keys are lowercased by the parser.
|
|
// - ID3v2 (MP3) TXXX frames are stored under "TXXX"/"TXXX_N" with
|
|
// a *tag.Comm value whose Description holds the Picard tag name.
|
|
// - MP4 (M4A) freeform iTunes atoms are stored under their bare sub-name.
|
|
//
|
|
// Then sanitizes: dhowden's readTextWithDescrFrame (used for ID3v2 TXXX)
|
|
// does NOT strip the trailing/embedded NUL bytes that ID3v2.4 uses as
|
|
// frame terminator and multi-value separator — so the Text often comes
|
|
// out as "uuid\x00" or "uuid1\x00uuid2". Postgres rejects NULs in text
|
|
// columns (SQLSTATE 22021). We split on NUL and take the first non-empty
|
|
// segment — Minstrel uses the primary release artist for MBCAA lookup,
|
|
// so first-wins matches the original semantics.
|
|
func extractMBIDs(m tag.Metadata) (albumMBID, artistMBID string) {
|
|
info := mbz.Extract(m)
|
|
return cleanMBID(info.Get(mbz.Album)), cleanMBID(info.Get(mbz.Artist))
|
|
}
|
|
|
|
// extractRecordingMBID reads the MusicBrainz *recording* ID — Picard's
|
|
// musicbrainz_recordingid, surfaced by dhowden/tag as mbz.Recording
|
|
// (tag display name "MusicBrainz Track Id"). This is the id ListenBrainz
|
|
// /explore/similar-recordings keys on and what tracks.mbid stores.
|
|
//
|
|
// Deliberately NOT mbz.Track ("MusicBrainz Release Track Id"): that is
|
|
// per-release-track, whereas similarity is per-recording. Kept separate
|
|
// from extractMBIDs so its existing (album, artist) signature and unit
|
|
// tests stay untouched.
|
|
func extractRecordingMBID(m tag.Metadata) string {
|
|
return cleanMBID(mbz.Extract(m).Get(mbz.Recording))
|
|
}
|
|
|
|
func cleanMBID(s string) string {
|
|
if s == "" {
|
|
return ""
|
|
}
|
|
for _, part := range strings.Split(s, "\x00") {
|
|
if t := strings.TrimSpace(part); t != "" {
|
|
return t
|
|
}
|
|
}
|
|
return ""
|
|
}
|