Changeset 35 in code for trunk/zs.go

Timestamp:

Sep 2, 2015, 5:35:26 PM (10 years ago)

Author:

zaitsev.serge

Message:

added explicit yaml separator, fixed amber compilation sequence

File:

• trunk/zs.go (modified) (5 diffs)

trunk/zs.go

@@ -17 +17 @@
         "github.com/russross/blackfriday"
         "github.com/yosssi/gcss"
-        "gopkg.in/yaml.v1"
+        "gopkg.in/yaml.v2"
 )
 
@@ -116 +116 @@
         v["output"] = filepath.Join(PUBDIR, v["url"])
 
-        if sep := strings.Index(s, "\n\n"); sep == -1 {
+        delim := "\n---\n"
+        if sep := strings.Index(s, delim); sep == -1 {
                 return v, s, nil
         } else {
                 header := s[:sep]
-                body := s[sep+len("\n\n"):]
+                body := s[sep+len(delim):]
+
                 vars := Vars{}
                 if err := yaml.Unmarshal([]byte(header), &vars); err != nil {
                         fmt.Println("ERROR: failed to parse header", err)
+                        return nil, "", err
                 } else {
                         for key, value := range vars {
                                 v[key] = value
+                                log.Println(key, value)
                         }
                 }
@@ -227 +231 @@
                 return err
         }
-        if body, err = render(body, v); err != nil {
-                return err
-        }
-
         a := amber.New()
         if err := a.Parse(body); err != nil {
+                fmt.Println(body)
                 return err
         }
@@ -240 +241 @@
                 return err
         }
+
+        htmlBuf := &bytes.Buffer{}
+        if err := t.Execute(htmlBuf, v); err != nil {
+                return err
+        }
+
+        if body, err = render(string(htmlBuf.Bytes()), v); err != nil {
+                return err
+        }
+
         if w == nil {
                 f, err := os.Create(filepath.Join(PUBDIR, renameExt(path, ".amber", ".html")))
@@ -248 +259 @@
                 w = f
         }
-        return t.Execute(w, vars)
+        _, err = io.WriteString(w, body)
+        return err
 }