From e4fd32b04c1e3852bfd9a18e3afa5c1aea1ef9ea Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 7 May 2024 14:35:44 +0200
Subject: refactor: extract templating into own file

---
 internal/server/server.go    | 69 -------------------------------------
 internal/server/templates.go | 81 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 69 deletions(-)
 create mode 100644 internal/server/templates.go

(limited to 'internal')

diff --git a/internal/server/server.go b/internal/server/server.go
index db93092..b6270ef 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"html"
 	"html/template"
 	"io"
 	"log"
@@ -13,9 +12,7 @@ import (
 	"net/http"
 	"os"
 	"path"
-	"path/filepath"
 	"slices"
-	"strings"
 	"time"
 
 	cfg "searchix/internal/config"
@@ -26,8 +23,6 @@ import (
 	"github.com/osdevisnot/sorvor/pkg/livereload"
 	"github.com/pkg/errors"
 	"github.com/shengyanli1982/law"
-	"github.com/yuin/goldmark"
-	"github.com/yuin/goldmark/extension"
 )
 
 var config *cfg.Config
@@ -70,75 +65,11 @@ type OptionResultData struct {
 	Results options.NixOptions
 }
 
-type TemplateCollection map[string]*template.Template
-
 func applyDevModeOverrides(config *cfg.Config) {
 	config.CSP.ScriptSrc = slices.Insert(config.CSP.ScriptSrc, 0, "'unsafe-inline'")
 	config.CSP.ConnectSrc = slices.Insert(config.CSP.ConnectSrc, 0, "'self'")
 }
 
-var md = goldmark.New(
-	goldmark.WithExtensions(extension.NewLinkify()),
-)
-var templateFuncs = template.FuncMap{
-	"markdown": func(input options.Markdown) template.HTML {
-		var out strings.Builder
-		err := md.Convert([]byte(input), &out)
-		if err != nil {
-			slog.Warn(fmt.Sprintf("markdown conversion failed: %v", err))
-
-			return template.HTML(html.EscapeString(err.Error())) // #nosec G203 -- duh?
-		}
-
-		return template.HTML(out.String()) // #nosec G203
-	},
-}
-
-func loadTemplate(filename string) (*template.Template, error) {
-	text, err := os.ReadFile(filename)
-	if err != nil {
-		return nil, errors.WithMessage(err, "could not read template")
-	}
-	name, _ := strings.CutSuffix(path.Base(filename), ".gotmpl")
-	tpl := template.New(name)
-	tpl.Funcs(templateFuncs)
-	_, err = tpl.Parse(string(text))
-	if err != nil {
-		return nil, errors.WithMessage(err, "could not parse template")
-	}
-
-	return tpl, nil
-}
-
-func loadTemplates() (TemplateCollection, error) {
-	templateDir := path.Join("frontend", "templates")
-	templates := make(TemplateCollection, 0)
-
-	index, err := loadTemplate(path.Join(templateDir, "index.gotmpl"))
-	if err != nil {
-		return nil, err
-	}
-	templates["index"] = index
-
-	templatePaths, err := filepath.Glob(path.Join(templateDir, "blocks", "*.gotmpl"))
-	if err != nil {
-		return nil, errors.WithMessage(err, "could not glob block templates")
-	}
-	for _, fullname := range templatePaths {
-		tpl, err := loadTemplate(fullname)
-		if err != nil {
-			return nil, err
-		}
-		_, err = tpl.AddParseTree("index", index.Tree)
-		if err != nil {
-			return nil, errors.WithMessage(err, "could not add index template")
-		}
-		templates[tpl.Name()] = tpl
-	}
-
-	return templates, nil
-}
-
 func New(runtimeConfig *Config) (*Server, error) {
 	var err error
 	config, err = cfg.GetConfig()
diff --git a/internal/server/templates.go b/internal/server/templates.go
new file mode 100644
index 0000000..0b39729
--- /dev/null
+++ b/internal/server/templates.go
@@ -0,0 +1,81 @@
+package server
+
+import (
+	"fmt"
+	"html"
+	"html/template"
+	"log/slog"
+	"os"
+	"path"
+	"path/filepath"
+	"searchix/internal/options"
+	"strings"
+
+	"github.com/pkg/errors"
+	"github.com/yuin/goldmark"
+	"github.com/yuin/goldmark/extension"
+)
+
+type TemplateCollection map[string]*template.Template
+
+var md = goldmark.New(
+	goldmark.WithExtensions(extension.NewLinkify()),
+)
+var templateFuncs = template.FuncMap{
+	"markdown": func(input options.Markdown) template.HTML {
+		var out strings.Builder
+		err := md.Convert([]byte(input), &out)
+		if err != nil {
+			slog.Warn(fmt.Sprintf("markdown conversion failed: %v", err))
+
+			return template.HTML(html.EscapeString(err.Error())) // #nosec G203 -- duh?
+		}
+
+		return template.HTML(out.String()) // #nosec G203
+	},
+}
+
+func loadTemplate(filename string) (*template.Template, error) {
+	text, err := os.ReadFile(filename)
+	if err != nil {
+		return nil, errors.WithMessage(err, "could not read template")
+	}
+	name, _ := strings.CutSuffix(path.Base(filename), ".gotmpl")
+	tpl := template.New(name)
+	tpl.Funcs(templateFuncs)
+	_, err = tpl.Parse(string(text))
+	if err != nil {
+		return nil, errors.WithMessage(err, "could not parse template")
+	}
+
+	return tpl, nil
+}
+
+func loadTemplates() (TemplateCollection, error) {
+	templateDir := path.Join("frontend", "templates")
+	templates := make(TemplateCollection, 0)
+
+	index, err := loadTemplate(path.Join(templateDir, "index.gotmpl"))
+	if err != nil {
+		return nil, err
+	}
+	templates["index"] = index
+
+	templatePaths, err := filepath.Glob(path.Join(templateDir, "blocks", "*.gotmpl"))
+	if err != nil {
+		return nil, errors.WithMessage(err, "could not glob block templates")
+	}
+	for _, fullname := range templatePaths {
+		tpl, err := loadTemplate(fullname)
+		if err != nil {
+			return nil, err
+		}
+		_, err = tpl.AddParseTree("index", index.Tree)
+		if err != nil {
+			return nil, errors.WithMessage(err, "could not add index template")
+		}
+		templates[tpl.Name()] = tpl
+	}
+
+	return templates, nil
+}
-- 
cgit 1.4.1