comparison zs.go @ 29:dd669a7e582f draft

file, url and output should not be overridden by globals
author zaitsev.serge
date Sun, 30 Aug 2015 14:01:05 +0000
parents 5ee89d094279
children 526ba3c717ba
comparison
equal deleted inserted replaced
28:5ee89d094279 29:dd669a7e582f
33 return nil, "", err 33 return nil, "", err
34 } 34 }
35 s := string(b) 35 s := string(b)
36 url := path[:len(path)-len(filepath.Ext(path))] + ".html" 36 url := path[:len(path)-len(filepath.Ext(path))] + ".html"
37 v := Vars{ 37 v := Vars{
38 "file": path,
39 "url": url,
40 "title": "", 38 "title": "",
41 "description": "", 39 "description": "",
42 "keywords": "", 40 "keywords": "",
43 "output": filepath.Join(PUBDIR, url), 41 }
42 for name, value := range globals {
43 v[name] = value
44 } 44 }
45 if _, err := os.Stat(filepath.Join(ZSDIR, "layout.amber")); err == nil { 45 if _, err := os.Stat(filepath.Join(ZSDIR, "layout.amber")); err == nil {
46 v["layout"] = "layout.amber" 46 v["layout"] = "layout.amber"
47 } else { 47 } else {
48 v["layout"] = "layout.html" 48 v["layout"] = "layout.html"
49 } 49 }
50 50 v["file"] = path
51 for name, value := range globals { 51 v["url"] = url
52 v[name] = value 52 v["output"] = filepath.Join(PUBDIR, url)
53 } 53
54 if strings.Index(s, "\n\n") == -1 { 54 if strings.Index(s, "\n\n") == -1 {
55 return v, s, nil 55 return v, s, nil
56 } 56 }
57 header, body := split2(s, "\n\n") 57 header, body := split2(s, "\n\n")
58 for _, line := range strings.Split(header, "\n") { 58 for _, line := range strings.Split(header, "\n") {