From abc8ef581835f01552e22a30dcb048c0c2ab2c71 Mon Sep 17 00:00:00 2001 From: Unrud Date: Tue, 1 Feb 2022 13:59:32 +0100 Subject: [PATCH] Workaround for assetFS FileInfo See https://github.com/elazarl/go-bindata-assetfs/pull/55 --- bindata.generated.go | 14 +++++++------- bindata.go | 10 +++++++++- main.go | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/bindata.generated.go b/bindata.generated.go index b6cc018..1b6626f 100644 --- a/bindata.generated.go +++ b/bindata.generated.go @@ -88,7 +88,7 @@ func webdataFnJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/fn.js", size: 16295, mode: os.FileMode(436), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "webdata/fn.js", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -108,7 +108,7 @@ func webdataIconPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/icon.png", size: 2654, mode: os.FileMode(436), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "webdata/icon.png", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -128,7 +128,7 @@ func webdataIconWoff() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/icon.woff", size: 3504, mode: os.FileMode(436), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "webdata/icon.woff", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -148,7 +148,7 @@ func webdataIndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/index.html", size: 2526, mode: os.FileMode(436), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "webdata/index.html", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -168,7 +168,7 @@ func webdataMainCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/main.css", size: 3240, mode: os.FileMode(436), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "webdata/main.css", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -188,7 +188,7 @@ func webdataSha256Js() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/sha256.js", size: 9380, mode: os.FileMode(436), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "webdata/sha256.js", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -208,7 +208,7 @@ func webdataTexPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "webdata/tex.png", size: 3878, mode: os.FileMode(436), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "webdata/tex.png", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/bindata.go b/bindata.go index f81829b..6175053 100644 --- a/bindata.go +++ b/bindata.go @@ -1,4 +1,12 @@ package main -//go:generate go-bindata-assetfs -mode 0664 -modtime 1 -o ./bindata.generated.go webdata/... +//go:generate go-bindata-assetfs -nometadata -o ./bindata.generated.go webdata/... //go:generate gofmt -w ./bindata.generated.go + +import "net/http" + +func fixedAssetFS() http.FileSystem { + fs := assetFS() + fs.AssetInfo = AssetInfo + return fs +} diff --git a/main.go b/main.go index f35ff8d..5cbbe95 100644 --- a/main.go +++ b/main.go @@ -205,7 +205,7 @@ func main() { } port := addr.Port mux := http.NewServeMux() - mux.Handle("/", http.FileServer(assetFS())) + mux.Handle("/", http.FileServer(fixedAssetFS())) mux.Handle("/ws", websocket.Handler(func(ws *websocket.Conn) { var message string challenge := <-authenticationChallenges