From c4009c4459b8c2cd657585981ee21c553f0b4c4f Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 16 Feb 2016 18:45:16 +0100 Subject: Switch to method --- parse.go | 4 ++-- view.go | 2 -- wiki.go | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/parse.go b/parse.go index ccf2a87..dd4ba3b 100644 --- a/parse.go +++ b/parse.go @@ -14,9 +14,9 @@ var ( imglink = regexp.MustCompile(`\.(jpe?g|png|gif)$`) ) -func parse(in []byte) string { +func (p Page) HTML() string { buf := new(bytes.Buffer) - for _, v := range strings.Split(string(in), "\r\n\r\n") { + for _, v := range strings.Split(string(p.Body), "\r\n\r\n") { v = intlink.ReplaceAllStringFunc(v, func(s string) string { tmp := new(bytes.Buffer) doc.ExecuteTemplate(tmp, "link", s[1:len(s)-1]) diff --git a/view.go b/view.go index 62f9a4b..aae362e 100644 --- a/view.go +++ b/view.go @@ -16,7 +16,5 @@ func viewHandler(w http.ResponseWriter, r *http.Request) { http.Redirect(w, r, "/edit/"+title, http.StatusFound) return } - - p.HTML = parse(p.Body) p.render(w, template.Must(template.ParseFiles("tmpl/root", "tmpl/view"))) } diff --git a/wiki.go b/wiki.go index 5f096c1..b1e4de5 100644 --- a/wiki.go +++ b/wiki.go @@ -10,7 +10,6 @@ type Page struct { Title string Body []byte Pages []string - HTML string } func (p *Page) fileName() string { -- cgit v1.2.3