changeset 14:515078352442 draft

moved html rendering into a separate function
author zaitsev.serge
date Sat, 29 Aug 2015 13:07:18 +0000
parents ece0d406f2db
children a9c42bd52f64
files zs.go
diffstat 1 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
 	}