mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-23 22:27:38 -05:00
Remove debug line, add file name as default title
This commit is contained in:
parent
ef4a4b0ab8
commit
604c8abb59
2 changed files with 8 additions and 12 deletions
|
@ -3,7 +3,6 @@
|
|||
package markdown
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"os"
|
||||
|
@ -126,7 +125,6 @@ func (md Markdown) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error
|
|||
URL: r.URL,
|
||||
}
|
||||
html, err := md.Process(m, fpath, body, ctx)
|
||||
fmt.Printf("%v", html)
|
||||
if err != nil {
|
||||
return http.StatusInternalServerError, err
|
||||
}
|
||||
|
|
|
@ -68,7 +68,13 @@ func (md Markdown) Process(c Config, requestPath string, b []byte, ctx middlewar
|
|||
|
||||
// set it as body for template
|
||||
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)
|
||||
}
|
||||
|
@ -160,15 +166,7 @@ func defaultTemplate(c Config, metadata Metadata, requestPath string) []byte {
|
|||
}
|
||||
|
||||
// Title is first line (length-limited), otherwise filename
|
||||
title := metadata.Title
|
||||
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)
|
||||
}
|
||||
}
|
||||
title, _ := metadata.Variables["title"].(string)
|
||||
|
||||
html := []byte(htmlTemplate)
|
||||
html = bytes.Replace(html, []byte("{{title}}"), []byte(title), 1)
|
||||
|
|
Loading…
Reference in a new issue