Use embed instead of nrsc, enables 'go get'

build.sh

@@ -14,11 +14,11 @@ if [[ $fast != yes ]] ; then
 fi
 
 if [[ -z $1 ]] ; then
-	go build -ldflags "-X main.Version $version" \
-	&& nrsc syncthing gui
+	go build -ldflags "-X main.Version $version"
+elif [[ $1 == "embed" ]] ; then
+	embedder main gui > gui.files.go
 elif [[ $1 == "tar" ]] ; then
 	go build -ldflags "-X main.Version $version" \
-	&& nrsc syncthing gui \
 	&& mkdir syncthing-dist \
 	&& cp syncthing README.md LICENSE syncthing-dist \
 	&& tar zcvf syncthing-dist.tar.gz syncthing-dist \
@@ -34,7 +34,6 @@ elif [[ $1 == "all" ]] ; then
 			export GOARCH="$goarch"
 			export name="syncthing-$goos-$goarch"
 			go build -ldflags "-X main.Version $version" \
-				&& nrsc syncthing gui \
 				&& mkdir -p "$name" \
 				&& cp syncthing "$buildDir/$name" \
 				&& cp README.md LICENSE "$name" \
@@ -53,7 +52,6 @@ elif [[ $1 == "all" ]] ; then
 				export GOARCH="$goarch"
 				export name="syncthing-$goos-${goarch}v$goarm"
 				go build -ldflags "-X main.Version $version" \
-					&& nrsc syncthing gui \
 					&& mkdir -p "$name" \
 					&& cp syncthing "$buildDir/$name" \
 					&& cp README.md LICENSE "$name" \

gui.files.go

@@ -0,0 +1,6 @@
+
+package main
+
+import "github.com/cratonica/embed"
+
+var Resources embed.PackedResourceMap = embed.PackedResourceMap{0x1f, 0x8b, 0x8, 0x0, 0x0, 0x9, 0x6e, 0x88, 0x2, 0xff, 0xec, 0xbd, 0x7b, 0x73, 0x1b, 0x49, 0xb6, 0x27, 0xd6, 0x3d, 0x7b, 0x6d, 0xcf, 0xc0, 0x11, 0xeb, 0x71, 0x84, 0x23, 0x76, 0xfd, 0x1f, 0x58, 0x97, 0x8b, 0xae, 0x6a, 0x24, 0x41, 0x52, 0xdd, 0x77, 0x1e, 0x55, 0x2c, 0x61, 0x28, 0x8a, 0x7a, 0xb5, 0x28, 0xa9, 0x45, 0x4a, 0xfd, 0x0, 0xd1, 0xbd, 0x59, 0xf, 0x3c, 0x1a, 0x4f, 0xe1, 0x41, 0x89, 0x22, 0x11, 0xb1, 0xff, 0x38, 0x62, 0xfd, 0xfa, 0x1c, 0xe, 0xfb, 0x13, 0x39, 0xc2, 0x5f, 0xc6, 0xe7, 0x77, 0xf2, 0x51, 0x59, 0x0, 0xa8, 0x99, 0xb9, 0x7b, 0x63, 0xc3, 0xeb, 0x68, 0xf6, 0x8c, 0x50, 0x95, 0x95, 0x95, 0x99, 0x95, 0x79, 0xf2, 0xe4, 0x79, 0x9f, 0xdf, 0x7d, 0xf6, 0xd9, 0x67, 0x8d, 0x87, 0xe7, 0x3f, 0x9f, 0x2f, 0x26, 0xb3, 0xfc, 0x1f, 0xfe, 0xed, 0x67, 0xf8, 0xfb, 0xfc, 0xc1, 0x32, 0x3b, 0xfc, 0xec, 0xb3, 0xdf, 0xd3, 0xe5, 0x6f, 0x3f, 0x53, 0xbf, 0xbf, 0xf9, 0xdd, 0x67, 0x5b, 0xff, 0x7e, 0xab, 0xff, 0xbf, 0xf1, 0xf7, 0x1b, 0xfd, 0xfb, 0xaf, 0xd0, 0x1e, 0xb7, 0x31, 0xff, 0x6c, 0xf1, 0xd9, 0xec, 0x33, 0xf9, 0xd9, 0x34, 0x79, 0xff, 0xd9, 0xaf, 0x7f, 0xff, 0x25, 0xfc, 0x61, 0xed, 0x7e, 0xf7, 0x59, 0xf2, 0xd9, 0x84, 0xfe, 0x5b, 0xb8, 0xeb, 0x37, 0x9f, 0x26, 0xc3, 0x49, 0x42, 0x4f, 0xff, 0x9f, 0x64, 0x3a, 0xec, 0xcf, 0x17, 0x7, 0x7, 0xff, 0xf7, 0xe7, 0xbf, 0xf9, 0x57, 0xff, 0xf0, 0x5f, 0xfd, 0xd7, 0xff, 0xcd, 0x6f, 0x7f, 0x57, 0xa1, 0xff, 0xfe, 0xf5, 0x7f, 0xf7, 0xbb, 0xf6, 0x79, 0x6f, 0xf2, 0xfe, 0x7c, 0x21, 0x17, 0xcb, 0xf9, 0x3, 0x39, 0x6b, 0xe1, 0xee, 0x95, 0x5c, 0xf4, 0x12, 0x7d, 0x7d, 0x31, 0x99, 0xc, 0xed, 0xb5, 0x4c, 0xde, 0xf6, 0xf3, 0xf7, 0x3f, 0xff, 0xfe, 0x7f, 0x38, 0x99, 0x8c, 0x17, 0xb2, 0x3f, 0xce, 0x67, 0xfc, 0x72, 0x3f, 0xcb, 0xa9, 0xca, 0xe5, 0x77, 0xfd, 0x71, 0x36, 0x79, 0xff, 0x60, 0xb2, 0x1c, 0x67, 0xf3, 0x4b, 0x5d, 0xf8, 0x5d, 0x3f, 0x5b, 0xf4, 0x5a, 0x4e, 0xad, 0xdf, 0xfd, 0x96, 0xfe, 0xfb, 0xf9, 0xf7, 0xff, 0xe6, 0xe6, 0xe6, 0xeb, 0x3f, 0x8b, 0xea, 0x57, 0x87, 0xf7, 0x56, 0xa2, 0x7a, 0xf3, 0xc7, 0x3f, 0x1e, 0x88, 0xea, 0xd7, 0x7f, 0x38, 0x58, 0xad, 0x7e, 0xff, 0x3f, 0xfd, 0xee, 0xb7, 0xff, 0xe3, 0x17, 0x5f, 0x35, 0xbf, 0x49, 0x26, 0xb7, 0xff, 0xf1, 0x7f, 0xfe, 0x5f, 0xfe, 0xd7, 0xff, 0xed, 0x7f, 0xff, 0x3f, 0xfe, 0x4f, 0xf5, 0x8d, 0x9f, 0x7f, 0xae, 0x3f, 0xf6, 0xbf, 0x5f, 0xfb, 0xf8, 0xff, 0x6b, 0xfb, 0xc7, 0x67, 0xf3, 0x74, 0x98, 0xd0, 0xe0, 0x3f, 0xdf, 0xfe, 0xf8, 0xea, 0x7c, 0x36, 0x1e, 0x4e, 0xc6, 0x5d, 0x5, 0xf5, 0xbf, 0xfe, 0xfd, 0xfa, 0xf7, 0xeb, 0xdf, 0xaf, 0x7f, 0xff, 0x5, 0xfe, 0x69, 0xec, 0xf5, 0xdb, 0xff, 0xf6, 0xd7, 0xa9, 0xf8, 0xf5, 0xef, 0xd7, 0xbf, 0x5f, 0xff, 0xb6, 0xe0, 0x87, 0xaa, 0xfe, 0xfd, 0x8b, 0xfe, 0xfd, 0xf, 0xea, 0xf7, 0x73, 0xfd, 0xfc, 0x37, 0xfa, 0xf7, 0x1f, 0x9c, 0x77, 0x7e, 0xaf, 0x7f, 0xab, 0xfa, 0xf7, 0x2f, 0xfa, 0xf7, 0x3f, 0xa8, 0xdf, 0xcf, 0x75, 0xbd, 0xdf, 0xe8, 0xdf, 0x7f, 0xd0, 0xbf, 0xbf, 0xd5, 0xbf, 0xbf, 0xd7, 0xbf, 0x55, 0xfd, 0xfb, 0x17, 0xfd, 0xfb, 0x1f, 0x4a, 0xb4, 0xdc, 0xe7, 0x9a, 0xf9, 0xf8, 0x5c, 0xf7, 0xfc, 0xb9, 0xe6, 0x50, 0x3e, 0xff, 0xbd, 0xfe, 0xad, 0xea, 0xdf, 0xbf, 0xfc, 0xba, 0x8e, 0xbf, 0xfe, 0xfd, 0xfa, 0x77, 0x17, 0xef, 0x7, 0xde, 0x1f, 0xe7, 0xff, 0xe9, 0xdd, 0xfc, 0xff, 0xaf, 0x7f, 0xbf, 0xfe, 0xfd, 0xfa, 0xf7, 0xff, 0xe7, 0x73, 0xfe, 0x1f, 0x1e, 0x9e, 0x3f, 0x7c, 0xf0, 0xd9, 0xdd, 0xe2, 0x8c, 0xdf, 0x68, 0x42, 0xe0, 0xdf, 0x3b, 0x84, 0x81, 0x4b, 0x8, 0xb8, 0x44, 0xc0, 0x6f, 0x94, 0xb0, 0xf0, 0xdf, 0x3a, 0xe5, 0xbf, 0x12, 0x2, 0xbf, 0xfe, 0xfd, 0xfa, 0xf7, 0xff, 0xb1, 0xbf, 0x7f, 0x4d, 0xff, 0x97, 0xe3, 0xee, 0x72, 0x28, 0x67, 0x8d, 0x51, 0x7f, 0xdc, 0xf8, 0x65, 0xfe, 0x6f, 0xfe, 0xe3, 0xe7, 0x9f, 0xed, 0x7f, 0x59, 0xa9, 0x1e, 0xab, 0xd2, 0x67, 0xe7, 0xd5, 0xab, 0xc3, 0xc6, 0xbd, 0xc6, 0x1f, 0x2b, 0x55, 0x3f, 0xd, 0xaa, 0xf7, 0xe, 0xe, 0xf, 0xf6, 0xe8, 0x9f, 0xaf, 0xab, 0x8f, 0x27, 0x93, 0xee, 0x30, 0x17, 0xd5, 0xa7, 0xe3, 0xb4, 0x51, 0xed, 0x2d, 0x16, 0xd3, 0x70, 0x7f, 0x5f, 0xb7, 0xf4, 0xcb, 0xbc, 0x31, 0x99, 0x75, 0x2b, 0xd5, 0xe7, 0xfd, 0x34, 0x1f, 0xcf, 0xf3, 0xb0, 0x7a, 0xf6, 0xf4, 0xa2, 0xf2, 0xe5, 0x7e, 0xc5, 0xef, 0x2c, 0xc7, 0xe9, 0xa2, 0x3f, 0x19, 0xfb, 0x3f, 0x8a, 0x6f, 0xc5, 0x2c, 0xb8, 0xf9, 0x62, 0x39, 0xcf, 0xab, 0xf3, 0xc5, 0xac, 0x9f, 0x2e, 0xbe, 0x88, 0xcc, 0xc3, 0xea, 0x23, 0x3f, 0x9, 0x6e, 0x66, 0xf9, 0x62, 0x39, 0x1b, 0x57, 0xed, 0x1b, 0xc1, 0xcd, 0x95, 0x9c, 0x55, 0x65, 0x2c, 0x67, 0xdd, 0xe5, 0x28, 0x1f, 0x2f, 0xe6, 0xad, 0x83, 0xb6, 0x48, 0x85, 0x8c, 0xbd, 0x96, 0x57, 0xf7, 0x93, 0x66, 0x52, 0xf7, 0x42, 0xfa, 0xcf, 0xb, 0xea, 0xb2, 0xee, 0xb5, 0xcd, 0x80, 0xf2, 0xd9, 0x6c, 0x32, 0x9b, 0x37, 0x4a, 0xe3, 0xda, 0xe7, 0xcf, 0xd9, 0x37, 0x6f, 0xed, 0xeb, 0xb7, 0xa2, 0xce, 0x64, 0xe6, 0xa7, 0xf1, 0x61, 0x94, 0x1e, 0xd9, 0x3e, 0x1a, 0xc3, 0x7c, 0xdc, 0x5d, 0xf4, 0xa2, 0xb4, 0x5e, 0xf, 0xa8, 0xeb, 0xba, 0x7f, 0x18, 0xc7, 0x69, 0xd3, 0x6b, 0xd2, 0x2b, 0x35, 0x7a, 0xc7, 0x9b, 0x52, 0x23, 0xe9, 0xde, 0x21, 0x5d, 0xc5, 0x5e, 0x3d, 0x1f, 0xa7, 0x93, 0x2c, 0x7f, 0xf3, 0xfa, 0xe9, 0xc9, 0x64, 0x34, 0x9d, 0x8c, 0xe9, 0x7d, 0xdf, 0x33, 0xc3, 0xf7, 0xe2, 0x78, 0x71,Line truncated

gui.go

@@ -3,17 +3,18 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io"
 	"log"
 	"mime"
 	"net/http"
+	"os"
 	"path/filepath"
 	"runtime"
 	"sync"
+	"time"
 
-	"bitbucket.org/tebeka/nrsc"
 	"github.com/calmh/syncthing/model"
 	"github.com/codegangsta/martini"
+	"github.com/cratonica/embed"
 )
 
 func startGUI(addr string, m *model.Model) {
@@ -26,9 +27,20 @@ func startGUI(addr string, m *model.Model) {
 	router.Get("/rest/need", restGetNeed)
 	router.Get("/rest/system", restGetSystem)
 
+	fs, err := embed.Unpack(Resources)
+	if err != nil {
+		panic(err)
+	}
+
+	var modt time.Time
+	fi, err := os.Stat(os.Args[0])
+	if err != nil {
+		modt = fi.ModTime()
+	}
+
 	go func() {
 		mr := martini.New()
-		mr.Use(nrscStatic("gui"))
+		mr.Use(embeddedStatic(fs, modt.UTC().Format(http.TimeFormat)))
 		mr.Use(martini.Recovery())
 		mr.Action(router.Handle)
 		mr.Map(m)
@@ -124,36 +136,26 @@ func restGetSystem(w http.ResponseWriter) {
 	json.NewEncoder(w).Encode(res)
 }
 
-func nrscStatic(path string) interface{} {
-	if err := nrsc.Initialize(); err != nil {
-		panic("Unable to initialize nrsc: " + err.Error())
-	}
+func embeddedStatic(fs map[string][]byte, modt string) interface{} {
 	return func(res http.ResponseWriter, req *http.Request, log *log.Logger) {
 		file := req.URL.Path
 
-		// nrsc expects there not to be a leading slash
 		if file[0] == '/' {
 			file = file[1:]
 		}
 
-		f := nrsc.Get(file)
-		if f == nil {
+		bs, ok := fs[file]
+		if !ok {
 			return
 		}
 
-		rdr, err := f.Open()
-		if err != nil {
-			http.Error(res, "Internal Server Error", http.StatusInternalServerError)
-		}
-		defer rdr.Close()
-
 		mtype := mime.TypeByExtension(filepath.Ext(req.URL.Path))
 		if len(mtype) != 0 {
 			res.Header().Set("Content-Type", mtype)
 		}
-		res.Header().Set("Content-Size", fmt.Sprintf("%d", f.Size()))
-		res.Header().Set("Last-Modified", f.ModTime().UTC().Format(http.TimeFormat))
+		res.Header().Set("Content-Size", fmt.Sprintf("%d", len(bs)))
+		res.Header().Set("Last-Modified", modt)
 
-		io.Copy(res, rdr)
+		res.Write(bs)
 	}
 }