Rename ExternalInfo to ExternalMetadata

server/subsonic/api.go

@@ -23,27 +23,27 @@ const Version = "1.16.1"
 type handler = func(http.ResponseWriter, *http.Request) (*responses.Subsonic, error)
 
 type Router struct {
-	DataStore    model.DataStore
-	Artwork      core.Artwork
-	Streamer     core.MediaStreamer
-	Archiver     core.Archiver
-	Players      core.Players
-	ExternalInfo core.ExternalInfo
-	Scanner      scanner.Scanner
+	DataStore        model.DataStore
+	Artwork          core.Artwork
+	Streamer         core.MediaStreamer
+	Archiver         core.Archiver
+	Players          core.Players
+	ExternalMetadata core.ExternalMetadata
+	Scanner          scanner.Scanner
 
 	mux http.Handler
 }
 
 func New(ds model.DataStore, artwork core.Artwork, streamer core.MediaStreamer, archiver core.Archiver, players core.Players,
-	externalInfo core.ExternalInfo, scanner scanner.Scanner) *Router {
+	externalMetadata core.ExternalMetadata, scanner scanner.Scanner) *Router {
 	r := &Router{
-		DataStore:    ds,
-		Artwork:      artwork,
-		Streamer:     streamer,
-		Archiver:     archiver,
-		Players:      players,
-		ExternalInfo: externalInfo,
-		Scanner:      scanner,
+		DataStore:        ds,
+		Artwork:          artwork,
+		Streamer:         streamer,
+		Archiver:         archiver,
+		Players:          players,
+		ExternalMetadata: externalMetadata,
+		Scanner:          scanner,
 	}
 	r.mux = r.routes()
 	return r

server/subsonic/browsing.go

@@ -18,11 +18,11 @@ import (
 
 type BrowsingController struct {
 	ds model.DataStore
-	ei core.ExternalInfo
+	em core.ExternalMetadata
 }
 
-func NewBrowsingController(ds model.DataStore, ei core.ExternalInfo) *BrowsingController {
-	return &BrowsingController{ds: ds, ei: ei}
+func NewBrowsingController(ds model.DataStore, em core.ExternalMetadata) *BrowsingController {
+	return &BrowsingController{ds: ds, em: em}
 }
 
 func (c *BrowsingController) GetMusicFolders(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
@@ -236,7 +236,7 @@ func (c *BrowsingController) GetArtistInfo(w http.ResponseWriter, r *http.Reques
 	count := utils.ParamInt(r, "count", 20)
 	includeNotPresent := utils.ParamBool(r, "includeNotPresent", false)
 
-	artist, err := c.ei.UpdateArtistInfo(ctx, id, count, includeNotPresent)
+	artist, err := c.em.UpdateArtistInfo(ctx, id, count, includeNotPresent)
 	if err != nil {
 		return nil, err
 	}
@@ -285,7 +285,7 @@ func (c *BrowsingController) GetSimilarSongs(w http.ResponseWriter, r *http.Requ
 	}
 	count := utils.ParamInt(r, "count", 50)
 
-	songs, err := c.ei.SimilarSongs(ctx, id, count)
+	songs, err := c.em.SimilarSongs(ctx, id, count)
 	if err != nil {
 		return nil, err
 	}
@@ -318,7 +318,7 @@ func (c *BrowsingController) GetTopSongs(w http.ResponseWriter, r *http.Request)
 	}
 	count := utils.ParamInt(r, "count", 50)
 
-	songs, err := c.ei.TopSongs(ctx, artist, count)
+	songs, err := c.em.TopSongs(ctx, artist, count)
 	if err != nil {
 		return nil, err
 	}

server/subsonic/wire_gen.go

@@ -19,8 +19,8 @@ func initSystemController(router *Router) *SystemController {
 
 func initBrowsingController(router *Router) *BrowsingController {
 	dataStore := router.DataStore
-	externalInfo := router.ExternalInfo
-	browsingController := NewBrowsingController(dataStore, externalInfo)
+	externalMetadata := router.ExternalMetadata
+	browsingController := NewBrowsingController(dataStore, externalMetadata)
 	return browsingController
 }
 
@@ -95,5 +95,5 @@ var allProviders = wire.NewSet(
 	NewMediaRetrievalController,
 	NewStreamController,
 	NewBookmarksController,
-	NewLibraryScanningController, core.NewNowPlayingRepository, wire.FieldsOf(new(*Router), "DataStore", "Artwork", "Streamer", "Archiver", "ExternalInfo", "Scanner"),
+	NewLibraryScanningController, core.NewNowPlayingRepository, wire.FieldsOf(new(*Router), "DataStore", "Artwork", "Streamer", "Archiver", "ExternalMetadata", "Scanner"),
 )

server/subsonic/wire_injectors.go

@@ -20,7 +20,7 @@ var allProviders = wire.NewSet(
 	NewBookmarksController,
 	NewLibraryScanningController,
 	core.NewNowPlayingRepository,
-	wire.FieldsOf(new(*Router), "DataStore", "Artwork", "Streamer", "Archiver", "ExternalInfo", "Scanner"),
+	wire.FieldsOf(new(*Router), "DataStore", "Artwork", "Streamer", "Archiver", "ExternalMetadata", "Scanner"),
 )
 
 func initSystemController(router *Router) *SystemController {