Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues 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

8
middleware/markdown/metadata.go
View file

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

4
middleware/markdown/process.go
View file

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