1 files changed, 5 insertions, 8 deletions
diff --git a/handler.go b/handler.go
index b473dde..a480ce3 100644
--- a/handler.go
+++ b/handler.go
@@ -43,10 +43,11 @@ func indexGet(w http.ResponseWriter, r *http.Request) {
 
 		textpath := fmt.Sprintf("data/storage/recipes/%s/text", v.Name())
 		data, _ := ioutil.ReadFile(textpath)
+		markup := Markup(data)
 
 		recipes = append(recipes, Recipe{
 			v.Name(),
-			titleFromMarkup(string(data)),
+			markup.title(),
 			string(data),
 			"",
 		})
@@ -67,19 +68,15 @@ func recipeGet(w http.ResponseWriter, r *http.Request) {
 
 	textpath := fmt.Sprintf("data/storage/recipes/%s/text", idStr)
 	data, _ := ioutil.ReadFile(textpath)
+	markup := Markup(data)
 
 	recipe := Recipe{
 		idStr,
-		titleFromMarkup(string(data)),
+		markup.title(),
 		string(data),
-		"",
+		markup.html(),
 	}
 
-	titleRegex := regexp.MustCompile(`\# .*`)
-	recipe.Text = titleRegex.ReplaceAllString(recipe.Text, "")
-
-	recipe.Html = fmt.Sprintf("<pre>%s</pre>", recipe.Text)
-
 	ServeTemplate(w, "recipe.html", recipe)
 }