Small refactorings

server/nativeapi/translations.go

@@ -31,7 +31,7 @@ var (
 
 func newTranslationRepository(context.Context) rest.Repository {
 	dir := utils.NewMergeFS(
-		http.FS(resources.Assets()),
+		http.FS(resources.FS),
 		http.Dir(filepath.Join(conf.Server.DataFolder, "resources")),
 	)
 	if err := loadTranslations(dir); err != nil {

server/nativeapi/translations_test.go

@@ -16,7 +16,7 @@ var _ = Describe("Translations", func() {
 	Describe("I18n files", func() {
 		var fs http.FileSystem
 		BeforeEach(func() {
-			fs = http.FS(resources.Assets())
+			fs = http.FS(resources.FS)
 		})
 		It("contains only valid json language files", func() {
 			dir, _ := fs.Open(consts.I18nFolder)

server/server.go

@@ -65,7 +65,7 @@ func (s *Server) initRoutes() {
 	r.Use(clientUniqueIdAdder)
 	r.Use(loggerInjector)
 	r.Use(requestLogger)
-	r.Use(robotsTXT(ui.Assets()))
+	r.Use(robotsTXT(ui.BuildAssets()))
 	r.Use(authHeaderMapper)
 	r.Use(jwtVerifier)
 
@@ -99,7 +99,7 @@ func (s *Server) initRoutes() {
 func (s *Server) frontendAssetsHandler() http.Handler {
 	r := chi.NewRouter()
 
-	r.Handle("/", serveIndex(s.ds, ui.Assets()))
-	r.Handle("/*", http.StripPrefix(s.appRoot, http.FileServer(http.FS(ui.Assets()))))
+	r.Handle("/", serveIndex(s.ds, ui.BuildAssets()))
+	r.Handle("/*", http.StripPrefix(s.appRoot, http.FileServer(http.FS(ui.BuildAssets()))))
 	return r
 }

server/subsonic/media_retrieval.go

@@ -46,7 +46,7 @@ func (c *MediaRetrievalController) GetAvatar(w http.ResponseWriter, r *http.Requ
 }
 
 func (c *MediaRetrievalController) getPlaceHolderAvatar(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
-	f, err := resources.Assets().Open(consts.PlaceholderAvatar)
+	f, err := resources.FS.Open(consts.PlaceholderAvatar)
 	if err != nil {
 		log.Error(r, "Image not found", err)
 		return nil, newError(responses.ErrorDataNotFound, "Avatar image not found")