Handle "naked" CoverArtIDs (IDs of album, mediafiles and playlists)

core/artwork/artwork.go

@@ -38,12 +38,9 @@ func (a *artwork) Get(ctx context.Context, id string, size int) (reader io.ReadC
 	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
 	defer cancel()
 
-	var artID model.ArtworkID
-	if id != "" {
-		artID, err = model.ParseArtworkID(id)
-		if err != nil {
-			return nil, time.Time{}, errors.New("invalid ID")
-		}
+	artID, err := a.getArtworkId(ctx, id)
+	if err != nil {
+		return nil, time.Time{}, err
 	}
 
 	artReader, err := a.getArtworkReader(ctx, artID, size)
@@ -61,6 +58,34 @@ func (a *artwork) Get(ctx context.Context, id string, size int) (reader io.ReadC
 	return r, artReader.LastUpdated(), nil
 }
 
+func (a *artwork) getArtworkId(ctx context.Context, id string) (model.ArtworkID, error) {
+	if id == "" {
+		return model.ArtworkID{}, nil
+	}
+	artID, err := model.ParseArtworkID(id)
+	if err == nil {
+		return artID, nil
+	}
+
+	log.Trace(ctx, "ArtworkID invalid. Trying to figure out kind based on the ID", "id", id)
+	entity, err := model.GetEntityByID(ctx, a.ds, id)
+	if err != nil {
+		return model.ArtworkID{}, err
+	}
+	switch e := entity.(type) {
+	case *model.Album:
+		artID = model.NewArtworkID(model.KindAlbumArtwork, e.ID)
+		log.Trace(ctx, "ID is for an Album", "id", id, "name", e.Name, "artist", e.AlbumArtist)
+	case *model.MediaFile:
+		artID = model.NewArtworkID(model.KindMediaFileArtwork, e.ID)
+		log.Trace(ctx, "ID is for a MediaFile", "id", id, "title", e.Title, "album", e.Album)
+	case *model.Playlist:
+		artID = model.NewArtworkID(model.KindPlaylistArtwork, e.ID)
+		log.Trace(ctx, "ID is for a Playlist", "id", id, "name", e.Name)
+	}
+	return artID, nil
+}
+
 func (a *artwork) getArtworkReader(ctx context.Context, artID model.ArtworkID, size int) (artworkReader, error) {
 	var artReader artworkReader
 	var err error

core/artwork/reader_playlist.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/disintegration/imaging"
 	"github.com/navidrome/navidrome/model"
+	"github.com/navidrome/navidrome/utils/slice"
 	"golang.org/x/exp/slices"
 )
 
@@ -66,10 +67,9 @@ func (a *playlistArtworkReader) fromGeneratedTile(ctx context.Context, tracks mo
 func compactIDs(tracks model.PlaylistTracks) []model.ArtworkID {
 	slices.SortFunc(tracks, func(a, b model.PlaylistTrack) bool { return a.AlbumID < b.AlbumID })
 	tracks = slices.CompactFunc(tracks, func(a, b model.PlaylistTrack) bool { return a.AlbumID == b.AlbumID })
-	ids := make([]model.ArtworkID, len(tracks))
-	for i, t := range tracks {
-		ids[i] = t.AlbumCoverArtID()
-	}
+	ids := slice.Map(tracks, func(e model.PlaylistTrack) model.ArtworkID {
+		return e.AlbumCoverArtID()
+	})
 	rand.Seed(time.Now().UnixNano())
 	rand.Shuffle(len(ids), func(i, j int) { ids[i], ids[j] = ids[j], ids[i] })
 	return ids

core/artwork/wire_providers.go

@@ -0,0 +1,11 @@
+package artwork
+
+import (
+	"github.com/google/wire"
+)
+
+var Set = wire.NewSet(
+	NewArtwork,
+	GetImageCache,
+	NewCacheWarmer,
+)

core/external_metadata.go

@@ -47,7 +47,7 @@ func NewExternalMetadata(ds model.DataStore, agents *agents.Agents) ExternalMeta
 
 func (e *externalMetadata) getArtist(ctx context.Context, id string) (*auxArtist, error) {
 	var entity interface{}
-	entity, err := GetEntityByID(ctx, e.ds, id)
+	entity, err := model.GetEntityByID(ctx, e.ds, id)
 	if err != nil {
 		return nil, err
 	}

core/get_entity.go

@@ -1,28 +0,0 @@
-package core
-
-import (
-	"context"
-
-	"github.com/navidrome/navidrome/model"
-)
-
-// TODO: Should the type be encoded in the ID?
-func GetEntityByID(ctx context.Context, ds model.DataStore, id string) (interface{}, error) {
-	ar, err := ds.Artist(ctx).Get(id)
-	if err == nil {
-		return ar, nil
-	}
-	al, err := ds.Album(ctx).Get(id)
-	if err == nil {
-		return al, nil
-	}
-	pls, err := ds.Playlist(ctx).Get(id)
-	if err == nil {
-		return pls, nil
-	}
-	mf, err := ds.MediaFile(ctx).Get(id)
-	if err == nil {
-		return mf, nil
-	}
-	return nil, err
-}

core/wire_providers.go

@@ -3,7 +3,6 @@ package core
 import (
 	"github.com/google/wire"
 	"github.com/navidrome/navidrome/core/agents"
-	"github.com/navidrome/navidrome/core/artwork"
 	"github.com/navidrome/navidrome/core/ffmpeg"
 	"github.com/navidrome/navidrome/core/scrobbler"
 )
@@ -19,7 +18,4 @@ var Set = wire.NewSet(
 	agents.New,
 	ffmpeg.New,
 	scrobbler.GetPlayTracker,
-	artwork.NewArtwork,
-	artwork.GetImageCache,
-	artwork.NewCacheWarmer,
 )