Improve vfsgen to not unzip bindata files but send to browser directly

modules/public/dynamic.go

@@ -6,9 +6,18 @@
 
 package public
 
-import "net/http"
+import (
+	"io"
+	"net/http"
+	"time"
+)
 
 // Static implements the macaron static handler for serving assets.
 func Static(opts *Options) func(next http.Handler) http.Handler {
 	return opts.staticHandler(opts.Directory)
 }
+
+// ServeContent serve http content
+func ServeContent(w http.ResponseWriter, req *http.Request, name string, modtime time.Time, content io.ReadSeeker) {
+	http.ServeContent(w, req, name, modtime, content)
+}

modules/public/public.go

@@ -87,6 +87,16 @@ func (opts *Options) staticHandler(dir string) func(next http.Handler) http.Hand
 	}
 }
 
+// parseAcceptEncoding parse Accept-Encoding: deflate, gzip;q=1.0, *;q=0.5 as compress methods
+func parseAcceptEncoding(val string) map[string]bool {
+	parts := strings.Split(val, ";")
+	var types = make(map[string]bool)
+	for _, v := range strings.Split(parts[0], ",") {
+		types[v] = true
+	}
+	return types
+}
+
 func (opts *Options) handle(w http.ResponseWriter, req *http.Request, opt *Options) bool {
 	if req.Method != "GET" && req.Method != "HEAD" {
 		return false
@@ -157,6 +167,6 @@ func (opts *Options) handle(w http.ResponseWriter, req *http.Request, opt *Optio
 		return true
 	}
 
-	http.ServeContent(w, req, file, fi.ModTime(), f)
+	ServeContent(w, req, file, fi.ModTime(), f)
 	return true
 }

modules/public/static.go

@@ -7,8 +7,14 @@
 package public
 
 import (
+	"compress/gzip"
+	"io"
 	"io/ioutil"
+	"log"
+	"mime"
 	"net/http"
+	"path/filepath"
+	"time"
 )
 
 // Static implements the macaron static handler for serving assets.
@@ -49,3 +55,32 @@ func AssetIsDir(name string) (bool, error) {
 		}
 	}
 }
+
+// ServeContent serve http content
+func ServeContent(w http.ResponseWriter, req *http.Request, name string, modtime time.Time, content io.ReadSeeker) {
+	encodings := parseAcceptEncoding(req.Header.Get("Accept-Encoding"))
+	if encodings["gzip"] {
+		if rd, ok := f.(*vfsgen۰CompressedFile); ok {
+			w.Header().Set("Content-Encoding", "gzip")
+			ctype := mime.TypeByExtension(filepath.Ext(fi.Name()))
+			if ctype == "" {
+				// read a chunk to decide between utf-8 text and binary
+				var buf [512]byte
+				grd, _ := gzip.NewReader(rd)
+				n, _ := io.ReadFull(grd, buf[:])
+				ctype = http.DetectContentType(buf[:n])
+				_, err := rd.Seek(0, io.SeekStart) // rewind to output whole file
+				if err != nil {
+					log.Printf("rd.Seek error: %v\n", err)
+					return false
+				}
+			}
+			w.Header().Set("Content-Type", ctype)
+			http.ServeContent(w, req, file, fi.ModTime(), rd)
+			return true
+		}
+	}
+
+	http.ServeContent(w, req, file, fi.ModTime(), f)
+	return true
+}