Rename 'Cover' to the more generic term 'Artwork'

server/subsonic/api.go

@@ -23,7 +23,7 @@ type Handler = func(http.ResponseWriter, *http.Request) (*responses.Subsonic, er
 
 type Router struct {
 	Browser       engine.Browser
-	Cover         core.Cover
+	Artwork       core.Artwork
 	ListGenerator engine.ListGenerator
 	Playlists     engine.Playlists
 	Ratings       engine.Ratings
@@ -36,10 +36,10 @@ type Router struct {
 	mux http.Handler
 }
 
-func New(browser engine.Browser, cover core.Cover, listGenerator engine.ListGenerator, users engine.Users,
+func New(browser engine.Browser, artwork core.Artwork, listGenerator engine.ListGenerator, users engine.Users,
 	playlists engine.Playlists, ratings engine.Ratings, scrobbler engine.Scrobbler, search engine.Search,
 	streamer core.MediaStreamer, players engine.Players) *Router {
-	r := &Router{Browser: browser, Cover: cover, ListGenerator: listGenerator, Playlists: playlists,
+	r := &Router{Browser: browser, Artwork: artwork, ListGenerator: listGenerator, Playlists: playlists,
 		Ratings: ratings, Scrobbler: scrobbler, Search: search, Users: users, Streamer: streamer, Players: players}
 	r.mux = r.routes()
 	return r

server/subsonic/media_retrieval.go

@@ -14,11 +14,11 @@ import (
 )
 
 type MediaRetrievalController struct {
-	cover core.Cover
+	artwork core.Artwork
 }
 
-func NewMediaRetrievalController(cover core.Cover) *MediaRetrievalController {
-	return &MediaRetrievalController{cover: cover}
+func NewMediaRetrievalController(artwork core.Artwork) *MediaRetrievalController {
+	return &MediaRetrievalController{artwork: artwork}
 }
 
 func (c *MediaRetrievalController) GetAvatar(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
@@ -41,12 +41,12 @@ 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.cover.Get(r.Context(), id, size, w)
+	err = c.artwork.Get(r.Context(), id, size, w)
 
 	switch {
 	case err == model.ErrNotFound:
 		log.Error(r, "Couldn't find coverArt", "id", id, err)
-		return nil, NewError(responses.ErrorDataNotFound, "Cover not found")
+		return nil, NewError(responses.ErrorDataNotFound, "Artwork not found")
 	case err != nil:
 		log.Error(r, "Error retrieving coverArt", "id", id, err)
 		return nil, NewError(responses.ErrorGeneric, "Internal Error")

server/subsonic/media_retrieval_test.go

@@ -11,44 +11,27 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-type fakeCover struct {
-	data     string
-	err      error
-	recvId   string
-	recvSize int
-}
-
-func (c *fakeCover) Get(ctx context.Context, id string, size int, out io.Writer) error {
-	if c.err != nil {
-		return c.err
-	}
-	c.recvId = id
-	c.recvSize = size
-	_, err := out.Write([]byte(c.data))
-	return err
-}
-
 var _ = Describe("MediaRetrievalController", func() {
 	var controller *MediaRetrievalController
-	var cover *fakeCover
+	var artwork *fakeArtwork
 	var w *httptest.ResponseRecorder
 
 	BeforeEach(func() {
-		cover = &fakeCover{}
-		controller = NewMediaRetrievalController(cover)
+		artwork = &fakeArtwork{}
+		controller = NewMediaRetrievalController(artwork)
 		w = httptest.NewRecorder()
 	})
 
 	Describe("GetCoverArt", func() {
 		It("should return data for that id", func() {
-			cover.data = "image data"
+			artwork.data = "image data"
 			r := newGetRequest("id=34", "size=128")
 			_, err := controller.GetCoverArt(w, r)
 
 			Expect(err).To(BeNil())
-			Expect(cover.recvId).To(Equal("34"))
-			Expect(cover.recvSize).To(Equal(128))
-			Expect(w.Body.String()).To(Equal(cover.data))
+			Expect(artwork.recvId).To(Equal("34"))
+			Expect(artwork.recvSize).To(Equal(128))
+			Expect(w.Body.String()).To(Equal(artwork.data))
 		})
 
 		It("should fail if missing id parameter", func() {
@@ -59,15 +42,15 @@ var _ = Describe("MediaRetrievalController", func() {
 		})
 
 		It("should fail when the file is not found", func() {
-			cover.err = model.ErrNotFound
+			artwork.err = model.ErrNotFound
 			r := newGetRequest("id=34", "size=128")
 			_, err := controller.GetCoverArt(w, r)
 
-			Expect(err).To(MatchError("Cover not found"))
+			Expect(err).To(MatchError("Artwork not found"))
 		})
 
 		It("should fail when there is an unknown error", func() {
-			cover.err = errors.New("weird error")
+			artwork.err = errors.New("weird error")
 			r := newGetRequest("id=34", "size=128")
 			_, err := controller.GetCoverArt(w, r)
 
@@ -75,3 +58,20 @@ var _ = Describe("MediaRetrievalController", func() {
 		})
 	})
 })
+
+type fakeArtwork struct {
+	data     string
+	err      error
+	recvId   string
+	recvSize int
+}
+
+func (c *fakeArtwork) Get(ctx context.Context, id string, size int, out io.Writer) error {
+	if c.err != nil {
+		return c.err
+	}
+	c.recvId = id
+	c.recvSize = size
+	_, err := out.Write([]byte(c.data))
+	return err
+}

server/subsonic/wire_gen.go

@@ -53,8 +53,8 @@ func initUsersController(router *Router) *UsersController {
 }
 
 func initMediaRetrievalController(router *Router) *MediaRetrievalController {
-	cover := router.Cover
-	mediaRetrievalController := NewMediaRetrievalController(cover)
+	artwork := router.Artwork
+	mediaRetrievalController := NewMediaRetrievalController(artwork)
 	return mediaRetrievalController
 }
 
@@ -75,5 +75,5 @@ var allProviders = wire.NewSet(
 	NewSearchingController,
 	NewUsersController,
 	NewMediaRetrievalController,
-	NewStreamController, wire.FieldsOf(new(*Router), "Browser", "Cover", "ListGenerator", "Playlists", "Ratings", "Scrobbler", "Search", "Streamer"),
+	NewStreamController, wire.FieldsOf(new(*Router), "Browser", "Artwork", "ListGenerator", "Playlists", "Ratings", "Scrobbler", "Search", "Streamer"),
 )

server/subsonic/wire_injectors.go

@@ -16,7 +16,7 @@ var allProviders = wire.NewSet(
 	NewUsersController,
 	NewMediaRetrievalController,
 	NewStreamController,
-	wire.FieldsOf(new(*Router), "Browser", "Cover", "ListGenerator", "Playlists", "Ratings", "Scrobbler", "Search", "Streamer"),
+	wire.FieldsOf(new(*Router), "Browser", "Artwork", "ListGenerator", "Playlists", "Ratings", "Scrobbler", "Search", "Streamer"),
 )
 
 func initSystemController(router *Router) *SystemController {