build, cmd/strelaypoolsrv: Build assets using standard script

build.go

@@ -563,16 +563,17 @@ func listFiles(dir string) []string {
 
 func rebuildAssets() {
 	runPipe("lib/auto/gui.files.go", "go", "run", "script/genassets.go", "gui")
+	runPipe("cmd/strelaypoolsrv/auto/gui.go", "go", "run", "script/genassets.go", "cmd/strelaypoolsrv/gui")
 }
 
 func lazyRebuildAssets() {
-	if shouldRebuildAssets() {
+	if shouldRebuildAssets("lib/auto/gui.files.go", "gui") || shouldRebuildAssets("cmd/strelaypoolsrv/auto/gui.go", "cmd/strelaypoolsrv/auto/gui") {
 		rebuildAssets()
 	}
 }
 
-func shouldRebuildAssets() bool {
-	info, err := os.Stat("lib/auto/gui.files.go")
+func shouldRebuildAssets(target, srcdir string) bool {
+	info, err := os.Stat(target)
 	if err != nil {
 		// If the file doesn't exist, we must rebuild it
 		return true
@@ -582,7 +583,7 @@ func shouldRebuildAssets() bool {
 	// so we should rebuild it.
 	currentBuild := info.ModTime()
 	assetsAreNewer := false
-	filepath.Walk("gui", func(path string, info os.FileInfo, err error) error {
+	filepath.Walk(srcdir, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}

cmd/strelaypoolsrv/auto/.gitignore

@@ -0,0 +1 @@
+gui.go

cmd/strelaypoolsrv/auto/gui.go

@@ -1,16 +0,0 @@
-package auto
-
-import (
-	"encoding/base64"
-)
-
-const (
-	AssetsBuildDate = "Thu, 14 Apr 2016 21:31:07 GMT"
-)
-
-func Assets() map[string][]byte {
-	var assets = make(map[string][]byte, 1)
-
-	assets["index.html"], _ = base64.StdEncoding.DecodeString("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 truncated
-	return assets
-}

cmd/strelaypoolsrv/main.go

@@ -194,11 +194,6 @@ func handleAssets(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if r.Header.Get("If-Modified-Since") == auto.AssetsBuildDate {
-		w.WriteHeader(http.StatusNotModified)
-		return
-	}
-
 	mtype := mimeTypeForFile(path)
 	if len(mtype) != 0 {
 		w.Header().Set("Content-Type", mtype)
@@ -214,8 +209,6 @@ func handleAssets(w http.ResponseWriter, r *http.Request) {
 		gr.Close()
 	}
 	w.Header().Set("Content-Length", fmt.Sprintf("%d", len(bs)))
-	w.Header().Set("Last-Modified", auto.AssetsBuildDate)
-	w.Header().Set("Cache-Control", "public")
 
 	w.Write(bs)
 }