MVP upload working

Author: fileformat

cmd/server/server.go

@@ -24,12 +24,12 @@ func main() {
 	http.HandleFunc("/images/", ui.StaticHandler.ServeHTTP)
 	http.HandleFunc("/{$}", func(w http.ResponseWriter, r *http.Request) { http.Redirect(w, r, "/index.html", http.StatusSeeOther) })
 	http.HandleFunc("/index.html", func(w http.ResponseWriter, r *http.Request) { ui.RunTemplate(w, r, "index.tmpl", nil) })
-	http.HandleFunc("GET /upload.html", func(w http.ResponseWriter, r *http.Request) { ui.RunTemplate(w, r, "upload.tmpl", nil) })
-	http.HandleFunc("POST /upload.html", uploadHandler)
+	http.HandleFunc("GET /upload.html", uploadGetHandler)
+	http.HandleFunc("POST /upload.html", uploadPostHandler)
 	http.HandleFunc("GET /url.html", func(w http.ResponseWriter, r *http.Request) { ui.RunTemplate(w, r, "url.tmpl", nil) })
-	http.HandleFunc("POST /url.html", uploadHandler)
+	http.HandleFunc("POST /url.html", uploadGetHandler)
 	http.HandleFunc("GET /clipboard.html", func(w http.ResponseWriter, r *http.Request) { ui.RunTemplate(w, r, "clipboard.tmpl", nil) })
-	http.HandleFunc("POST /clipboard.html", uploadHandler)
+	http.HandleFunc("POST /clipboard.html", uploadGetHandler)
 
 	err := http.ListenAndServe(listenAddress+":"+strconv.Itoa(listenPort), nil)
 	if err != nil {

cmd/server/uploadHandler.go

@@ -1,48 +1,59 @@
 package main
 
 import (
-	"fmt"
 	"net/http"
 
 	"github.com/FileFormatInfo/svgan/internal/common"
 	svgan "github.com/FileFormatInfo/svgan/lib"
+	"github.com/FileFormatInfo/svgan/ui"
 )
 
-func uploadHandler(w http.ResponseWriter, r *http.Request) {
+func uploadHandler(w http.ResponseWriter, r *http.Request, e error) {
+	ui.RunTemplate(w, r, "upload.tmpl", map[string]interface{}{
+		"Err":   e,
+		"Title": "SVG File Upload",
+	})
+}
+
+func uploadGetHandler(w http.ResponseWriter, r *http.Request) {
+	uploadHandler(w, r, nil)
+}
+
+func uploadPostHandler(w http.ResponseWriter, r *http.Request) {
 
 	// max = 10 MB
 	parseErr := r.ParseMultipartForm(10 << 20)
 	if parseErr != nil {
-		http.Error(w, fmt.Sprintf("Unable to parse form data (%v)\n", parseErr), http.StatusBadRequest)
+		uploadHandler(w, r, parseErr)
 		return
 	}
 
 	file, handler, fileErr := r.FormFile("file")
 	if fileErr != nil {
-		http.Error(w, fmt.Sprintf("Unable to get file from form (%v)\n", fileErr), http.StatusBadRequest)
+		uploadHandler(w, r, fileErr)
 		return
 	}
-
-	w.Header().Set("Content-Type", "text/plain; charset=utf-8")
 	defer file.Close()
 
-	fmt.Fprintf(w, "File: %+v\n", handler.Filename)
-	fmt.Fprintf(w, "Size: %+v\n", handler.Size)
-	fmt.Fprintf(w, "MIME: %+v\n", handler.Header.Get("Content-Type"))
-
 	// seems wasteful, but handler.content is private...
 	raw := make([]byte, handler.Size)
 	_, readErr := file.Read(raw)
 	if readErr != nil {
-		fmt.Fprintf(w, "ERROR: Reading the File (%v)\n", readErr)
+		uploadHandler(w, r, readErr)
 		return
 	}
 
 	svgInfo, svgErr := svgan.SvgCheck(common.Logger, raw)
 	if svgErr != nil {
-		fmt.Fprintf(w, "ERROR: Parsing the SVG (%v)\n", svgErr)
+		uploadHandler(w, r, svgErr)
 		return
 	}
 
-	fmt.Fprintf(w, "INFO: %+v\n", svgInfo)
+	ui.RunTemplate(w, r, "_results.tmpl", map[string]interface{}{
+		"filename": handler.Filename,
+		"size":     handler.Size,
+		"mime":     handler.Header.Get("Content-Type"),
+		"data":     svgInfo,
+		"Title":    "SVG Analysis Results",
+	})
 }

ui/templates.go

@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"strings"
 
+	"encoding/json"
+
 	"github.com/FileFormatInfo/svgan/internal/common"
 )
 
@@ -39,6 +41,20 @@ func initTemplates() map[string]TemplateFunc {
 			}
 			return result
 		},
+		"toJson": func(data any) string {
+			jsonStr, jsonErr := json.MarshalIndent(data, "", "    ")
+			if jsonErr != nil {
+				return jsonErr.Error()
+			}
+			return string(jsonStr)
+		},
+		"toString": func(data any) any {
+			if data == nil {
+				return template.HTML("<i>(not set)</i>")
+			}
+
+			return data.(string)
+		},
 	}
 
 	theCache := make(map[string]TemplateFunc)
@@ -111,7 +127,7 @@ type CrumbtrailEntry struct {
 	URL  string
 }
 
-func makeCrumbtrail(r *http.Request) []CrumbtrailEntry {
+func makeCrumbtrail(r *http.Request, data TemplateData) []CrumbtrailEntry {
 	crumbtrail := []CrumbtrailEntry{}
 
 	// Add additional entries based on the request path
@@ -125,6 +141,10 @@ func makeCrumbtrail(r *http.Request) []CrumbtrailEntry {
 		crumbtrail = append(crumbtrail, entry)
 	}
 
+	if data["Title"] != nil {
+		crumbtrail[len(crumbtrail)-1].Text = data["Title"].(string)
+	}
+
 	return crumbtrail
 }
 
@@ -138,7 +158,7 @@ func RunTemplate(w http.ResponseWriter, r *http.Request, templateName string, da
 	if data == nil {
 		data = make(map[string]any)
 	}
-	data["crumbtrail"] = makeCrumbtrail(r)
+	data["crumbtrail"] = makeCrumbtrail(r, data)
 
 	result, execErr := fn(data)
 	if execErr != nil {

ui/views/_results.tmpl

@@ -1,5 +1,33 @@
 {{template "above" .}}
 
-<p>Results go here</p>
+
+<table class="table table-bordered table-striped w-auto">
+    <tbody>
+        <tr>
+            <td>width</td>
+            <td>{{toString .data.SvgWidth}}</td>
+        </tr>
+        <tr>
+            <td>height</td>
+            <td>{{toString .data.SvgHeight}}</td>
+        </tr>
+        <tr>
+            <td>viewbox</td>
+            <td>{{toString .data.ViewBox}}</td>
+        </tr>
+        <tr>
+            <td>colors</td>
+            <td>
+                {{range .data.Colors}}
+                <span style="height: 2em; width: 7em; display: inline-block; background-color: {{.}}; border: 1px solid #a2a2a2; border-radius: 4px; vertical-align: middle; margin-left: 10px;"></span> {{.}}<br>
+                {{end}}
+            </td>
+    </tbody>
+</table>
+
+<details>
+    <summary>Raw details</summary>
+    <pre>{{toJson .data}}</pre>
+</details>
 
 {{template "below" .}}