Mercurial > yakumo_izuru > aya

comparison zs.go @ 14:515078352442 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moved html rendering into a separate function
author zaitsev.serge
date Sat, 29 Aug 2015 13:07:18 +0000
parents ece0d406f2db
children a9c42bd52f64
comparison
equal deleted inserted replaced
13:ece0d406f2db 14:515078352442
143 content, err := render(body, v, eval) 143 content, err := render(body, v, eval)
144 if err != nil { 144 if err != nil {
145 return err 145 return err
146 } 146 }
147 v["content"] = string(blackfriday.MarkdownBasic([]byte(content))) 147 v["content"] = string(blackfriday.MarkdownBasic([]byte(content)))
148 b, err = ioutil.ReadFile(filepath.Join(ZSDIR, v["layout"])) 148 return buildPlain(filepath.Join(ZSDIR, v["layout"]), v)
149 if err != nil { 149 }
150 return err 150
151 } 151 func buildPlain(path string, vars map[string]string) error {
152 content, err = render(string(b), v, eval) 152 b, err := ioutil.ReadFile(path)
153 if err != nil { 153 if err != nil {
154 return err 154 return err
155 } 155 }
156 err = ioutil.WriteFile(v["output"], []byte(content), 0666) 156 content, err := render(string(b), vars, eval)
157 if err != nil {
158 return err
159 }
160 output := filepath.Join(PUBDIR, path)
161 if s, ok := vars["output"]; ok {
162 output = s
163 }
164 err = ioutil.WriteFile(output, []byte(content), 0666)
157 if err != nil { 165 if err != nil {
158 return err 166 return err
159 } 167 }
160 return nil 168 return nil
161 } 169 }