mirror/zs
1
0
Fork 0
mirror of https://git.mills.io/prologic/zs synced 2024-12-01 09:46:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

file, url and output should not be overridden by globals

Browse Source
This commit is contained in:
Serge A. Zaitsev 2015-08-30 16:01:05 +02:00
parent 70ba7396ff
commit 61600d0951
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zs.go
View File

@ -35,22 +35,22 @@ func md(path string, globals Vars) (Vars, string, error) {
s := string(b) s := string(b)
url := path[:len(path)-len(filepath.Ext(path))] + ".html" url := path[:len(path)-len(filepath.Ext(path))] + ".html"
v := Vars{ v := Vars{
"file": path,
"url": url,
"title": "", "title": "",
"description": "", "description": "",
"keywords": "", "keywords": "",
"output": filepath.Join(PUBDIR, url), }
for name, value := range globals {
v[name] = value
} }
if _, err := os.Stat(filepath.Join(ZSDIR, "layout.amber")); err == nil { if _, err := os.Stat(filepath.Join(ZSDIR, "layout.amber")); err == nil {
v["layout"] = "layout.amber" v["layout"] = "layout.amber"
} else { } else {
v["layout"] = "layout.html" v["layout"] = "layout.html"
} }
v["file"] = path
v["url"] = url
v["output"] = filepath.Join(PUBDIR, url)
for name, value := range globals {
v[name] = value
}
if strings.Index(s, "\n\n") == -1 { if strings.Index(s, "\n\n") == -1 {
return v, s, nil return v, s, nil
} }