|
|
@ -19,7 +19,6 @@ package engine
|
|
|
|
import (
|
|
|
|
import (
|
|
|
|
"bytes"
|
|
|
|
"bytes"
|
|
|
|
"fmt"
|
|
|
|
"fmt"
|
|
|
|
"log"
|
|
|
|
|
|
|
|
"path"
|
|
|
|
"path"
|
|
|
|
"sort"
|
|
|
|
"sort"
|
|
|
|
"strings"
|
|
|
|
"strings"
|
|
|
@ -197,7 +196,7 @@ func (e *Engine) alterFuncMap(t *template.Template) template.FuncMap {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// render takes a map of templates/values and renders them.
|
|
|
|
// render takes a map of templates/values and renders them.
|
|
|
|
func (e *Engine) render(tpls map[string]renderable) (map[string]string, error) {
|
|
|
|
func (e *Engine) render(tpls map[string]renderable) (rendered map[string]string, err error) {
|
|
|
|
// Basically, what we do here is start with an empty parent template and then
|
|
|
|
// Basically, what we do here is start with an empty parent template and then
|
|
|
|
// build up a list of templates -- one for each file. Once all of the templates
|
|
|
|
// build up a list of templates -- one for each file. Once all of the templates
|
|
|
|
// have been parsed, we loop through again and execute every template.
|
|
|
|
// have been parsed, we loop through again and execute every template.
|
|
|
@ -206,8 +205,8 @@ func (e *Engine) render(tpls map[string]renderable) (map[string]string, error) {
|
|
|
|
// to share common blocks, but to make the entire thing feel like a file-based
|
|
|
|
// to share common blocks, but to make the entire thing feel like a file-based
|
|
|
|
// template engine.
|
|
|
|
// template engine.
|
|
|
|
defer func() {
|
|
|
|
defer func() {
|
|
|
|
if err := recover(); err != nil {
|
|
|
|
if r := recover(); r != nil {
|
|
|
|
log.Printf("rendering template failed: %v\n", err)
|
|
|
|
err = fmt.Errorf("rendering template failed: %v", r)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
}()
|
|
|
|
t := template.New("gotpl")
|
|
|
|
t := template.New("gotpl")
|
|
|
@ -247,7 +246,7 @@ func (e *Engine) render(tpls map[string]renderable) (map[string]string, error) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
rendered := make(map[string]string, len(files))
|
|
|
|
rendered = make(map[string]string, len(files))
|
|
|
|
var buf bytes.Buffer
|
|
|
|
var buf bytes.Buffer
|
|
|
|
for _, file := range files {
|
|
|
|
for _, file := range files {
|
|
|
|
// Don't render partials. We don't care out the direct output of partials.
|
|
|
|
// Don't render partials. We don't care out the direct output of partials.
|
|
|
|