diff --git a/.goreleaser.yml b/.goreleaser.yml index 34af0a3..3a3c295 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,13 +1,10 @@ before: hooks: - go mod tidy - - go generate . builds: - env: - CGO_ENABLED=0 main: . - flags: - - -tags=vfs ldflags: -s -w -X main.VERSION={{.Version}} -X main.BUILDTIME={{.Date}} -X main.GITCOMMIT={{.Commit}} goos: - linux diff --git a/README.md b/README.md index 3523680..5ef7d8b 100644 --- a/README.md +++ b/README.md @@ -314,8 +314,7 @@ Depdencies are managed by [govendor](https://github.com/kardianos/govendor) 2. Build single binary release ```sh - $ go generate . - $ go build -tags vfs + $ go build ``` Theme are defined in [assets/themes](assets/themes) directory. Now only two themes are available, "black" and "green". @@ -335,7 +334,7 @@ Theme are defined in [assets/themes](assets/themes) directory. Now only two them **Go Libraries** -* [vfsgen](https://github.com/shurcooL/vfsgen) +* [vfsgen](https://github.com/shurcooL/vfsgen) Not using now * [go-bindata-assetfs](https://github.com/elazarl/go-bindata-assetfs) Not using now * diff --git a/assets.go b/assets.go new file mode 100644 index 0000000..2290670 --- /dev/null +++ b/assets.go @@ -0,0 +1,12 @@ +package main + +import ( + "embed" + "net/http" +) + +//go:embed assets +var assetsFS embed.FS + +// Assets contains project assets. +var Assets = http.FS(assetsFS) diff --git a/assets_dev.go b/assets_dev.go deleted file mode 100644 index abeb144..0000000 --- a/assets_dev.go +++ /dev/null @@ -1,9 +0,0 @@ -// +build !vfs -//go:generate go run assets_generate.go - -package main - -import "net/http" - -// Assets contains project assets. -var Assets http.FileSystem = http.Dir("assets") diff --git a/assets_generate.go b/assets_generate.go deleted file mode 100644 index 5977d0f..0000000 --- a/assets_generate.go +++ /dev/null @@ -1,23 +0,0 @@ -// +build ignore - -package main - -import ( - "log" - "net/http" - - "github.com/shurcooL/vfsgen" -) - -func main() { - var fs http.FileSystem = http.Dir("assets") - - err := vfsgen.Generate(fs, vfsgen.Options{ - PackageName: "main", - BuildTags: "vfs", - VariableName: "Assets", - }) - if err != nil { - log.Fatalln(err) - } -} diff --git a/build.sh b/build.sh index 90b773c..c8a7ab2 100755 --- a/build.sh +++ b/build.sh @@ -23,13 +23,10 @@ fi build() { echo "$1 $2 ..." GOOS=$1 GOARCH=$2 go build \ - -tags vfs \ -ldflags "$LDFLAGS" \ -o dist/gohttpserver-${3:-""} } -go generate . - build linux arm linux-arm build darwin amd64 mac-amd64 build linux amd64 linux-amd64 diff --git a/go.mod b/go.mod index 29d2148..d791460 100644 --- a/go.mod +++ b/go.mod @@ -17,11 +17,9 @@ require ( github.com/gorilla/sessions v1.1.3 github.com/pkg/errors v0.8.0 // indirect github.com/shogo82148/androidbinary v0.0.0-20180627093851-01c4bfa8b3b5 - github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371 // indirect - github.com/shurcooL/vfsgen v0.0.0-20181020040650-a97a25d856ca github.com/smartystreets/goconvey v1.6.4 // indirect github.com/stretchr/testify v1.3.0 + golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect golang.org/x/text v0.3.3 - golang.org/x/tools v0.1.0 // indirect howett.net/plist v0.0.0-20201203080718-1454fab16a06 // indirect ) diff --git a/go.sum b/go.sum index 999286b..9f46b00 100644 --- a/go.sum +++ b/go.sum @@ -44,10 +44,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/shogo82148/androidbinary v0.0.0-20180627093851-01c4bfa8b3b5 h1:bXRaUWl3Afe3F9YR5NU1U3UB5zjCHlu4im5p3J/LUYk= github.com/shogo82148/androidbinary v0.0.0-20180627093851-01c4bfa8b3b5/go.mod h1:05AjXWPWLdTIl9+REKhSmTeoJ6Wz5e9ir0Q0NRxCIKo= -github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371 h1:SWV2fHctRpRrp49VXJ6UZja7gU9QLHwRpIPBN89SKEo= -github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= -github.com/shurcooL/vfsgen v0.0.0-20181020040650-a97a25d856ca h1:3fECS8atRjByijiI8yYiuwLwQ2ZxXobW7ua/8GRB3pI= -github.com/shurcooL/vfsgen v0.0.0-20181020040650-a97a25d856ca/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= @@ -55,33 +51,20 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/httpstaticserver.go b/httpstaticserver.go index 618bc1b..79e9159 100644 --- a/httpstaticserver.go +++ b/httpstaticserver.go @@ -142,7 +142,7 @@ func (s *HTTPStaticServer) hIndex(w http.ResponseWriter, r *http.Request) { if r.Method == "HEAD" { return } - renderHTML(w, "index.html", s) + renderHTML(w, "assets/index.html", s) } else { if filepath.Base(path) == YAMLCONF { auth := s.readAccessConf(realPath) @@ -423,7 +423,7 @@ func (s *HTTPStaticServer) hIpaLink(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "text/html") log.Println("PlistURL:", plistUrl) - renderHTML(w, "ipa-install.html", map[string]string{ + renderHTML(w, "assets/ipa-install.html", map[string]string{ "Name": filepath.Base(path), "PlistLink": plistUrl, }) @@ -784,7 +784,7 @@ var ( _tmpls = make(map[string]*template.Template) ) -func executeTemplate(w http.ResponseWriter, name string, v interface{}) { +func renderHTML(w http.ResponseWriter, name string, v interface{}) { if t, ok := _tmpls[name]; ok { t.Execute(w, v) return @@ -794,16 +794,6 @@ func executeTemplate(w http.ResponseWriter, name string, v interface{}) { t.Execute(w, v) } -func renderHTML(w http.ResponseWriter, name string, v interface{}) { - if _, ok := Assets.(http.Dir); ok { - log.Println("Hot load", name) - t := template.Must(template.New(name).Funcs(funcMap).Delims("[[", "]]").Parse(assetsContent(name))) - t.Execute(w, v) - } else { - executeTemplate(w, name, v) - } -} - func checkFilename(name string) error { if strings.ContainsAny(name, "\\/:*<>|") { return errors.New("Name should not contains \\/:*<>|") diff --git a/main.go b/main.go index 28d8991..0b5aea4 100644 --- a/main.go +++ b/main.go @@ -22,7 +22,6 @@ import ( "github.com/goji/httpauth" "github.com/gorilla/handlers" "github.com/gorilla/mux" - _ "github.com/shurcooL/vfsgen" ) type Configure struct { @@ -224,7 +223,7 @@ func main() { }) } - router.PathPrefix("/-/assets/").Handler(http.StripPrefix(gcfg.Prefix+"/-/assets/", http.FileServer(Assets))) + router.PathPrefix("/-/assets/").Handler(http.StripPrefix(gcfg.Prefix+"/-/", http.FileServer(Assets))) router.HandleFunc("/-/sysinfo", func(w http.ResponseWriter, r *http.Request) { data, _ := json.Marshal(map[string]interface{}{ "version": VERSION,