arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Deluan
2022-12-28 12:32:46 -05:00
committed by Deluan Quintão
parent bc09de6640
commit 61e5523457
14 changed files with 82 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/artwork/artwork.go
+31 -6
View File
@@ -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