From 844c2c7306d78ec13051a2a98c23e395f75b9ecb Mon Sep 17 00:00:00 2001
From: dammitjeff <44111923+dammitjeff@users.noreply.github.com>
Date: Mon, 13 Jul 2026 09:09:12 -0700
Subject: [PATCH] enhance track metadata handling and add MusicBrainz track ID
 to recordings

---
 src/discovery/listenbrainz.go | 44 ++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/discovery/listenbrainz.go b/src/discovery/listenbrainz.go
index c7f3509..908195c 100644
--- a/src/discovery/listenbrainz.go
+++ b/src/discovery/listenbrainz.go
@@ -139,10 +139,11 @@ type Exploration struct {
 type TopRecordings struct {
 	Payload struct {
 		Recordings []struct {
-			ArtistName  string `json:"artist_name"`
-			ReleaseMbid string `json:"release_mbid"`
-			ReleaseName string `json:"release_name"`
-			TrackName   string `json:"track_name"`
+			ArtistName    string `json:"artist_name"`
+			RecordingMbid string `json:"recording_mbid"`
+			ReleaseMbid   string `json:"release_mbid"`
+			ReleaseName   string `json:"release_name"`
+			TrackName     string `json:"track_name"`
 		} `json:"recordings"`
 	} `json:"payload"`
 }
@@ -202,7 +203,19 @@ func NewListenBrainz(cfg cfg.DiscoveryConfig, httpClient *util.HttpClient) *List
 func (c *ListenBrainz) QueryTracks() ([]*models.Track, error) {
 	// Stats-based playlists bypass the discovery mode switch
 	if c.cfg.ImportPlaylist == "on-repeat" {
-		return c.getTopRecordings(c.cfg.User)
+		tracks, err := c.getTopRecordings(c.cfg.User)
+		if err != nil {
+			return nil, err
+		}
+		if c.cfg.EnrichTrackMetadata && len(tracks) > 0 {
+			enrichedTracks, err := c.enrichTracks(tracks, c.cfg.SingleArtist)
+			if err != nil {
+				slog.Warn("failed to enrich playlist metadata", "error", err)
+			} else {
+				tracks = enrichedTracks
+			}
+		}
+		return tracks, nil
 	}
 
 	var tracks []*models.Track
@@ -235,6 +248,14 @@ func (c *ListenBrainz) QueryTracks() ([]*models.Track, error) {
 		if err != nil {
 			return nil, err
 		}
+		if c.cfg.EnrichTrackMetadata && len(tracks) > 0 {
+			enrichedTracks, err := c.enrichTracks(tracks, c.cfg.SingleArtist)
+			if err != nil {
+				slog.Warn("failed to enrich playlist metadata", "error", err)
+			} else {
+				tracks = enrichedTracks
+			}
+		}
 	}
 	return tracks, nil
 }
@@ -285,12 +306,13 @@ func (c *ListenBrainz) getTopRecordings(user string) ([]*models.Track, error) {
 			coverURL = fmt.Sprintf("https://coverartarchive.org/release/%s/front-%s", rec.ReleaseMbid, c.cfg.CoverArtSize)
 		}
 		tracks = append(tracks, &models.Track{
-			Title:      rec.TrackName,
-			CleanTitle: rec.TrackName,
-			Artist:     rec.ArtistName,
-			MainArtist: rec.ArtistName,
-			Album:      rec.ReleaseName,
-			CoverURL:   coverURL,
+			Title:              rec.TrackName,
+			CleanTitle:         rec.TrackName,
+			Artist:             rec.ArtistName,
+			MainArtist:         rec.ArtistName,
+			Album:              rec.ReleaseName,
+			CoverURL:           coverURL,
+			MusicBrainzTrackID: rec.RecordingMbid,
 		})
 	}