From 39298f14d366b351708e7f5ef30d1b6575155792 Mon Sep 17 00:00:00 2001 From: xengineering Date: Fri, 31 Mar 2023 20:41:48 +0200 Subject: Reduce to ID and Markdown The upstream URL can be encoded easily by the user in the Markdown-based description. The title can be parsed by the first found top-level heading in the Markdown text. Thus these two columns are no longer used. To avoid an additional migration they will be kept in the database. --- data/templates/add.html | 29 --------------- data/templates/recipe.html | 4 +- data/templates/recipe_edit.html | 2 - handler.go | 82 ++++++++++++++++------------------------- mux.go | 4 -- 5 files changed, 33 insertions(+), 88 deletions(-) delete mode 100644 data/templates/add.html diff --git a/data/templates/add.html b/data/templates/add.html deleted file mode 100644 index 0282ef0..0000000 --- a/data/templates/add.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - {{ template "head.html" }} - - - -

- -

Add a recipe

- -

- - - {{ template "footer.html" }} - -

- - - - diff --git a/data/templates/recipe.html b/data/templates/recipe.html index 00b6906..9f49fbb 100644 --- a/data/templates/recipe.html +++ b/data/templates/recipe.html @@ -6,13 +6,11 @@ -

{{if ne .UpstreamUrl ""}} +

- {{end}}

diff --git a/data/templates/recipe_edit.html b/data/templates/recipe_edit.html index 05a932c..04804b4 100644 --- a/data/templates/recipe_edit.html +++ b/data/templates/recipe_edit.html @@ -15,8 +15,6 @@

Recipe ID: {{.Id}}

-
-

{{.DescriptionMarkdown}}

diff --git a/handler.go b/handler.go index ed8b675..096122e 100644 --- a/handler.go +++ b/handler.go @@ -1,12 +1,14 @@ package main import ( + "bufio" "bytes" "fmt" "io/ioutil" "net/http" "path/filepath" "regexp" + "strings" "github.com/yuin/goldmark" ) @@ -15,9 +17,21 @@ const ( VALID_ID_REGEX = `^[0-9]+$` ) +func titleFromMd(md string) string { + scanner := bufio.NewScanner(strings.NewReader(md)) + for scanner.Scan() { + line := scanner.Text() + cut, found := strings.CutPrefix(line, "# ") + if (found) { + return cut + } + } + return "no title detected" +} + func indexGet(w http.ResponseWriter, r *http.Request) { - cmd := "SELECT id,title FROM recipes ORDER BY title;" + cmd := "SELECT id,description_markdown FROM recipes ORDER BY id;" rows, err := db.Query(cmd) if err != nil { http.Error(w, "Failed to load recipes from database.", 500) @@ -28,16 +42,18 @@ func indexGet(w http.ResponseWriter, r *http.Request) { type Element struct { Id string Title string + DescriptionMarkdown string } elements := make([]Element, 0) for rows.Next() { var element Element - err := rows.Scan(&element.Id, &element.Title) + err := rows.Scan(&element.Id, &element.DescriptionMarkdown) if err != nil { http.Error(w, "Could not parse recipe from database request.", 500) return } else { + element.Title = titleFromMd(element.DescriptionMarkdown) elements = append(elements, element) } } @@ -61,7 +77,7 @@ func recipeGet(w http.ResponseWriter, r *http.Request) { return } - cmd := fmt.Sprintf("SELECT title,upstream_url,description_markdown FROM recipes WHERE (id='%s');", idStr) + cmd := fmt.Sprintf("SELECT description_markdown FROM recipes WHERE (id='%s');", idStr) rows, err := db.Query(cmd) if err != nil { http.Error(w, "Database returned error: "+err.Error(), 500) @@ -70,10 +86,9 @@ func recipeGet(w http.ResponseWriter, r *http.Request) { defer rows.Close() type Element struct { - Id string - Title string - UpstreamUrl string - DescriptionMarkdown string + Id string + Title string + DescriptionMarkdown string RenderedDescriptionMarkdown string } elements := make([]Element, 0) @@ -81,11 +96,12 @@ func recipeGet(w http.ResponseWriter, r *http.Request) { for rows.Next() { var element Element element.Id = idStr - err := rows.Scan(&element.Title, &element.UpstreamUrl, &element.DescriptionMarkdown) + err := rows.Scan(&element.DescriptionMarkdown) if err != nil { http.Error(w, "Could not parse recipe from database request.", 500) return } else { + element.Title = titleFromMd(element.DescriptionMarkdown) elements = append(elements, element) } } @@ -103,27 +119,6 @@ func recipeGet(w http.ResponseWriter, r *http.Request) { ServeTemplate(w, "recipe.html", elements[0]) } -func recipePost(w http.ResponseWriter, r *http.Request) { - - ids := r.URL.Query()["id"] - if len(ids) != 1 { - msg := fmt.Sprintf("Exactly 1 'id' URL parameter expected but %d provided.", len(ids)) - http.Error(w, msg, 400) - return - } - idStr := ids[0] - - idRegex := regexp.MustCompile(VALID_ID_REGEX) - if !(idRegex.MatchString(idStr)) { - http.Error(w, "Bad 'id' URL parameter.", 400) - return - } - - buffer, _ := ioutil.ReadAll(r.Body) // FIXME error handling - body := string(buffer) - updateRecipe(body, idStr) -} - func recipeEditGet(w http.ResponseWriter, r *http.Request) { ids := r.URL.Query()["id"] @@ -139,7 +134,7 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request) { return } - cmd := fmt.Sprintf("SELECT title,upstream_url,description_markdown FROM recipes WHERE (id='%s');", idStr) + cmd := fmt.Sprintf("SELECT description_markdown FROM recipes WHERE (id='%s');", idStr) rows, err := db.Query(cmd) if err != nil { http.Error(w, "Got error from database: "+err.Error(), 500) @@ -148,18 +143,15 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request) { defer rows.Close() type Element struct { - Id string - Title string - UpstreamUrl string - DescriptionMarkdown string - RenderedDescriptionMarkdown string + Id string + DescriptionMarkdown string } elements := make([]Element, 0) for rows.Next() { var element Element element.Id = idStr - err := rows.Scan(&element.Title, &element.UpstreamUrl, &element.DescriptionMarkdown) + err := rows.Scan(&element.DescriptionMarkdown) if err != nil { http.Error(w, "Could not parse recipe from database request.", 500) return @@ -214,28 +206,18 @@ func updateRecipe(body string, idStr string) { func addRecipesGet(w http.ResponseWriter, r *http.Request) { - ServeTemplate(w, "add.html", nil) -} - -func addRecipesPost(w http.ResponseWriter, r *http.Request) { - - url := r.FormValue("url") - title := r.FormValue("title") - - cmd := fmt.Sprintf("INSERT INTO recipes (title,upstream_url) VALUES ('%s', '%s')", title, url) + cmd := fmt.Sprintf("INSERT INTO recipes (title) VALUES ('%s')", "New recipe") res, err := db.Exec(cmd) if err != nil { - http.Error(w, "Could not add recipe.", 500) + http.Error(w, "Could not create recipe.", 500) return } id, err := res.LastInsertId() if err != nil { - http.Error(w, "Expected exactly one recipe URL.", 400) - return + http.Error(w, "Could not get new recipe ID from database", 500) } else { - redirect := fmt.Sprintf("/recipe?id=%d", id) + redirect := fmt.Sprintf("/recipe/edit?id=%d", id) http.Redirect(w, r, redirect, 303) - return } } diff --git a/mux.go b/mux.go index 8c23855..9d9d09a 100644 --- a/mux.go +++ b/mux.go @@ -17,8 +17,6 @@ func recipeMux(w http.ResponseWriter, r *http.Request) { switch r.Method { case "GET": recipeGet(w, r) - case "POST": - recipePost(w, r) default: http.Error(w, "Bad Request", 400) } @@ -39,8 +37,6 @@ func addRecipesMux(w http.ResponseWriter, r *http.Request) { switch r.Method { case "GET": addRecipesGet(w, r) - case "POST": - addRecipesPost(w, r) default: http.Error(w, "Bad Request", 400) } -- cgit v1.2.3-70-g09d2