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

Return cover from album even if client does not prefix the id with `al-`. Fixes #46

This commit is contained in:
Deluan 2020-04-02 22:03:27 -04:00
parent 40638688b2
commit 2d7998de59
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
engine/cover.go
View File

@ -32,27 +32,33 @@ func NewCover(ds model.DataStore) Cover {
}
func (c *cover) getCoverPath(ctx context.Context, id string) (string, error) {
switch {
case strings.HasPrefix(id, "al-"):
id = id[3:]
var found bool
var err error
if found, err = c.ds.Album(ctx).Exists(id); err != nil {
return "", err
}
if found {
al, err := c.ds.Album(ctx).Get(id)
if err != nil {
return "", err
}
if al.CoverArtId == "" {
return "", model.ErrNotFound
}
return al.CoverArtPath, nil
default:
mf, err := c.ds.MediaFile(ctx).Get(id)
if err != nil {
return "", err
}
if mf.HasCoverArt {
return mf.Path, nil
}
}
mf, err := c.ds.MediaFile(ctx).Get(id)
if err != nil {
return "", err
}
if mf.HasCoverArt {
return mf.Path, nil
}
return "", model.ErrNotFound
}
func (c *cover) Get(ctx context.Context, id string, size int, out io.Writer) error {
id = strings.TrimPrefix(id, "al-")
path, err := c.getCoverPath(ctx, id)
if err != nil && err != model.ErrNotFound {
return err