mirrors
/
navidrome
mirror of https://github.com/navidrome/navidrome.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Parse correctly playlist CoverArt ids

This commit is contained in:
Deluan 2022-12-27 17:05:40 -05:00 committed by Deluan Quintão
parent 8f3387a894
commit 501386b11f
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/artwork/artwork.go
View File

@ -70,7 +70,7 @@ func (a *artwork) getArtworkReader(ctx context.Context, artID model.ArtworkID, s
case model.KindMediaFileArtwork:
artReader, err = newMediafileArtworkReader(ctx, a, artID)
default:
artReader, err = newEmptyIDReader(ctx, artID)
artReader, err = newPlaceholderReader(ctx, artID)
}
}
return artReader, err

12
core/artwork/reader_emptyid.go
View File

@ -10,26 +10,26 @@ import (
"github.com/navidrome/navidrome/model"
)
type emptyIDReader struct {
type placeholderReader struct {
artID model.ArtworkID
}
func newEmptyIDReader(_ context.Context, artID model.ArtworkID) (*emptyIDReader, error) {
a := &emptyIDReader{
func newPlaceholderReader(_ context.Context, artID model.ArtworkID) (*placeholderReader, error) {
a := &placeholderReader{
artID: artID,
}
return a, nil
}
func (a *emptyIDReader) LastUpdated() time.Time {
func (a *placeholderReader) LastUpdated() time.Time {
return time.Now() // Basically make it non-cacheable
}
func (a *emptyIDReader) Key() string {
func (a *placeholderReader) Key() string {
return fmt.Sprintf("0.%d.0.%d", a.LastUpdated().UnixMilli(), conf.Server.CoverJpegQuality)
}
func (a *emptyIDReader) Reader(ctx context.Context) (io.ReadCloser, string, error) {
func (a *placeholderReader) Reader(ctx context.Context) (io.ReadCloser, string, error) {
r, source := extractImage(ctx, a.artID, fromPlaceholder())
return r, source, nil
}

13
model/artwork_id.go
View File

@ -4,6 +4,8 @@ import (
"errors"
"fmt"
"strings"
"golang.org/x/exp/slices"
)
type Kind struct{ prefix string }
@ -11,8 +13,15 @@ type Kind struct{ prefix string }
var (
KindMediaFileArtwork = Kind{"mf"}
KindAlbumArtwork = Kind{"al"}
KindPlaylistArtwork = Kind{"pl"}
)
var artworkKindList = []string{
KindAlbumArtwork.prefix,
KindMediaFileArtwork.prefix,
KindPlaylistArtwork.prefix,
}
type ArtworkID struct {
Kind Kind
ID string
@ -26,11 +35,11 @@ func (id ArtworkID) String() string {
}
func ParseArtworkID(id string) (ArtworkID, error) {
parts := strings.Split(id, "-")
parts := strings.SplitN(id, "-", 2)
if len(parts) != 2 {
return ArtworkID{}, errors.New("invalid artwork id")
}
if parts[0] != KindAlbumArtwork.prefix && parts[0] != KindMediaFileArtwork.prefix {
if !slices.Contains(artworkKindList, parts[0]) {
return ArtworkID{}, errors.New("invalid artwork kind")
}
return ArtworkID{

6
model/artwork_id_test.go
View File

@ -19,6 +19,12 @@ var _ = Describe("ParseArtworkID()", func() {
Expect(id.Kind).To(Equal(model.KindMediaFileArtwork))
Expect(id.ID).To(Equal("a6f8d2b1"))
})
It("parses playlists artwork ids", func() {
id, err := model.ParseArtworkID("pl-18690de0-151b-4d86-81cb-f418a907315a")
Expect(err).ToNot(HaveOccurred())
Expect(id.Kind).To(Equal(model.KindPlaylistArtwork))
Expect(id.ID).To(Equal("18690de0-151b-4d86-81cb-f418a907315a"))
})
It("fails to parse malformed ids", func() {
_, err := model.ParseArtworkID("a6f8d2b1")
Expect(err).To(MatchError("invalid artwork id"))