Changeset 15 in code

Timestamp:

Aug 29, 2015, 1:07:18 PM (10 years ago)

Author:

zaitsev.serge

Message:

moved html rendering into a separate function

File:

• trunk/zs.go (modified) (1 diff)

trunk/zs.go

@@ -146 +146 @@
         }
         v["content"] = string(blackfriday.MarkdownBasic([]byte(content)))
-        b, err = ioutil.ReadFile(filepath.Join(ZSDIR, v["layout"]))
-        if err != nil {
-                return err
-        }
-        content, err = render(string(b), v, eval)
-        if err != nil {
-                return err
-        }
-        err = ioutil.WriteFile(v["output"], []byte(content), 0666)
+        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), vars, eval)
+        if err != nil {
+                return err
+        }
+        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