From f1308a436040f3a72e058e10ec2693cfb599da30 Mon Sep 17 00:00:00 2001 From: xengineering Date: Fri, 31 Mar 2023 19:47:55 +0200 Subject: Remove image functionality Recipe images are currently complicated to implement and have little use. Probably they will not be covered in the next release. --- config.go | 1 - config/debug.json | 3 +-- config/default.json | 3 +-- data/storage/.gitkeep | 0 data/templates/recipe.html | 2 -- data/templates/recipe_edit.html | 2 -- handler.go | 19 ------------------- mux.go | 9 --------- server.go | 1 - storage.go | 28 ---------------------------- 10 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 data/storage/.gitkeep delete mode 100644 storage.go diff --git a/config.go b/config.go index 4b5ecf0..64b2bfb 100644 --- a/config.go +++ b/config.go @@ -20,7 +20,6 @@ type HttpConfig struct { Port string `json:"bind_port"` Static string `json:"static"` Templates string `json:"templates"` - Storage string `json:"storage"` } type DatabaseConfig struct { diff --git a/config/debug.json b/config/debug.json index 7d1295b..b3f5cbd 100644 --- a/config/debug.json +++ b/config/debug.json @@ -3,8 +3,7 @@ "bind_host":"127.0.0.1", "bind_port":"8080", "static":"./data/static", - "templates":"./data/templates", - "storage":"./data/storage" + "templates":"./data/templates" }, "database":{ "socket":"/run/mysqld/mysqld.sock", diff --git a/config/default.json b/config/default.json index 7710774..33ff4a4 100644 --- a/config/default.json +++ b/config/default.json @@ -3,8 +3,7 @@ "bind_host":"127.0.0.1", "bind_port":"8080", "static":"/usr/share/ceres/static", - "templates":"/usr/share/ceres/templates", - "storage":"/var/lib/ceres" + "templates":"/usr/share/ceres/templates" }, "database":{ "socket":"/run/mysqld/mysqld.sock", diff --git a/data/storage/.gitkeep b/data/storage/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/data/templates/recipe.html b/data/templates/recipe.html index 98012fe..00b6906 100644 --- a/data/templates/recipe.html +++ b/data/templates/recipe.html @@ -17,13 +17,11 @@
- Recipe image

Recipe description

{{.RenderedDescriptionMarkdown}} {{ template "footer.html" }} -
diff --git a/data/templates/recipe_edit.html b/data/templates/recipe_edit.html index bd67266..05a932c 100644 --- a/data/templates/recipe_edit.html +++ b/data/templates/recipe_edit.html @@ -17,8 +17,6 @@

Recipe ID: {{.Id}}



- - 
{{.DescriptionMarkdown}}
diff --git a/handler.go b/handler.go index 5198a9f..ed8b675 100644 --- a/handler.go +++ b/handler.go @@ -212,25 +212,6 @@ func updateRecipe(body string, idStr string) { return } -func recipeImageGet(w http.ResponseWriter, r *http.Request) { - - ids := r.URL.Query()["id"] - if len(ids) != 1 { - http.Error(w, "Expected exactly one 'id' URL parameter.", 400) - return - } - idStr := ids[0] - - idRegex := regexp.MustCompile(VALID_ID_REGEX) - if !idRegex.MatchString(idStr) { - http.Error(w, "Bad 'id' URL parameter.", 400) - return - } - - path := fmt.Sprintf("recipes/image/%s.jpg", idStr) - ServeStorage(w, r, path) -} - func addRecipesGet(w http.ResponseWriter, r *http.Request) { ServeTemplate(w, "add.html", nil) diff --git a/mux.go b/mux.go index 4c84570..8c23855 100644 --- a/mux.go +++ b/mux.go @@ -35,15 +35,6 @@ func recipeEditMux(w http.ResponseWriter, r *http.Request) { } } -func recipeImageMux(w http.ResponseWriter, r *http.Request) { - switch r.Method { - case "GET": - recipeImageGet(w, r) - default: - http.Error(w, "Bad Request", 400) - } -} - func addRecipesMux(w http.ResponseWriter, r *http.Request) { switch r.Method { case "GET": diff --git a/server.go b/server.go index 67e6e37..e91859c 100644 --- a/server.go +++ b/server.go @@ -10,7 +10,6 @@ func setupRoutes() { http.HandleFunc("/", indexMux) http.HandleFunc("/recipe", recipeMux) http.HandleFunc("/recipe/edit", recipeEditMux) - http.HandleFunc("/recipe/image", recipeImageMux) http.HandleFunc("/add_recipes", addRecipesMux) http.HandleFunc("/static/style.css", staticStyleMux) http.HandleFunc("/favicon.ico", faviconMux) diff --git a/storage.go b/storage.go deleted file mode 100644 index dd6feb2..0000000 --- a/storage.go +++ /dev/null @@ -1,28 +0,0 @@ -package main - -import ( - "io/ioutil" - "log" - "net/http" - "path/filepath" -) - -func ServeStorage(w http.ResponseWriter, r *http.Request, path string) { - - path = filepath.Join(config.Http.Storage, path) - path, err := filepath.Abs(path) - if err != nil { - log.Print(err) - http.Error(w, http.StatusText(400), 400) - return - } - - // TODO check if path is still in storage folder - - http.ServeFile(w, r, path) -} - -func SaveStorageFile(data *[]byte, path string) error { - fullpath := filepath.Join(config.Http.Storage, path) - return ioutil.WriteFile(fullpath, *data, 0644) -} -- cgit v1.2.3-70-g09d2