Remove dependency of go-bindata (#818)

* Use new embed functionality for serving UI assets

* Use new embed functionality for serving resources. Remove dependency on go-bindata

* Remove Go 1.15
This commit is contained in:
Deluan Quintão
2021-03-12 11:06:51 -05:00
committed by GitHub
parent 5a259ef3ff
commit 2d528bbc87
22 changed files with 60 additions and 150 deletions
+3 -3
View File
@@ -10,12 +10,12 @@ import (
"github.com/go-chi/chi"
"github.com/go-chi/httprate"
"github.com/go-chi/jwtauth"
"github.com/navidrome/navidrome/assets"
"github.com/navidrome/navidrome/conf"
"github.com/navidrome/navidrome/core/auth"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/server/events"
"github.com/navidrome/navidrome/ui"
)
type Router struct {
@@ -77,8 +77,8 @@ func (app *Router) routes(path string) http.Handler {
})
// Serve UI app assets
r.Handle("/", serveIndex(app.ds, assets.AssetFile()))
r.Handle("/*", http.StripPrefix(path, http.FileServer(assets.AssetFile())))
r.Handle("/", serveIndex(app.ds, ui.Assets()))
r.Handle("/*", http.StripPrefix(path, http.FileServer(http.FS(ui.Assets()))))
return r
}