third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-06-06 02:13:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Better error handling when cover art cannot be loaded

Browse Source
This commit is contained in:
Deluan 2020-01-20 22:30:16 -05:00
parent c6ed0d5377
commit 8a1110044c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/cover.go
View File

@ -2,6 +2,7 @@ package engine
import ( import (
"bytes" "bytes"
"errors"
"image" "image"
_ "image/gif" _ "image/gif"
"image/jpeg" "image/jpeg"
@ -100,5 +101,9 @@ func readFromTag(path string) (io.Reader, error) {
return nil, err return nil, err
} }
return bytes.NewReader(m.Picture().Data), nil picture := m.Picture()
if picture == nil {
return nil, errors.New("error extracting art from file " + path)
}
return bytes.NewReader(picture.Data), nil
} }

4
server/subsonic/media_retrieval.go
View File

@ -43,10 +43,10 @@ func (c *MediaRetrievalController) GetCoverArt(w http.ResponseWriter, r *http.Re
switch { switch {
case err == model.ErrNotFound: case err == model.ErrNotFound:
log.Error(r, err.Error(), "id", id) log.Error(r, "Couldn't find coverArt", "id", id, err)
return nil, NewError(responses.ErrorDataNotFound, "Cover not found") return nil, NewError(responses.ErrorDataNotFound, "Cover not found")
case err != nil: case err != nil:
log.Error(r, err) log.Error(r, "Error retrieving coverArt", "id", id, err)
return nil, NewError(responses.ErrorGeneric, "Internal Error") return nil, NewError(responses.ErrorGeneric, "Internal Error")
} }