diff --git a/engine/basic.go b/engine/basic.go
index 607346ad..1c7acfe1 100644
--- a/engine/basic.go
+++ b/engine/basic.go
@@ -254,7 +254,7 @@ func (ac *Config) LoadBasicWeb(w http.ResponseWriter, req *http.Request, L *lua.
}
lv := L.ToString(1)
- w.Header().Add("Content-Type", lv)
+ w.Header().Add(contentType, lv)
return 0 // number of results
}))
diff --git a/engine/dirhandler.go b/engine/dirhandler.go
index 99a1bc57..01b5172f 100644
--- a/engine/dirhandler.go
+++ b/engine/dirhandler.go
@@ -119,7 +119,7 @@ func (ac *Config) DirectoryListing(w http.ResponseWriter, req *http.Request, roo
}
// Serve the page
- w.Header().Add("Content-Type", "text/html;charset=utf-8")
+ w.Header().Add(contentType, htmlUTF8)
ac.DataToClient(w, req, dirname, htmldata)
}
diff --git a/engine/handlers.go b/engine/handlers.go
index 96bfce99..212e8da9 100644
--- a/engine/handlers.go
+++ b/engine/handlers.go
@@ -30,6 +30,9 @@ const (
// Used for deciding how long to wait before quitting when only serving a single file and starting a browser
defaultSoonDuration = time.Second * 3
+
+ contentType = "Content-Type"
+ htmlUTF8 = "text/html;charset=utf-8"
)
var oc *ollamaclient.Config
@@ -48,7 +51,7 @@ func (ac *Config) ClientCanGzip(req *http.Request) bool {
// PongoHandler renders and serves a Pongo2 template
func (ac *Config) PongoHandler(w http.ResponseWriter, req *http.Request, filename, ext string) {
- w.Header().Add("Content-Type", "text/html;charset=utf-8")
+ w.Header().Add(contentType, htmlUTF8)
pongoblock, err := ac.cache.Read(filename, ac.shouldCache(ext))
if err != nil {
if ac.debugMode {
@@ -147,7 +150,7 @@ func (ac *Config) FilePage(w http.ResponseWriter, req *http.Request, filename, l
// HTML pages are handled differently, if auto-refresh has been enabled
case ".html", ".htm":
- w.Header().Add("Content-Type", "text/html;charset=utf-8")
+ w.Header().Add(contentType, htmlUTF8)
// Read the file (possibly in compressed format, straight from the cache)
htmlblock, err := ac.ReadAndLogErrors(w, filename, ext)
@@ -171,7 +174,7 @@ func (ac *Config) FilePage(w http.ResponseWriter, req *http.Request, filename, l
return
case ".md", ".markdown":
- w.Header().Add("Content-Type", "text/html;charset=utf-8")
+ w.Header().Add(contentType, htmlUTF8)
if markdownblock, err := ac.ReadAndLogErrors(w, filename, ext); err == nil { // success
// Render the markdown page
ac.MarkdownPage(w, req, markdownblock.Bytes(), filename)
@@ -179,7 +182,7 @@ func (ac *Config) FilePage(w http.ResponseWriter, req *http.Request, filename, l
return
case ".frm", ".form":
- w.Header().Add("Content-Type", "text/html;charset=utf-8")
+ w.Header().Add(contentType, htmlUTF8)
formblock, err := ac.cache.Read(filename, ac.shouldCache(ext))
if err != nil {
return
@@ -194,7 +197,7 @@ func (ac *Config) FilePage(w http.ResponseWriter, req *http.Request, filename, l
return
case ".amber", ".amb":
- w.Header().Add("Content-Type", "text/html;charset=utf-8")
+ w.Header().Add(contentType, htmlUTF8)
amberblock, err := ac.ReadAndLogErrors(w, filename, ext)
if err != nil {
return
@@ -323,7 +326,7 @@ func (ac *Config) FilePage(w http.ResponseWriter, req *http.Request, filename, l
case ".gcss":
if gcssblock, err := ac.ReadAndLogErrors(w, filename, ext); err == nil { // success
- w.Header().Add("Content-Type", "text/css;charset=utf-8")
+ w.Header().Add(contentType, "text/css;charset=utf-8")
// Render the GCSS page as CSS
ac.GCSSPage(w, req, filename, gcssblock.Bytes())
}
@@ -332,7 +335,7 @@ func (ac *Config) FilePage(w http.ResponseWriter, req *http.Request, filename, l
case ".scss":
if scssblock, err := ac.ReadAndLogErrors(w, filename, ext); err == nil { // success
// Render the SASS page (with .scss extension) as CSS
- w.Header().Add("Content-Type", "text/css;charset=utf-8")
+ w.Header().Add(contentType, "text/css;charset=utf-8")
ac.SCSSPage(w, req, filename, scssblock.Bytes())
}
return
@@ -340,7 +343,7 @@ func (ac *Config) FilePage(w http.ResponseWriter, req *http.Request, filename, l
case ".happ", ".hyper", ".hyper.jsx", ".hyper.js": // hyperApp JSX -> JS, wrapped in HTML
if jsxblock, err := ac.ReadAndLogErrors(w, filename, ext); err == nil { // success
// Render the JSX page as HTML with embedded JavaScript
- w.Header().Add("Content-Type", "text/html;charset=utf-8")
+ w.Header().Add(contentType, htmlUTF8)
ac.HyperAppPage(w, req, filename, jsxblock.Bytes())
} else {
logrus.Error("Error when serving " + filename + ":" + err.Error())
@@ -351,7 +354,7 @@ func (ac *Config) FilePage(w http.ResponseWriter, req *http.Request, filename, l
case ".jsx":
if jsxblock, err := ac.ReadAndLogErrors(w, filename, ext); err == nil { // success
// Render the JSX page as JavaScript
- w.Header().Add("Content-Type", "text/javascript;charset=utf-8")
+ w.Header().Add(contentType, "text/javascript;charset=utf-8")
ac.JSXPage(w, req, filename, jsxblock.Bytes())
} else {
logrus.Error("Error when serving " + filename + ":" + err.Error())
@@ -370,7 +373,7 @@ func (ac *Config) FilePage(w http.ResponseWriter, req *http.Request, filename, l
contentType := strings.TrimSpace(lines[0])
model := strings.TrimSpace(lines[1])
prompt := strings.TrimSpace(strings.Join(lines[3:], "\n"))
- w.Header().Add("Content-Type", contentType)
+ w.Header().Add(contentType, contentType)
if oc == nil {
oc = ollamaclient.New()
}
@@ -401,20 +404,20 @@ func (ac *Config) FilePage(w http.ResponseWriter, req *http.Request, filename, l
// Text and configuration files (most likely)
case "", ".asciidoc", ".conf", ".config", ".diz", ".example", ".gitignore", ".gitmodules", ".ini", ".log", ".lst", ".me", ".nfo", ".pem", ".readme", ".sub", ".sum", ".tml", ".toml", ".txt", ".yaml", ".yml":
// Set headers for displaying it in the browser.
- w.Header().Set("Content-Type", "text/plain;charset=utf-8")
+ w.Header().Set(contentType, "text/plain;charset=utf-8")
// Source files that may be used by web pages
case ".js":
- w.Header().Add("Content-Type", "text/javascript;charset=utf-8")
+ w.Header().Add(contentType, "text/javascript;charset=utf-8")
// JSON
case ".json":
- w.Header().Add("Content-Type", "application/json;charset=utf-8")
+ w.Header().Add(contentType, "application/json;charset=utf-8")
// Source code files for viewing
case ".S", ".ada", ".asm", ".bash", ".bat", ".c", ".c++", ".cc", ".cl", ".clj", ".cpp", ".cs", ".cxx", ".el", ".elm", ".erl", ".fish", ".go", ".h", ".h++", ".hpp", ".hs", ".java", ".kt", ".lisp", ".mk", ".ml", ".pas", ".pl", ".py", ".r", ".rb", ".rs", ".scm", ".sh", ".ts", ".tsx":
// Set headers for displaying it in the browser.
- w.Header().Set("Content-Type", "text/plain;charset=utf-8")
+ w.Header().Set(contentType, "text/plain;charset=utf-8")
// Common binary file extensions
case ".7z", ".arj", ".bin", ".com", ".dat", ".db", ".elf", ".exe", ".gz", ".iso", ".lz", ".rar", ".tar.bz", ".tar.bz2", ".tar.gz", ".tar.xz", ".tbz", ".tbz2", ".tgz", ".txz", ".xz", ".zip":
@@ -424,7 +427,7 @@ func (ac *Config) FilePage(w http.ResponseWriter, req *http.Request, filename, l
default:
// If the filename starts with a ".", assume it's a plain text configuration file
if strings.HasPrefix(filepath.Base(lowercaseFilename), ".") {
- w.Header().Set("Content-Type", "text/plain;charset=utf-8")
+ w.Header().Set(contentType, "text/plain;charset=utf-8")
} else {
// Set the correct Content-Type
if ac.mimereader != nil {
@@ -603,7 +606,7 @@ func (ac *Config) RegisterHandlers(mux *http.ServeMux, handlePath, servedir stri
} else {
limiter := tollbooth.NewLimiter(float64(ac.limitRequests), nil)
limiter.SetMessage(themes.MessagePage("Rate-limit exceeded", "You have reached the maximum request limit.
", theme))
- limiter.SetMessageContentType("text/html;charset=utf-8")
+ limiter.SetMessageContentType(htmlUTF8)
mux.Handle(handlePath, tollbooth.LimitFuncHandler(limiter, allRequests))
}
}
diff --git a/engine/luahandler.go b/engine/luahandler.go
index 81118448..bfddb3e7 100644
--- a/engine/luahandler.go
+++ b/engine/luahandler.go
@@ -48,7 +48,7 @@ func (ac *Config) LoadLuaHandlerFunctions(L *lua.LState, filename string, mux *h
} else {
limiter := tollbooth.NewLimiter(float64(ac.limitRequests), nil)
limiter.SetMessage(themes.MessagePage("Rate-limit exceeded", "You have reached the maximum request limit.
", theme))
- limiter.SetMessageContentType("text/html;charset=utf-8")
+ limiter.SetMessageContentType(htmlUTF8)
mux.Handle(handlePath, tollbooth.LimitFuncHandler(limiter, wrappedHandleFunc))
}
diff --git a/engine/prettyerror.go b/engine/prettyerror.go
index c75dd6ca..667d3b0b 100644
--- a/engine/prettyerror.go
+++ b/engine/prettyerror.go
@@ -84,7 +84,7 @@ func (ac *Config) PrettyError(w http.ResponseWriter, req *http.Request, filename
w.WriteHeader(http.StatusOK)
// HTTP content type
- w.Header().Add("Content-Type", "text/html;charset=utf-8")
+ w.Header().Add(contentType, htmlUTF8)
var (
code string
diff --git a/engine/rendering.go b/engine/rendering.go
index 24e7da37..e5eef3de 100644
--- a/engine/rendering.go
+++ b/engine/rendering.go
@@ -28,7 +28,11 @@ import (
_ "embed"
)
-const markdownCodeStyle = "base16-snazzy" // using xyproto/splash
+const (
+ markdownCodeStyle = "base16-snazzy" // using xyproto/splash
+ linkHref = ``
+)
var (
//go:embed static/tex-svg.js
@@ -394,9 +398,9 @@ func (ac *Config) MarkdownPage(w http.ResponseWriter, req *http.Request, mdConte
switch {
case ac.fs.Exists(CSSFilename):
// Link to stylesheet (without checking if the CSS file is valid first)
- head.WriteString(``)
+ head.WriteString(stylesheetCSS)
case ac.fs.Exists(GCSSFilename):
if ac.debugMode {
gcssblock, err := ac.cache.Read(GCSSFilename, ac.shouldCache(".gcss"))
@@ -417,9 +421,9 @@ func (ac *Config) MarkdownPage(w http.ResponseWriter, req *http.Request, mdConte
}
}
// Link to stylesheet (without checking if the GCSS file is valid first)
- head.WriteString(``)
+ head.WriteString(stylesheetCSS)
default:
// If not, use the theme by inserting the CSS style directly
head.Write(themes.StyleHead(string(theme)))
@@ -439,9 +443,9 @@ func (ac *Config) MarkdownPage(w http.ResponseWriter, req *http.Request, mdConte
cssdata := cssblock.Bytes()
head.WriteString("")
} else {
- head.WriteString(``)
+ head.WriteString(stylesheetCSS)
}
}
@@ -845,9 +849,9 @@ func (ac *Config) HyperAppPage(w http.ResponseWriter, req *http.Request, filenam
switch {
case ac.fs.Exists(CSSFilename):
// Link to stylesheet (without checking if the GCSS file is valid first)
- htmlbuf.WriteString(``)
+ htmlbuf.WriteString(stylesheetCSS)
case ac.fs.Exists(GCSSFilename):
if ac.debugMode {
gcssblock, err := ac.cache.Read(GCSSFilename, ac.shouldCache(".gcss"))
@@ -868,9 +872,9 @@ func (ac *Config) HyperAppPage(w http.ResponseWriter, req *http.Request, filenam
}
}
// Link to stylesheet (without checking if the GCSS file is valid first)
- htmlbuf.WriteString(``)
+ htmlbuf.WriteString(stylesheetCSS)
default:
// If not, use the default hyperapp theme by inserting the CSS style directly
theme := ac.defaultTheme