aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-02-16 18:45:16 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-02-16 18:45:16 +0100
commitc4009c4459b8c2cd657585981ee21c553f0b4c4f (patch)
treee0e7e30a7afbdbe9c57427cb3c02a306611a7465
parent8bf5d9d2c82560c81be6809522215bded0cf9911 (diff)
Switch to method
-rw-r--r--parse.go4
-rw-r--r--view.go2
-rw-r--r--wiki.go1
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 {