fix: template from StaticFS

Author: gi8lino

cmd/root.go

@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	version = "v0.0.1"
+	version = "v0.0.4"
 )
 
 var (

cmd/serve.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"os"
 	"strings"
+	"text/template"
 	"vimbin/internal/config"
 	"vimbin/internal/handlers"
 	"vimbin/internal/server"
@@ -48,10 +49,11 @@ var serveCmd = &cobra.Command{
 		}
 
 		// Read the HTML template file
-		htmlTemplate, err := os.ReadFile("web/templates/index.html")
+		htmlTemplate, err := template.ParseFS(server.StaticFS, "web/templates/index.html")
 		if err != nil {
-			panic(err)
+			log.Fatal().Err(err)
 		}
+
 		config.App.HtmlTemplate = htmlTemplate
 
 		// Parse the configuration

internal/config/structs.go

@@ -1,15 +1,18 @@
 package config
 
-import "sync"
+import (
+	"sync"
+	"text/template"
+)
 
 // App is the global configuration instance.
 var App Config
 
 // Config represents the application configuration.
 type Config struct {
-	HtmlTemplate []byte  `yaml:"-"`       // HtmlTemplate contains the HTML template content.
-	Server       Server  `yaml:"server"`  // Server represents the server configuration.
-	Storage      Storage `yaml:"storage"` // Storage represents the storage configuration.
+	HtmlTemplate *template.Template `yaml:"-"`       // HtmlTemplate contains the HTML template content.
+	Server       Server             `yaml:"server"`  // Server represents the server configuration.
+	Storage      Storage            `yaml:"storage"` // Storage represents the storage configuration.
 }
 
 // Web represents the web configuration.

internal/handlers/home.go

@@ -1,7 +1,6 @@
 package handlers
 
 import (
-	"html/template"
 	"net/http"
 	"vimbin/internal/config"
 	"vimbin/internal/server"
@@ -30,14 +29,7 @@ func Home(w http.ResponseWriter, r *http.Request) {
 		Content: config.App.Storage.Content.Get(),
 	}
 
-	tmpl, err := template.New("index").Parse(string(config.App.HtmlTemplate))
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	err = tmpl.Execute(w, page)
-	if err != nil {
+	if err := config.App.HtmlTemplate.Execute(w, page); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 	}
 }