URL handler working

Author: fileformat

cmd/server/server.go

@@ -26,8 +26,8 @@ func main() {
 	http.HandleFunc("/index.html", func(w http.ResponseWriter, r *http.Request) { ui.RunTemplate(w, r, "index.tmpl", nil) })
 	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", uploadGetHandler)
+	http.HandleFunc("GET /url.html", urlGetHandler)
+	http.HandleFunc("POST /url.html", urlPostHandler)
 	http.HandleFunc("GET /clipboard.html", func(w http.ResponseWriter, r *http.Request) { ui.RunTemplate(w, r, "clipboard.tmpl", nil) })
 	http.HandleFunc("POST /clipboard.html", uploadGetHandler)
 

cmd/server/uploadHandler.go

@@ -50,10 +50,10 @@ func uploadPostHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	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",
+		"source": handler.Filename,
+		"size":   handler.Size,
+		"mime":   handler.Header.Get("Content-Type"),
+		"data":   svgInfo,
+		"Title":  "SVG Analysis Results",
 	})
 }

cmd/server/urlHandler.go

@@ -0,0 +1,63 @@
+package main
+
+import (
+	"errors"
+	"io"
+	"net/http"
+
+	"github.com/FileFormatInfo/svgan/internal/common"
+	svgan "github.com/FileFormatInfo/svgan/lib"
+	"github.com/FileFormatInfo/svgan/ui"
+)
+
+func urlHandler(w http.ResponseWriter, r *http.Request, e error) {
+	ui.RunTemplate(w, r, "url.tmpl", map[string]interface{}{
+		"Err":   e,
+		"Title": "URL Analysis",
+	})
+}
+
+func urlGetHandler(w http.ResponseWriter, r *http.Request) {
+	urlHandler(w, r, nil)
+}
+
+func urlPostHandler(w http.ResponseWriter, r *http.Request) {
+
+	url := r.FormValue("url")
+	if url == "" {
+		urlHandler(w, r, errors.New("no URL provided"))
+		return
+	}
+
+	resp, err := http.Get(url)
+	if err != nil {
+		urlHandler(w, r, err)
+		return
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		urlHandler(w, r, errors.New("failed to fetch URL"))
+		return
+	}
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		urlHandler(w, r, err)
+		return
+	}
+
+	svgInfo, svgErr := svgan.SvgCheck(common.Logger, body)
+	if svgErr != nil {
+		urlHandler(w, r, svgErr)
+		return
+	}
+
+	ui.RunTemplate(w, r, "_results.tmpl", map[string]interface{}{
+		"source": url,
+		"size":   len(body),
+		"mime":   resp.Header.Get("Content-Type"),
+		"data":   svgInfo,
+		"Title":  "URL Analysis Results",
+	})
+}

ui/views/_results.tmpl

@@ -3,6 +3,18 @@
 
 <table class="table table-bordered table-striped w-auto">
     <tbody>
+        <tr>
+            <td>Source</td>
+            <td>{{toString .source}}</td>
+        </tr>
+        <tr>
+            <td>Size</td>
+            <td>{{.size}}</td>
+        </tr>
+        <tr>
+            <td>Content-Type</td>
+            <td>{{toString .mime}}</td>
+        </tr>
         <tr>
             <td>width</td>
             <td>{{toString .data.SvgWidth}}</td>

ui/views/url.tmpl

@@ -14,8 +14,8 @@
 
 <form class="pt-3" method="post" action="url.html" enctype="multipart/form-data">
 	<div class="mb-3">
-		<label class="form-label" for="svgurl">SVG URL</label>
-		<input class="form-control" name="svgurl" value="" />
+		<label class="form-label" for="url">SVG URL</label>
+		<input class="form-control" name="url" value="" />
 	</div>
 	<input class="btn btn-primary" id="submit" type="submit" value="Upload" />
 	<a class="btn btn-outline-primary" href="index.html">Cancel</a>