# HG changeset patch # User zaitsev.serge # Date 1440853638 0 # Node ID 5150783524424f23d142242e056271362c7d6ffb # Parent ece0d406f2db3e7fffb1a8a60ea166c3b7ef04cc moved html rendering into a separate function diff -r ece0d406f2db -r 515078352442 zs.go --- a/zs.go Sat Aug 29 11:47:05 2015 +0000 +++ b/zs.go Sat Aug 29 13:07:18 2015 +0000 @@ -145,15 +145,23 @@ return err } v["content"] = string(blackfriday.MarkdownBasic([]byte(content))) - b, err = ioutil.ReadFile(filepath.Join(ZSDIR, v["layout"])) + return buildPlain(filepath.Join(ZSDIR, v["layout"]), v) +} + +func buildPlain(path string, vars map[string]string) error { + b, err := ioutil.ReadFile(path) if err != nil { return err } - content, err = render(string(b), v, eval) + content, err := render(string(b), vars, eval) if err != nil { return err } - err = ioutil.WriteFile(v["output"], []byte(content), 0666) + output := filepath.Join(PUBDIR, path) + if s, ok := vars["output"]; ok { + output = s + } + err = ioutil.WriteFile(output, []byte(content), 0666) if err != nil { return err }