From c51ca7c62e08f43ef9974af35886d30ce54a1f22 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 16 May 2024 20:22:42 +0200
Subject: refactor: use interface to unify Options and Packages

---
 internal/server/mux.go       | 6 +++---
 internal/server/templates.go | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'internal/server')

diff --git a/internal/server/mux.go b/internal/server/mux.go
index af4a51b..78fee60 100644
--- a/internal/server/mux.go
+++ b/internal/server/mux.go
@@ -17,7 +17,7 @@ import (
 	"searchix/frontend"
 	"searchix/internal/config"
 	search "searchix/internal/index"
-	"searchix/internal/options"
+	"searchix/internal/nix"
 
 	"github.com/blevesearch/bleve/v2"
 	sentryhttp "github.com/getsentry/sentry-go/http"
@@ -51,7 +51,7 @@ type TemplateData struct {
 	Message       string
 }
 
-type ResultData[T options.NixOption] struct {
+type ResultData[T nix.Option] struct {
 	TemplateData
 	Query          string
 	ResultsPerPage int
@@ -143,7 +143,7 @@ func NewMux(
 				errorHandler(w, r, err.Error(), http.StatusInternalServerError)
 			}
 
-			tdata := ResultData[options.NixOption]{
+			tdata := ResultData[nix.Option]{
 				TemplateData: TemplateData{
 					ExtraHeadHTML: cfg.Web.ExtraHeadHTML,
 					Source:        *source,
diff --git a/internal/server/templates.go b/internal/server/templates.go
index 1837665..3d45167 100644
--- a/internal/server/templates.go
+++ b/internal/server/templates.go
@@ -8,7 +8,7 @@ import (
 	"log/slog"
 	"path"
 	"searchix/frontend"
-	"searchix/internal/options"
+	"searchix/internal/nix"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -22,7 +22,7 @@ var md = goldmark.New(
 	goldmark.WithExtensions(extension.NewLinkify()),
 )
 var templateFuncs = template.FuncMap{
-	"markdown": func(input options.Markdown) template.HTML {
+	"markdown": func(input nix.Markdown) template.HTML {
 		var out strings.Builder
 		err := md.Convert([]byte(input), &out)
 		if err != nil {
-- 
cgit 1.4.1