diff --git a/bindata.generated.go b/bindata.generated.go index 1b6626f..dea71e8 100644 --- a/bindata.generated.go +++ b/bindata.generated.go @@ -13,7 +13,6 @@ import ( "bytes" "compress/gzip" "fmt" - "github.com/elazarl/go-bindata-assetfs" "io" "io/ioutil" "os" @@ -372,13 +371,3 @@ func _filePath(dir, name string) string { cannonicalName := strings.Replace(name, "\\", "/", -1) return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) } - -func assetFS() *assetfs.AssetFS { - assetInfo := func(path string) (os.FileInfo, error) { - return os.Stat(path) - } - for k := range _bintree.Children { - return &assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, AssetInfo: assetInfo, Prefix: k} - } - panic("unreachable") -} diff --git a/bindata.go b/bindata.go index 6175053..cf12eb8 100644 --- a/bindata.go +++ b/bindata.go @@ -1,12 +1,10 @@ package main -//go:generate go-bindata-assetfs -nometadata -o ./bindata.generated.go webdata/... +//go:generate go-bindata -nometadata -o ./bindata.generated.go webdata/... //go:generate gofmt -w ./bindata.generated.go -import "net/http" +import "github.com/elazarl/go-bindata-assetfs" -func fixedAssetFS() http.FileSystem { - fs := assetFS() - fs.AssetInfo = AssetInfo - return fs +func assetFS() *assetfs.AssetFS { + return &assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, AssetInfo: AssetInfo, Prefix: "webdata"} } diff --git a/main.go b/main.go index 5cbbe95..f35ff8d 100644 --- a/main.go +++ b/main.go @@ -205,7 +205,7 @@ func main() { } port := addr.Port mux := http.NewServeMux() - mux.Handle("/", http.FileServer(fixedAssetFS())) + mux.Handle("/", http.FileServer(assetFS())) mux.Handle("/ws", websocket.Handler(func(ws *websocket.Conn) { var message string challenge := <-authenticationChallenges