Config to extend rendered head element (#27)

robherley · web-flow · commit 817a8670f2f9 · 2023-05-12T15:57:30.000-04:00
diff --git a/docs/self-hosting.md b/docs/self-hosting.md
@@ -47,6 +47,7 @@ SNIPS_LIMITS_SESSIONDURATION  Duration          15m                    maximum s
 SNIPS_DB_FILEPATH             String            data/snips.db          path to database file
 SNIPS_HTTP_INTERNAL           URL               http://localhost:8080  internal address to listen for http requests
 SNIPS_HTTP_EXTERNAL           URL               http://localhost:8080  external http address displayed in commands
+SNIPS_HTML_EXTENDHEADFILE     String                                   path to html file for extra content in <head>
 SNIPS_SSH_INTERNAL            URL               ssh://localhost:2222   internal address to listen for ssh requests
 SNIPS_SSH_EXTERNAL            URL               ssh://localhost:2222   external ssh address displayed in commands
 SNIPS_SSH_HOSTKEYPATH         String            data/keys/snips        path to host keys (without extension)
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -40,6 +40,10 @@ type Config struct {
 		External url.URL `default:"http://localhost:8080" desc:"external http address displayed in commands"`
 	}
 
+	HTML struct {
+		ExtendHeadFile string `default:"" desc:"path to html file for extra content in <head>"`
+	}
+
 	SSH struct {
 		Internal    url.URL `default:"ssh://localhost:2222" desc:"internal address to listen for ssh requests"`
 		External    url.URL `default:"ssh://localhost:2222" desc:"external ssh address displayed in commands"`
diff --git a/internal/http/assets.go b/internal/http/assets.go
@@ -5,10 +5,12 @@ import (
 	"embed"
 	"html/template"
 	"net/http"
+	"os"
 	"path"
 	"path/filepath"
 	"strings"
 
+	"github.com/rs/zerolog/log"
 	"github.com/tdewolff/minify/v2"
 	"github.com/tdewolff/minify/v2/css"
 	"github.com/tdewolff/minify/v2/js"
@@ -50,7 +52,7 @@ type Assets struct {
 }
 
 // NewAssets holds the templates, static content and minifies accordingly.
-func NewAssets(webFS *embed.FS, docsFS *embed.FS, readme []byte) (*Assets, error) {
+func NewAssets(webFS *embed.FS, docsFS *embed.FS, readme []byte, extendHeadFile string) (*Assets, error) {
 	assets := &Assets{
 		webFS:  webFS,
 		docsFS: docsFS,
@@ -61,9 +63,27 @@ func NewAssets(webFS *embed.FS, docsFS *embed.FS, readme []byte) (*Assets, error
 	assets.mini.AddFunc(cssMime, css.Minify)
 	assets.mini.AddFunc(jsMime, js.Minify)
 
-	var err error
+	var (
+		err               error
+		extendHeadContent string
+	)
 
-	if assets.tmpl, err = template.ParseFS(webFS, tmplPattern); err != nil {
+	if extendHeadFile != "" {
+		if headContent, err := os.ReadFile(extendHeadFile); err == nil {
+			extendHeadContent = string(headContent)
+		} else {
+			log.Warn().Err(err).Msg("unable to extend head content")
+		}
+	}
+
+	tmpl := template.New("file")
+	tmpl.Funcs(template.FuncMap{
+		"ExtendedHeadContent": func() template.HTML {
+			return template.HTML(extendHeadContent)
+		},
+	})
+
+	if assets.tmpl, err = tmpl.ParseFS(webFS, tmplPattern); err != nil {
 		return nil, err
 	}
 
diff --git a/main.go b/main.go
@@ -51,6 +51,7 @@ func main() {
 		&webFS,
 		&docsFS,
 		readme,
+		cfg.HTML.ExtendHeadFile,
 	)
 	if err != nil {
 		log.Fatal().Err(err).Msg("failed to load assets")
diff --git a/web/templates/file.go.html b/web/templates/file.go.html
@@ -10,6 +10,7 @@
   <title>{{ .FileID }} - snips.sh</title>
   <link rel="stylesheet" href="/assets/index.css">
   <script type="module" src="/assets/index.js"></script>
+  {{ ExtendedHeadContent }}
 </head>
 
 <body>

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ func main() {`
`51`	`51`	`&webFS,`
`52`	`52`	`&docsFS,`
`53`	`53`	`readme,`
	`54`	`+ cfg.HTML.ExtendHeadFile,`
`54`	`55`	`)`
`55`	`56`	`if err != nil {`
`56`	`57`	`log.Fatal().Err(err).Msg("failed to load assets")`