From 7c7764228076ff32d5cb1b4edf05612e488e2fb1 Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Wed, 20 Mar 2019 14:48:32 +0100
Subject: [PATCH] fix: compilation: switched to packr2

---
 .gitignore                    |  3 ++-
 Makefile                      |  5 ++---
 internal/handlers/handlers.go | 25 ++++++++++++++++++++++---
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index e008277..ce65688 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 .glide/
 debug
 debug.test
+main
 
 *.db
 *.lock
@@ -24,7 +25,7 @@ debug.test
 /releases
 /docker_releases
 data
-
+*-packr.go
 /deployments/cloudfoundry
 !/deployments/cloudfoundry/README.md
 !/deployments/cloudfoundry/config.yaml
diff --git a/Makefile b/Makefile
index 1b3f49d..9ed0986 100644
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,11 @@ buildNodeFrontend:
 	cd web && rm build/static/**/*.map
 
 embedFrontend:
-	cd internal/handlers/tmpls && esc -o tmpls.go -pkg tmpls -include ^*\.html .
-	cd internal/handlers && esc -o static.go -pkg handlers -prefix ../../web/build ../../web/build
+	packr2
 
 getCMDDependencies:
 	go get -v github.com/mattn/goveralls
-	go get -v github.com/mjibson/esc
+	go get -v github.com/gobuffalo/packr/v2/packr2
 	go get -v github.com/mitchellh/gox
 
 getGoDependencies:
diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go
index d885c86..3103e8f 100644
--- a/internal/handlers/handlers.go
+++ b/internal/handlers/handlers.go
@@ -2,6 +2,7 @@
 package handlers
 
 import (
+	"fmt"
 	"html/template"
 	"net/http"
 	"time"
@@ -9,7 +10,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/gin-gonic/gin"
-	"github.com/mxschmitt/golang-url-shortener/internal/handlers/tmpls"
+	"github.com/gobuffalo/packr/v2"
 	"github.com/mxschmitt/golang-url-shortener/internal/stores"
 	"github.com/mxschmitt/golang-url-shortener/internal/util"
 	"github.com/pkg/errors"
@@ -30,6 +31,8 @@ type loggerEntryWithFields interface {
 	WithFields(fields logrus.Fields) *logrus.Entry
 }
 
+var templateBox = packr.New("Templates", "./tmpls")
+
 // Ginrus returns a gin.HandlerFunc (middleware) that logs requests using logrus.
 //
 // Requests with errors are logged using logrus.Error().
@@ -111,7 +114,7 @@ func New(store stores.Store) (*Handler, error) {
 func (h *Handler) addTemplatesFromFS(files []string) error {
 	var t *template.Template
 	for _, file := range files {
-		fileContent, err := tmpls.FSString(false, "/"+file)
+		fileContent, err := templateBox.FindString("/" + file)
 		if err != nil {
 			return errors.Wrap(err, "could not read template file")
 		}
@@ -165,6 +168,22 @@ func (h *Handler) setHandlers() error {
 	h.engine.GET("/d/:id/:hash", h.handleDelete)
 	h.engine.GET("/ok", h.handleHealthcheck)
 
+	assetBox := packr.New("Assets", "../../web/build")
+
+	h.engine.GET("/", func(c *gin.Context) {
+		f, err := assetBox.Open("index.html")
+		if err != nil {
+			http.Error(c.Writer, fmt.Sprintf("could not open index.html: %v", err), http.StatusInternalServerError)
+			return
+		}
+		fi, err := f.Stat()
+		if err != nil {
+			http.Error(c.Writer, fmt.Sprintf("could not stat index.html: %v", err), http.StatusInternalServerError)
+			return
+		}
+		http.ServeContent(c.Writer, c.Request, fi.Name(), fi.ModTime(), f)
+	})
+
 	// Handling the shorted URLs, if no one exists, it checks
 	// in the filesystem and sets headers for caching
 	h.engine.NoRoute(
@@ -176,7 +195,7 @@ func (h *Handler) setHandlers() error {
 		},
 		// Pass down to the embedded FS, but let 404s escape via
 		// the interceptHandler.
-		gin.WrapH(interceptHandler(http.FileServer(FS(false)), customErrorHandler)),
+		gin.WrapH(interceptHandler(http.FileServer(assetBox), customErrorHandler)),
 		// not in FS; redirect to root with customURL target filled out
 		func(c *gin.Context) {
 			// if we get to this point we should not let the client cache