Changeset 21 in code

Timestamp:

Aug 29, 2015, 9:43:59 PM (10 years ago)

Author:

zaitsev.serge

Message:

replaced amber with my own fork, fixed file paths for amber and html

File:

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

trunk/zs.go

@@ -15 +15 @@
         "time"
 
-        "github.com/eknkc/amber"
         "github.com/russross/blackfriday"
         "github.com/yosssi/gcss"
+        "github.com/zserge/amber"
 )
 
@@ -50 +50 @@
                 "url":    url,
                 "output": filepath.Join(PUBDIR, url),
-                "layout": "index.html",
-        }
+        }
+        if _, err := os.Stat(filepath.Join(ZSDIR, "layout.amber")); err == nil {
+                v["layout"] = "layout.amber"
+        } else {
+                v["layout"] = "layout.html"
+        }
+
         if info, err := os.Stat(path); err == nil {
                 v["date"] = info.ModTime().Format("02-01-2006")
@@ -116 +121 @@
 
         if errbuf.Len() > 0 {
-                log.Println(errbuf.String())
+                log.Println("ERROR:", errbuf.String())
         }
 
@@ -156 +161 @@
         v["content"] = string(blackfriday.MarkdownBasic([]byte(content)))
         if strings.HasSuffix(v["layout"], ".amber") {
-                return buildAmber(filepath.Join(ZSDIR, v["layout"]), funcs, v)
+                return buildAmber(filepath.Join(ZSDIR, v["layout"]),
+                        renameExt(path, "", ".html"), funcs, v)
         } else {
-                return buildPlain(filepath.Join(ZSDIR, v["layout"]), funcs, v)
+                return buildPlain(filepath.Join(ZSDIR, v["layout"]),
+                        renameExt(path, "", ".html"), funcs, v)
         }
 }
 
 // Renders text file expanding all variable macros inside it
-func buildPlain(path string, funcs template.FuncMap, vars Vars) error {
-        b, err := ioutil.ReadFile(path)
+func buildPlain(in, out string, funcs template.FuncMap, vars Vars) error {
+        b, err := ioutil.ReadFile(in)
         if err != nil {
                 return err
@@ -172 +179 @@
                 return err
         }
-        output := filepath.Join(PUBDIR, path)
+        output := filepath.Join(PUBDIR, out)
         if s, ok := vars["output"]; ok {
                 output = s
@@ -184 +191 @@
 
 // Renders .amber file into .html
-func buildAmber(path string, funcs template.FuncMap, vars Vars) error {
+func buildAmber(in, out string, funcs template.FuncMap, vars Vars) error {
         a := amber.New()
-        err := a.ParseFile(path)
+        err := a.ParseFile(in)
         if err != nil {
                 return err
@@ -195 +202 @@
         }
         //amber.FuncMap = amber.FuncMap
-        s := strings.TrimSuffix(path, ".amber") + ".html"
-        f, err := os.Create(filepath.Join(PUBDIR, s))
+        f, err := os.Create(filepath.Join(PUBDIR, out))
         if err != nil {
                 return err
@@ -271 +277 @@
         }
         return funcs
+}
+
+func renameExt(path, from, to string) string {
+        if from == "" {
+                from = filepath.Ext(path)
+        }
+        return strings.TrimSuffix(path, from) + to
 }
 
@@ -314 +327 @@
                                 } else if ext == ".html" || ext == ".xml" {
                                         log.Println("html: ", path)
-                                        return buildPlain(path, funcs, vars)
+                                        return buildPlain(path, path, funcs, vars)
                                 } else if ext == ".amber" {
                                         log.Println("html: ", path)
-                                        return buildAmber(path, funcs, vars)
+                                        return buildAmber(path, renameExt(path, ".amber", ".html"), funcs, vars)
                                 } else if ext == ".gcss" {
                                         log.Println("css: ", path)
@@ -373 +386 @@
                         }
                 } else {
-                        log.Println(err)
+                        log.Println("ERROR:", err)
                 }
         default:
                 err := run(path.Join(ZSDIR, cmd), args, Vars{}, os.Stdout)
                 if err != nil {
-                        log.Println(err)
-                }
-        }
-}
+                        log.Println("ERROR:", err)
+                }
+        }
+}