bvandeusen
cc12ab7e96
Follow-up to 947f944. With the dhowden/tag/mbz extractor now correctly
matching ID3v2 TXXX frames, mbid backfill started rejecting every row
with "invalid byte sequence for encoding UTF8: 0x00 (SQLSTATE 22021)".
Cause: dhowden's readTextWithDescrFrame (id3v2frames.go:454) — the path
that decodes TXXX text — does NOT strip the trailing/embedded NUL bytes
that ID3v2.4 uses as frame terminator and multi-value separator. Unlike
readTFrame, which does (line 313). So a TXXX:MusicBrainz Album Id of
"abc-123\x00" comes back to us verbatim, and Postgres refuses to store
NULs in text columns.
cleanMBID splits on NUL and returns the first non-empty segment, which
also handles the multi-value case (collaboration artist IDs are
NUL-separated; Minstrel uses the primary for MBCAA, so first wins).
Tests cover the trailing-NUL, multi-value, and all-NUL paths.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
41 lines
1.3 KiB
Go
41 lines
1.3 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))
|
|
}
|
|
|
|
func cleanMBID(s string) string {
|
|
if s == "" {
|
|
return ""
|
|
}
|
|
for _, part := range strings.Split(s, "\x00") {
|
|
if t := strings.TrimSpace(part); t != "" {
|
|
return t
|
|
}
|
|
}
|
|
return ""
|
|
}
|