Return album art as a Reader

server/subsonic/media_retrieval.go

@@ -65,8 +65,8 @@ func (c *MediaRetrievalController) GetCoverArt(w http.ResponseWriter, r *http.Re
 	size := utils.ParamInt(r, "size", 0)
 
 	w.Header().Set("cache-control", "public, max-age=315360000")
-	err = c.artwork.Get(r.Context(), id, size, w)
 
+	imgReader, err := c.artwork.Get(r.Context(), id, size)
 	switch {
 	case err == model.ErrNotFound:
 		log.Error(r, "Couldn't find coverArt", "id", id, err)
@@ -76,5 +76,8 @@ func (c *MediaRetrievalController) GetCoverArt(w http.ResponseWriter, r *http.Re
 		return nil, err
 	}
 
-	return nil, nil
+	defer imgReader.Close()
+	_, err = io.Copy(w, imgReader)
+
+	return nil, err
 }

server/subsonic/media_retrieval_test.go

@@ -1,9 +1,11 @@
 package subsonic
 
 import (
+	"bytes"
 	"context"
 	"errors"
 	"io"
+	"io/ioutil"
 	"net/http/httptest"
 
 	"github.com/deluan/navidrome/model"
@@ -67,12 +69,11 @@ type fakeArtwork struct {
 	recvSize int
 }
 
-func (c *fakeArtwork) Get(ctx context.Context, id string, size int, out io.Writer) error {
+func (c *fakeArtwork) Get(ctx context.Context, id string, size int) (io.ReadCloser, error) {
 	if c.err != nil {
-		return c.err
+		return nil, c.err
 	}
 	c.recvId = id
 	c.recvSize = size
-	_, err := out.Write([]byte(c.data))
-	return err
+	return ioutil.NopCloser(bytes.NewReader([]byte(c.data))), nil
 }