yeray/gobyexample
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up template rendering code

Browse Source 
Use template.Must(...) to simplify code
defer close the files we open
This commit is contained in:
Eli Bendersky 2022-05-25 20:54:05 -07:00
parent 625ea8043e
commit d9439333fe
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/generate.go
View File

@ -313,14 +313,12 @@ func renderIndex(examples []*Example) {
fmt.Println("Rendering index") fmt.Println("Rendering index")
} }
indexTmpl := template.New("index") indexTmpl := template.New("index")
_, err := indexTmpl.Parse(mustReadFile("templates/footer.tmpl")) template.Must(indexTmpl.Parse(mustReadFile("templates/footer.tmpl")))
check(err) template.Must(indexTmpl.Parse(mustReadFile("templates/index.tmpl")))
_, err = indexTmpl.Parse(mustReadFile("templates/index.tmpl"))
check(err)
indexF, err := os.Create(siteDir + "/index.html") indexF, err := os.Create(siteDir + "/index.html")
check(err) check(err)
err = indexTmpl.Execute(indexF, examples) defer indexF.Close()
check(err) check(indexTmpl.Execute(indexF, examples))
} }
func renderExamples(examples []*Example) { func renderExamples(examples []*Example) {
@ -328,14 +326,13 @@ func renderExamples(examples []*Example) {
fmt.Println("Rendering examples") fmt.Println("Rendering examples")
} }
exampleTmpl := template.New("example") exampleTmpl := template.New("example")
_, err := exampleTmpl.Parse(mustReadFile("templates/footer.tmpl")) template.Must(exampleTmpl.Parse(mustReadFile("templates/footer.tmpl")))
check(err) template.Must(exampleTmpl.Parse(mustReadFile("templates/example.tmpl")))
_, err = exampleTmpl.Parse(mustReadFile("templates/example.tmpl"))
check(err)
for _, example := range examples { for _, example := range examples {
exampleF, err := os.Create(siteDir + "/" + example.ID) exampleF, err := os.Create(siteDir + "/" + example.ID)
check(err) check(err)
exampleTmpl.Execute(exampleF, example) defer exampleF.Close()
check(exampleTmpl.Execute(exampleF, example))
} }
} }
@ -344,14 +341,12 @@ func render404() {
fmt.Println("Rendering 404") fmt.Println("Rendering 404")
} }
tmpl := template.New("404") tmpl := template.New("404")
_, err := tmpl.Parse(mustReadFile("templates/footer.tmpl")) template.Must(tmpl.Parse(mustReadFile("templates/footer.tmpl")))
check(err) template.Must(tmpl.Parse(mustReadFile("templates/404.tmpl")))
_, err = tmpl.Parse(mustReadFile("templates/404.tmpl"))
check(err)
file, err := os.Create(siteDir + "/404.html") file, err := os.Create(siteDir + "/404.html")
check(err) check(err)
err = tmpl.Execute(file, "") defer file.Close()
check(err) check(tmpl.Execute(file, ""))
} }
func main() { func main() {