From f268f1fc6469334ef6fcb65de18d7228069869a4 Mon Sep 17 00:00:00 2001 From: "Serge A. Zaitsev" Date: Wed, 2 Sep 2015 19:43:31 +0200 Subject: [PATCH] fixed variable override order --- zs.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/zs.go b/zs.go index de98d56..6b497a7 100644 --- a/zs.go +++ b/zs.go @@ -99,21 +99,23 @@ func getVars(path string, globals Vars) (Vars, string, error) { } s := string(b) - // Copy globals first + // Pick some default values for content-dependent variables v := Vars{} + title := strings.Replace(strings.Replace(path, "_", " ", -1), "-", " ", -1) + 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 } - // Override them by default values extracted from file name/path + // 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" } - title := strings.Replace(strings.Replace(path, "_", " ", -1), "-", " ", -1) - v["title"] = strings.ToTitle(title) - v["description"] = "" v["file"] = path v["url"] = path[:len(path)-len(filepath.Ext(path))] + ".html" v["output"] = filepath.Join(PUBDIR, v["url"]) -- 2.43.0