M dark_theme.css → theme.css

@@ -27,19 +27,19 @@ @media (min-width: 2000px) {
         --x-font-size: 22px;
     }
     @media (max-width: 2000px) and (min-width: 1500px) {
-        --x-font-size: 20px;
+        --x-font-size: 18px;
     }
     @media (max-width: 1500px) and (min-width: 1200px) {
-        --x-font-size: 18px;
+        --x-font-size: 16px;
     }
     @media (max-width: 1200px) and (min-width: 800px) {
-        --x-font-size: 16px;
+        --x-font-size: 14px;
     }
     @media (max-width: 800px) and (min-width: 600px) {
-        --x-font-size: 14px;
+        --x-font-size: 13px;
     }
     @media (max-width: 600px) and (min-width: 400px) {
-        --x-font-size: 12px;
+        --x-font-size: 11px;
     }
     @media (max-width: 400px) {
         --x-font-size: 10px;
@@ -206,8 +206,8 @@ .hidden {
     display: none!important;
     height: 0!important;
 }
-.settings h4 {
-
+.settings {
+    flex-wrap: wrap;
 }
 .settings div.rounded {
     display: contents;

M main.go → main.go

@@ -3,7 +3,6 @@ 
 import (
 	_ "embed"
 	"fmt"
-	"log"
 	"net/http"
 	"os"
 	"os/exec"
@@ -15,7 +14,7 @@ 
 //go:embed index.html
 var index string
 
-//go:embed dark_theme.css
+//go:embed theme.css
 var css string
 
 //go:embed scripts.js
@@ -29,20 +28,36 @@ Hostname string
 	Port     string
 	Mandoc   string
 	Addr     string
+}
+
+func Fatal(v ...interface{}) {
+	fmt.Fprintln(os.Stderr, "manhttpd exited due to an error it could not recover from.")
+	fmt.Fprintf(os.Stderr, "Error: %s\n", fmt.Sprint(v...))
+	os.Exit(1)
 }
 
 func GetCFG() {
-	CFG.Hostname = os.Getenv("HOSTNAME")
-	if CFG.Hostname == "" {
-		CFG.Hostname, _ = os.Hostname()
+	var e error
+	var b []byte
+	var s string
+	if s = os.Getenv("HOSTNAME"); s != "" {
+		CFG.Hostname = s
+	} else if s, e = os.Hostname(); e == nil {
+		CFG.Hostname = s
+	} else if b, e = os.ReadFile("/etc/hostname"); e == nil {
+		CFG.Hostname = strings.TrimSpace(string(b))
+	} else {
+
 	}
 	index = strings.ReplaceAll(index, "{{ hostname }}", CFG.Hostname)
-	b, e := exec.Command("which", "mandoc").Output()
-	if e != nil || len(b) == 0 {
-		CFG.Mandoc = os.Getenv("MANDOCPATH")
-		if CFG.Mandoc == "" {
-			log.Fatal("Fatal: no mandoc `apt-get install mandoc`")
+
+	if b, e = exec.Command("which", func() string {
+		if s = os.Getenv("MANDOCPATH"); s != "" {
+			return s
 		}
+		return "mandoc"
+	}()).Output(); e != nil || len(b) == 0 {
+		Fatal("dependency `mandoc` not found in $PATH, is it installed?\n")
 	} else {
 		CFG.Mandoc = strings.TrimSpace(string(b))
 	}
@@ -57,13 +72,6 @@ CFG.Addr = "0.0.0.0"
 	}
 }
 
-// func CssHandle(w http.ResponseWriter, r *http.Request) {
-// 	w.Header().Set("Content-Type", "text/css; charset=utf-8")
-// 	w.Header().Set("Content-Length", fmt.Sprint(len(css)))
-// 	w.WriteHeader(http.StatusOK)
-// 	w.Write(css)
-// }
-
 func init() {
 	index = strings.ReplaceAll(index, "{{ jsContent }}", scripts)
 	index = strings.ReplaceAll(index, "{{ cssContent }}", css)
@@ -71,15 +79,17 @@ }
 
 func main() {
 	GetCFG()
-	// http.HandleFunc("/style.css", CssHandle)
 	http.HandleFunc("/favicon.ico", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "image/x-icon")
 		w.Header().Set("Content-Length", fmt.Sprint(len(favicon)))
 		w.WriteHeader(http.StatusOK)
 		w.Write(favicon)
 	})
-	http.HandleFunc("/", indexHandler)
-	http.ListenAndServe(CFG.Addr+":"+CFG.Port, nil)
+	server := http.Server{
+		Addr:    CFG.Addr + ":" + CFG.Port,
+		Handler: http.HandlerFunc(indexHandler),
+	}
+	_ = server.ListenAndServe()
 }
 
 func WriteHtml(w http.ResponseWriter, r *http.Request, title, html string, q string) {
@@ -111,20 +121,20 @@ b, err := exec.Command("man", arg...).Output()
 	m.Path = strings.TrimSpace(string(b))
 	return err
 }
-func (m *ManPage) Html() string {
+func (m *ManPage) Html() (string, NetErr) {
 	if m.Where() != nil {
-		return fmt.Sprintf("<p>404: Unable to locate page %s</p>", m.Name)
+		return "", e404
 	}
 	b, err := exec.Command(CFG.Mandoc, "-Thtml", "-O", "fragment", m.Path).Output()
 	if err != nil {
-		return fmt.Sprintf("<p>500: server error loading %s</p>", m.Name)
+		return "", e500
 	}
 	html := LinkRemover(string(b), "")
 	html = HTMLManName.ReplaceAllStringFunc(html, func(s string) string {
 		m := HTMLManName.FindStringSubmatch(s)
 		return fmt.Sprintf(`<a href="?%s.%s">%s(%s)</a>`, m[1], m[2], m[1], m[2])
 	})
-	return html
+	return html, nil
 }
 
 var ManDotName = regexp.MustCompile(`^([a-zA-Z0-9_\-]+)(?:\.([0-9a-z]+))?$`)
@@ -144,7 +154,6 @@ var RxWords = regexp.MustCompile(`("[^"]+")|([^ ]+)`).FindAllString
 var RxWhatIs = regexp.MustCompile(`([a-zA-Z0-9_\-]+) [(]([0-9a-z]+)[)][\- ]+(.*)`).FindAllStringSubmatch
 
 func searchHandler(w http.ResponseWriter, r *http.Request) {
-	_ = r.ParseForm()
 	q := r.Form.Get("q")
 	if q == "" {
 		http.Redirect(w, r, r.URL.Path, http.StatusFound)
@@ -165,7 +174,7 @@ }
 	cmd := exec.Command("whatis", args...)
 	b, e := cmd.Output()
 	if len(b) < 1 || e != nil {
-		WriteHtml(w, r, "Search", fmt.Sprintf("<p>404: no resualts matching %s</p>", q), q)
+		e404.Write(w, r)
 		return
 	}
 	var output string
@@ -176,24 +185,92 @@ }
 	}
 	WriteHtml(w, r, "Search", output, q)
 }
+
+var (
+	e400 = HTCode(400, "Bad Request",
+		"Your request cannot be understood by the server.",
+		"Check that you are using a release version of manhttpd.",
+		"Please check spelling and try again.",
+		"Otherwise browser extensions or proxies may be hijacking your requests.",
+	)
+	e404 = HTCode(404, "Not Found",
+		"The requested does match any known page names. Please check your spelling and try again.",
+		`If you cannot find the page using your system's man command, then you may need to update your manDB or apt-get <b>&lt;package&gt;-doc</b>.`,
+		"If you can open a page using the cli but not in manhttpd, your service is misconfigured. For best results set user and group to your login user:",
+		`You can edit &lt;<b>/etc/systemd/system/manhttpd.service</b>&gt; and set "<b>User</b>=&lt;<b>your-user</b>&gt;" and "<b>Group</b>=&lt;<b>your-group</b>&gt;".`,
+		`Usually root user will work just fine, however root does not index user pages. If manuals are installed without superuser, they are saved to &lt;<b>$HOME/.local/share/man/</b>&gt;.`,
+		`If you want user pages you have to run manhttpd as your login user. If you really want to run the service as root with user directories, at your own risk: adding users' homes into the global path &lt;<b>/etc/manpath.config</b>&gt; is usually safe but may cause catastrophic failure on some systems.`,
+	)
+	e500 = HTCode(500, "Internal Server Error",
+		"The server encountered an error and could not complete your request.",
+		"Make sure you are using a release version of manhttpd.",
+	)
+)
+
+func HTCode(code int, name string, desc ...string) HTErr {
+	return HTErr{code, name, desc}
+}
+func (h HTErr) Write(w http.ResponseWriter, r *http.Request) {
+	WriteHtml(w, r, h.Title(), h.Content(), r.URL.RawQuery)
+}
+func (h HTErr) Is(err error, w http.ResponseWriter, r *http.Request) bool {
+	if err == nil {
+		return false
+	}
+	h.Write(w, r)
+	return true
+}
+
+type HTErr struct {
+	Code int
+	Name string
+	Desc []string
+}
+type NetErr interface {
+	Error() HTErr
+	Write(w http.ResponseWriter, r *http.Request)
+}
+
+func (e HTErr) Error() HTErr {
+	return e
+}
+func (e HTErr) Title() string {
+	return fmt.Sprintf("%d %s", e.Code, e.Name)
+}
+func (e HTErr) Content() string {
+	s := fmt.Sprintf("<h1>%3d</h1><h2>%s</h2><br>\n", e.Code, e.Name)
+	for d := range e.Desc {
+		s += fmt.Sprintf("<p>%s</p><br>\n", e.Desc[d])
+	}
+
+	s += `<script>SetRawQuery()</script>
+`
+	return s
+}
+
 func indexHandler(w http.ResponseWriter, r *http.Request) {
 	path := filepath.Base(r.URL.Path)
 	path = strings.TrimSuffix(path, "/")
-	// if path == "style.css" {
-	// 	CssHandle(w, r)
-	// 	return
-	// }
+
+	err := r.ParseForm()
+	if e400.Is(err, w, r) {
+		return
+	}
 
 	if r.Method == "POST" {
 		searchHandler(w, r)
 		return
 	}
 
-	r.ParseForm()
 	name := r.URL.RawQuery
 	if name != "" {
 		man := NewManPage(name)
-		WriteHtml(w, r, man.Name, man.Html(), name)
+		html, nerr := man.Html()
+		if nerr != nil {
+			nerr.Write(w, r)
+			return
+		}
+		WriteHtml(w, r, man.Name, html, name)
 		return
 	}
 	WriteHtml(w, r, "Index", "", name)

M scripts.js → scripts.js

@@ -139,3 +139,23 @@ }(elemH,H(elemH)));
     SetStyle();
     SetScale("0");
 });
+
+function ChangeRawQuery(s="") {
+	let u = document.URL;
+	let i = u.indexOf("?");
+	if (s.length > 0 && !s.startsWith("?")) {
+		s = "?" + s;
+	}
+	if (i == -1) {
+		return u + s;
+	}
+	return u.substring(0, i) + s;
+}
+function SetRawQuery(s="") {
+	let u = ChangeRawQuery(s);
+	window.history.pushState({"html":document.toString(),"pageTitle":document.title},"", u);
+}
+function GoToRawQuery(s) {
+	let u = ChangeRawQuery(s);
+	window.location.href = u;
+}