diff --git a/cmd/minstrel/main.go b/cmd/minstrel/main.go index bb324ff7..6b2a4536 100644 --- a/cmd/minstrel/main.go +++ b/cmd/minstrel/main.go @@ -109,7 +109,7 @@ func run() error { srv := server.New(logger, pool, scanner, subsonic.Config{ AllowPlaintextPassword: cfg.Subsonic.AllowPlaintextPassword, - }, cfg.Events, cfg.Recommendation, cfg.Storage.DataDir) + }, cfg.Events, cfg.Recommendation, cfg.Storage.DataDir, cfg.Branding) httpServer := &http.Server{ Addr: cfg.Server.Address, Handler: srv.Router(), diff --git a/internal/server/server.go b/internal/server/server.go index 8819920f..68d0f75f 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -67,11 +67,12 @@ type Server struct { // playlist cover collages under /playlist_covers/). Empty // strings are tolerated by tests that don't exercise persisted-cover // codepaths; production callers should pass a writable directory. - DataDir string + DataDir string + BrandingCfg config.BrandingConfig } -func New(logger *slog.Logger, pool *pgxpool.Pool, scanner ScanTrigger, subCfg subsonic.Config, eventsCfg config.EventsConfig, recCfg config.RecommendationConfig, dataDir string) *Server { - return &Server{Logger: logger, Pool: pool, Scanner: scanner, SubsonicCfg: subCfg, EventsCfg: eventsCfg, RecommendationCfg: recCfg, DataDir: dataDir} +func New(logger *slog.Logger, pool *pgxpool.Pool, scanner ScanTrigger, subCfg subsonic.Config, eventsCfg config.EventsConfig, recCfg config.RecommendationConfig, dataDir string, brandingCfg config.BrandingConfig) *Server { + return &Server{Logger: logger, Pool: pool, Scanner: scanner, SubsonicCfg: subCfg, EventsCfg: eventsCfg, RecommendationCfg: recCfg, DataDir: dataDir, BrandingCfg: brandingCfg} } func (s *Server) Router() http.Handler {