diff options
Diffstat (limited to 'handler.go')
| -rw-r--r-- | handler.go | 37 |
1 files changed, 18 insertions, 19 deletions
@@ -1,13 +1,12 @@ - package main import ( "bytes" "fmt" - "regexp" "io/ioutil" "net/http" "path/filepath" + "regexp" "github.com/yuin/goldmark" ) @@ -29,7 +28,7 @@ func indexGet(w http.ResponseWriter, r *http.Request) { // prepare data store type Element struct { - Id string + Id string Title string } elements := make([]Element, 0) @@ -73,17 +72,17 @@ func recipeGet(w http.ResponseWriter, r *http.Request) { cmd := fmt.Sprintf("SELECT title,upstream_url,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) + http.Error(w, "Database returned error: "+err.Error(), 500) return } defer rows.Close() // prepare data store type Element struct { - Id string - Title string - UpstreamUrl string - DescriptionMarkdown string + Id string + Title string + UpstreamUrl string + DescriptionMarkdown string RenderedDescriptionMarkdown string } elements := make([]Element, 0) @@ -136,7 +135,7 @@ func recipePost(w http.ResponseWriter, r *http.Request) { } // read request body - buffer,_ := ioutil.ReadAll(r.Body) // FIXME error handling + buffer, _ := ioutil.ReadAll(r.Body) // FIXME error handling body := string(buffer) updateRecipe(body, idStr) } @@ -162,17 +161,17 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request) { cmd := fmt.Sprintf("SELECT title,upstream_url,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) + http.Error(w, "Got error from database: "+err.Error(), 500) return } defer rows.Close() // prepare data store type Element struct { - Id string - Title string - UpstreamUrl string - DescriptionMarkdown string + Id string + Title string + UpstreamUrl string + DescriptionMarkdown string RenderedDescriptionMarkdown string } elements := make([]Element, 0) @@ -219,7 +218,7 @@ func recipeEditPost(w http.ResponseWriter, r *http.Request) { } // read request body - buffer,_ := ioutil.ReadAll(r.Body) // FIXME error handling + buffer, _ := ioutil.ReadAll(r.Body) // FIXME error handling body := string(buffer) updateRecipe(body, idStr) } @@ -227,7 +226,7 @@ func recipeEditPost(w http.ResponseWriter, r *http.Request) { func updateRecipe(body string, idStr string) { // execute SQL UPDATE - _,_ = db.Exec(` + _, _ = db.Exec(` UPDATE recipes SET @@ -236,7 +235,7 @@ func updateRecipe(body string, idStr string) { (id=?); `, body, idStr, - ) // FIXME error handling + ) // FIXME error handling return } @@ -276,12 +275,12 @@ func addRecipesPost(w http.ResponseWriter, r *http.Request) { title := r.FormValue("title") cmd := fmt.Sprintf("INSERT INTO recipes (title,upstream_url) VALUES ('%s', '%s')", title, url) - res,err := db.Exec(cmd) + res, err := db.Exec(cmd) if err != nil { http.Error(w, "Could not add recipe.", 500) return } - id,err := res.LastInsertId() + id, err := res.LastInsertId() if err != nil { http.Error(w, "Expected exactly one recipe URL.", 400) return |