serv/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2024-12-26 16:33:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

don't shadow variables, no empty "else" blocks

Browse source 
from go vet and staticcheck
This commit is contained in:
Mechiel Lukkien 2024-02-08 15:12:06 +01:00
parent 5f40d23c1c
commit 61836f6d00
No known key found for this signature in database
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
website/website.go
View file

@ -31,10 +31,10 @@ func main() {
var commitdate = os.Getenv("commitdate") var commitdate = os.Getenv("commitdate")
var pageRoot, pageProtocols bool var pageRoot, pageProtocols bool
var title string var pageTitle string
flag.BoolVar(&pageRoot, "root", false, "is top-level index page, instead of in a sub directory") flag.BoolVar(&pageRoot, "root", false, "is top-level index page, instead of in a sub directory")
flag.BoolVar(&pageProtocols, "protocols", false, "is protocols page") flag.BoolVar(&pageProtocols, "protocols", false, "is protocols page")
flag.StringVar(&title, "title", "", "html title of page, set to value of link name with a suffix") flag.StringVar(&pageTitle, "title", "", "html title of page, set to value of link name with a suffix")
flag.Parse() flag.Parse()
args := flag.Args() args := flag.Args()
if len(args) != 1 { if len(args) != 1 {
@ -43,8 +43,8 @@ func main() {
} }
linkname := args[0] linkname := args[0]
if title == "" && linkname != "" { if pageTitle == "" && linkname != "" {
title = linkname + " - Mox" pageTitle = linkname + " - Mox"
} }
// Often the website markdown file. // Often the website markdown file.
@ -67,11 +67,11 @@ func main() {
var title string var title string
// Get the h2's, split them over the columns. // Get the h2's, split them over the columns.
type link struct { type toclink struct {
Title string Title string
ID string ID string
} }
var links []link var links []toclink
node := blackfriday.New(opts...).Parse(input) node := blackfriday.New(opts...).Parse(input)
if node == nil { if node == nil {
@ -84,10 +84,8 @@ func main() {
if c.Level == 1 { if c.Level == 1 {
title = string(c.FirstChild.Literal) title = string(c.FirstChild.Literal)
} else if c.Level == 2 { } else if c.Level == 2 {
link := link{string(c.FirstChild.Literal), c.HeadingID} link := toclink{string(c.FirstChild.Literal), c.HeadingID}
links = append(links, link) links = append(links, link)
} else {
// log.Fatalf("heading, level %d", c.Level)
} }
} }
@ -176,13 +174,13 @@ func main() {
xinput = bytes.SplitN(xinput, []byte("\n"), 2)[1] xinput = bytes.SplitN(xinput, []byte("\n"), 2)[1]
} }
output = blackfriday.Run(xinput, opts...) output = blackfriday.Run(xinput, opts...)
title, toc := makeTOC() titlebuf, toc := makeTOC()
output = append(toc, output...) output = append(toc, output...)
output = append(title, output...) output = append(titlebuf, output...)
} }
// HTML preamble. // HTML preamble.
before = strings.Replace(before, "<title>...</title>", "<title>"+html.EscapeString(title)+"</title>", 1) before = strings.Replace(before, "<title>...</title>", "<title>"+html.EscapeString(pageTitle)+"</title>", 1)
before = strings.Replace(before, ">"+linkname+"<", ` style="font-weight: bold">`+linkname+"<", 1) before = strings.Replace(before, ">"+linkname+"<", ` style="font-weight: bold">`+linkname+"<", 1)
if !pageRoot { if !pageRoot {
before = strings.ReplaceAll(before, `"./`, `"../`) before = strings.ReplaceAll(before, `"./`, `"../`)