From 3d697e774668e65bfef9bdd18224feecf086da97 Mon Sep 17 00:00:00 2001 From: xengineering Date: Mon, 10 Apr 2023 16:40:22 +0200 Subject: Implement markup to HTML conversion The new custom and text/gemini inspired markup has to be converted to HTML to display the recipe. --- handler.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'handler.go') 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("
%s
", recipe.Text) - ServeTemplate(w, "recipe.html", recipe) } -- cgit v1.2.3-70-g09d2