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
+22
View File
@@ -0,0 +1,22 @@
package resources
import (
"embed"
"io/fs"
"io/ioutil"
)
//go:embed *
var filesystem embed.FS
func Asset(path string) ([]byte, error) {
f, err := filesystem.Open(path)
if err != nil {
return nil, err
}
return ioutil.ReadAll(f)
}
func Assets() fs.FS {
return filesystem
}
-28
View File
@@ -1,28 +0,0 @@
// +build !embed
package resources
import (
"io/ioutil"
"net/http"
"sync"
"github.com/navidrome/navidrome/log"
)
var once sync.Once
func Asset(filePath string) ([]byte, error) {
f, err := AssetFile().Open(filePath)
if err != nil {
return nil, err
}
return ioutil.ReadAll(f)
}
func AssetFile() http.FileSystem {
once.Do(func() {
log.Warn("Using external resources from 'resources' folder")
})
return http.Dir("resources")
}