Changeset 40 in code

Timestamp:

Sep 4, 2015, 12:49:56 PM (10 years ago)

Author:

zaitsev.serge

Message:

more obvious rules of variable overriding

File:

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

trunk/zs.go

@@ -105 +105 @@
         v["title"] = strings.ToTitle(title)
         v["description"] = ""
-
-        // Copy globals (will override title and description for markdown layouts
-        for name, value := range globals {
-                v[name] = value
-        }
-
-        // Add default values extracted from file name/path
-        if _, err := os.Stat(filepath.Join(ZSDIR, "layout.amber")); err == nil {
-                v["layout"] = "layout.amber"
-        } else {
-                v["layout"] = "layout.html"
-        }
         v["file"] = path
         v["url"] = path[:len(path)-len(filepath.Ext(path))] + ".html"
         v["output"] = filepath.Join(PUBDIR, v["url"])
+
+        // Override default values with globals
+        for name, value := range globals {
+                v[name] = value
+        }
+
+        // Add layout if none is specified
+        if _, ok := v["layout"]; !ok {
+                if _, err := os.Stat(filepath.Join(ZSDIR, "layout.amber")); err == nil {
+                        v["layout"] = "layout.amber"
+                } else {
+                        v["layout"] = "layout.html"
+                }
+        }
 
         delim := "\n---\n"
@@ -133 +135 @@
                         return nil, "", err
                 } else {
+                        // Override default values + globals with the ones defines in the file
                         for key, value := range vars {
                                 v[key] = value
@@ -399 +402 @@
                 } else {
                         s := ""
-                        if vars, _, err := getVars(args[0], globals()); err != nil {
+                        if vars, _, err := getVars(args[0], Vars{}); err != nil {
                                 fmt.Println("var: " + err.Error())
                         } else {