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

markdown: Refactor fixes

Browse Source
This commit is contained in:
Abiola Ibrahim 2015-05-09 00:54:39 +01:00
parent 978aef2ae7
commit 6ce83aad2b
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
middleware/markdown/metadata.go
View File

@ -162,14 +162,18 @@ func extractMetadata(b []byte) (metadata Metadata, markdown []byte, err error) {
var parser MetadataParser
// Read first line
if scanner.Scan() {
line := scanner.Bytes()
parser = findParser(line)
// if no parser found,
if !scanner.Scan() {
// if no line is read,
// assume metadata not present
if parser == nil {
return metadata, b, nil
}
return metadata, b, nil
}
line := scanner.Bytes()
parser = findParser(line)
// if no parser found,
// assume metadata not present
if parser == nil {
return metadata, b, nil
}
// buffer for metadata contents

4
middleware/markdown/process.go
View File

@ -137,7 +137,7 @@ func defaultTemplate(c Config, metadata Metadata, requestPath string) []byte {
title := metadata.Title
if title == "" {
title = filepath.Base(requestPath)
if body, _ := metadata.Variables["body"].([]byte); len(body) > 128 {
if body, _ := metadata.Variables["markdown"].([]byte); len(body) > 128 {
title = string(body[:128])
} else if len(body) > 0 {
title = string(body)
@ -162,7 +162,7 @@ const (
{{js}}
</head>
<body>
{{.body}}
{{.markdown}}
</body>
</html>`
cssTemplate = `<link rel="stylesheet" href="{{url}}">`