markdown: Refactor fixes

6ce83aad · Abiola Ibrahim · 978aef2a · 6ce83aad · 6ce83aad
Commit 6ce83aad authored May 09, 2015 by Abiola Ibrahim
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 9 deletions

middleware/markdown/metadata.go middleware/markdown/metadata.go +11 -7

middleware/markdown/process.go middleware/markdown/process.go +2 -2

No files found.
--- a/middleware/markdown/metadata.go
+++ b/middleware/markdown/metadata.go
@@ -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

--- a/middleware/markdown/process.go
+++ b/middleware/markdown/process.go
@@ -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}}">`