Working with moved files

Author: fileformat

README.md

@@ -1,4 +1,4 @@
-# SVG Analyzer [<img alt="Logo for SVGan" src="cmd/server/static/favicon.svg" height="96" align="right"/>](https://svgan.fileformat.info/)
+# SVG Analyzer [<img alt="Logo for SVGan" src="ui/static/favicon.svg" height="96" align="right"/>](https://svgan.fileformat.info/)
 
 [![deploy](https://github.com/FileFormatInfo/svgan/actions/workflows/gcr-deploy.yaml/badge.svg)](https://github.com/FileFormatInfo/svgan/actions/workflows/gcr-deploy.yaml)
 

cmd/server/server.go

@@ -4,6 +4,8 @@ import (
 	"net/http"
 	"os"
 	"strconv"
+
+	"github.com/FileFormatInfo/svgan/ui"
 )
 
 func main() {
@@ -15,11 +17,11 @@ func main() {
 	var listenAddress = os.Getenv("ADDRESS")
 
 	http.HandleFunc("/status.json", statusHandler)
-	http.HandleFunc("/robots.txt", staticHandler.ServeHTTP)
-	http.HandleFunc("/favicon.ico", staticHandler.ServeHTTP)
-	http.HandleFunc("/favicon.svg", staticHandler.ServeHTTP)
-	http.HandleFunc("/images/", staticHandler.ServeHTTP)
-	http.HandleFunc("GET /{$}", staticHandler.ServeHTTP)
+	http.HandleFunc("/robots.txt", ui.StaticHandler.ServeHTTP)
+	http.HandleFunc("/favicon.ico", ui.StaticHandler.ServeHTTP)
+	http.HandleFunc("/favicon.svg", ui.StaticHandler.ServeHTTP)
+	http.HandleFunc("/images/", ui.StaticHandler.ServeHTTP)
+	http.HandleFunc("GET /{$}", ui.StaticHandler.ServeHTTP)
 	http.HandleFunc("POST /{$}", uploadHandler)
 
 	err := http.ListenAndServe(listenAddress+":"+strconv.Itoa(listenPort), nil)

ui/staticHandler.go

@@ -1,4 +1,4 @@
-package main
+package ui
 
 import (
 	"embed"
@@ -8,15 +8,22 @@ import (
 
 //go:embed static
 var embeddedFiles embed.FS
-var staticHandler = initStaticHandler()
+var StaticHandler http.Handler
 
-func initStaticHandler() http.Handler {
+func initStaticHandler() (http.Handler, error) {
 
 	fsys, err := fs.Sub(embeddedFiles, "static")
 	if err != nil {
-		logger.Error("unable to create static file system", "error", err)
-		panic(err)
+		return nil, err
 	}
 
-	return http.FileServer(http.FS(fsys))
+	return http.FileServer(http.FS(fsys)), nil
+}
+
+func init() {
+	var err error
+	StaticHandler, err = initStaticHandler()
+	if err != nil {
+		panic(err)
+	}
 }