all repos — searchix @ 7077a3748fa545e8dee83d4f3464c55b4b459183

Search engine for NixOS, nix-darwin, home-manager and NUR users

feat: allow adding extra HTML to the body via configuration

Alan Pearce
commit

7077a3748fa545e8dee83d4f3464c55b4b459183

parent

fe79b4509dd580542fa28186673826df603677bb

3 files changed, 25 insertions(+), 22 deletions(-)

jump to
M frontend/templates/index.gotmpl → frontend/templates/index.gotmpl
@@ -35,6 +35,6 @@ <a href="https://todo.sr.ht/~alanpearce/searchix">Report issues</a>
     </footer>
     {{ block "js" . }}
     {{ end }}
-    {{ .LiveReload }}
+    {{ .ExtraBodyHTML }}
   </body>
 </html>
M internal/config/config.go → internal/config/config.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"html/template"
 	"log/slog"
 	"maps"
 	"net/url"

@@ -27,10 +28,11 @@ return nil
 }
 
 type Config struct {
-	DataPath string `toml:"data-path"`
-	CSP      CSP    `toml:"content-security-policy"`
-	Headers  map[string]string
-	Sources  map[string]*importer.Source
+	DataPath      string        `toml:"data-path"`
+	CSP           CSP           `toml:"content-security-policy"`
+	ExtraBodyHTML template.HTML `toml:"extra-body-html"`
+	Headers       map[string]string
+	Sources       map[string]*importer.Source
 }
 
 var defaultConfig = Config{
M internal/server/mux.go → internal/server/mux.go
@@ -50,12 +50,12 @@
 const jsSnippet = template.HTML(livereload.JsSnippet) // #nosec G203
 
 type TemplateData struct {
-	LiveReload   template.HTML
-	Sources      map[string]*importer.Source
-	Source       importer.Source
-	Query        string
-	Results      bool
-	SourceResult *bleve.SearchResult
+	Sources       map[string]*importer.Source
+	Source        importer.Source
+	Query         string
+	Results       bool
+	SourceResult  *bleve.SearchResult
+	ExtraBodyHTML template.HTML
 }
 
 type ResultData[T options.NixOption] struct {

@@ -109,11 +109,11 @@ }
 
 	top := http.NewServeMux()
 	mux := http.NewServeMux()
-	indexData := TemplateData{
-		LiveReload: jsSnippet,
-		Sources:    config.Sources,
-	}
 	mux.HandleFunc("/{$}", func(w http.ResponseWriter, _ *http.Request) {
+		indexData := TemplateData{
+			ExtraBodyHTML: config.ExtraBodyHTML,
+			Sources:       config.Sources,
+		}
 		err := templates["index"].ExecuteTemplate(w, "index.gotmpl", indexData)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)

@@ -157,9 +157,9 @@ }
 
 			tdata := ResultData[options.NixOption]{
 				TemplateData: TemplateData{
-					LiveReload: jsSnippet,
-					Source:     *source,
-					Sources:    config.Sources,
+					ExtraBodyHTML: config.ExtraBodyHTML,
+					Source:        *source,
+					Sources:       config.Sources,
 				},
 				ResultsPerPage: search.ResultsPerPage,
 				Query:          qs,

@@ -216,10 +216,10 @@ return
 			}
 
 			err = templates["search"].Execute(w, TemplateData{
-				LiveReload:   jsSnippet,
-				Sources:      config.Sources,
-				Source:       *source,
-				SourceResult: sourceResult,
+				ExtraBodyHTML: config.ExtraBodyHTML,
+				Sources:       config.Sources,
+				Source:        *source,
+				SourceResult:  sourceResult,
 			})
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)

@@ -233,6 +233,7 @@ mux.Handle("/static/", http.FileServer(http.FS(frontend.Files)))
 
 	if runtimeConfig.LiveReload {
 		applyDevModeOverrides(config)
+		config.ExtraBodyHTML = jsSnippet
 		liveReload := livereload.New()
 		liveReload.Start()
 		top.Handle("/livereload", liveReload)