github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-29 12:16:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove debug line, add file name as default title

Browse Source
This commit is contained in:
Maxime 2015-07-25 22:39:13 +02:00
parent ef4a4b0ab8
commit 604c8abb59
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
middleware/markdown/markdown.go
View File

@ -3,7 +3,6 @@
package markdown package markdown
import ( import (
"fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"os" "os"
@ -126,7 +125,6 @@ func (md Markdown) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error
URL: r.URL, URL: r.URL,
} }
html, err := md.Process(m, fpath, body, ctx) html, err := md.Process(m, fpath, body, ctx)
fmt.Printf("%v", html)
if err != nil { if err != nil {
return http.StatusInternalServerError, err return http.StatusInternalServerError, err
} }

18
middleware/markdown/process.go
View File

@ -68,7 +68,13 @@ func (md Markdown) Process(c Config, requestPath string, b []byte, ctx middlewar
// set it as body for template // set it as body for template
metadata.Variables["body"] = string(markdown) metadata.Variables["body"] = string(markdown)
metadata.Variables["title"] = metadata.Title title := metadata.Title
if title == "" {
title = filepath.Base(requestPath)
var extension = filepath.Ext(requestPath)
title = title[0 : len(title)-len(extension)]
}
metadata.Variables["title"] = title
return md.processTemplate(c, requestPath, tmpl, metadata, ctx) return md.processTemplate(c, requestPath, tmpl, metadata, ctx)
} }
@ -160,15 +166,7 @@ func defaultTemplate(c Config, metadata Metadata, requestPath string) []byte {
} }
// Title is first line (length-limited), otherwise filename // Title is first line (length-limited), otherwise filename
title := metadata.Title title, _ := metadata.Variables["title"].(string)
if title == "" {
title = filepath.Base(requestPath)
if body, _ := metadata.Variables["body"].([]byte); len(body) > 128 {
title = string(body[:128])
} else if len(body) > 0 {
title = string(body)
}
}
html := []byte(htmlTemplate) html := []byte(htmlTemplate)
html = bytes.Replace(html, []byte("{{title}}"), []byte(title), 1) html = bytes.Replace(html, []byte("{{title}}"), []byte(title), 1)