2 files changed, 78 insertions, 14 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)
 }
 
diff --git a/markup.go b/markup.go
index c0a6d45..7170bd8 100644
--- a/markup.go
+++ b/markup.go
@@ -2,17 +2,84 @@ package main
 
 import (
 	"bufio"
+	"fmt"
 	"strings"
 )
 
-func titleFromMarkup(markup string) string {
-	scanner := bufio.NewScanner(strings.NewReader(markup))
+type Markup []byte
+type LineType int8
+
+const (
+	TextLine LineType = iota
+	LinkLine
+	HeadingLine
+	UnorderedListItem
+)
+
+func getLineType(line string) LineType {
+	if strings.HasPrefix(line, "=>") {
+		return LinkLine
+	}
+	if strings.HasPrefix(line, "#") {
+		return HeadingLine
+	}
+	if strings.HasPrefix(line, "* ") {
+		return UnorderedListItem
+	}
+	return TextLine
+}
+
+func (m Markup) title() string {
+	text := string(m)
+	scanner := bufio.NewScanner(strings.NewReader(text))
 	for scanner.Scan() {
 		line := scanner.Text()
-		cut, found := strings.CutPrefix(line, "# ")
-		if found {
-			return cut
+		if strings.HasPrefix(line, "# ") {
+			return strings.TrimPrefix(line, "# ")
+		}
+	}
+	return ""
+}
+
+func (m Markup) html() string {
+	retval := ""
+	var line string
+	var lineType LineType
+	var lastType LineType = -1
+
+	text := string(m)
+	scanner := bufio.NewScanner(strings.NewReader(text))
+	for scanner.Scan() {
+		line = scanner.Text()
+		lineType = getLineType(line)
+		if lineType != UnorderedListItem && lastType == UnorderedListItem {
+			retval += "\n</ul>"
+		}
+		if line == "" {
+			continue
 		}
+		switch lineType {
+		case LinkLine:
+			retval += fmt.Sprintf("\n<pre>%s</pre>", line)
+		case HeadingLine:
+			retval += fmt.Sprintf("\n<h3>%s</h3>", line)
+		case UnorderedListItem:
+			if lastType != UnorderedListItem {
+				retval += "\n<ul>"
+			}
+			item := strings.TrimPrefix(line, "*")
+			retval += fmt.Sprintf("\n\t<li>%s</li>", item)
+		default:
+			retval += fmt.Sprintf("\n<p>%s</p>", line)
+		}
+		lastType = lineType
+	}
+
+	if lineType == UnorderedListItem {
+		retval += "\n</ul>"
 	}
-	return "no title detected"
+
+	retval = strings.TrimPrefix(retval, "\n")
+
+	return retval
 }