From e66691083a2455c29b50a2970c0aba1d6afca753 Mon Sep 17 00:00:00 2001 From: xengineering Date: Wed, 23 Oct 2024 20:34:57 +0200 Subject: Switch to http.Handler The used `func(http.ResponseWriter, *http.Request)` return values made the HTTP handler factory functions quite unreadable. Thus it is switched to the http.Handler type. --- server.go | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'server.go') diff --git a/server.go b/server.go index 35cd44d..3b17227 100644 --- a/server.go +++ b/server.go @@ -19,21 +19,24 @@ var static embed.FS func NewServer(addr string, db *model.DB) *Server { mux := http.NewServeMux() - mux.Handle("GET /static/", http.StripPrefix("/static/", http.FileServer(http.FS(static)))) + mux.Handle( + "GET /static/", + http.StripPrefix("/static/", http.FileServer(http.FS(static))), + ) - mux.HandleFunc("GET /version", view.VersionRead(version)) + mux.Handle("GET /version", view.VersionRead(version)) - mux.HandleFunc("GET /recipes", view.RecipesRead(db)) + mux.Handle("GET /recipes", view.RecipesRead(db)) - mux.HandleFunc("GET /recipe/create", view.RecipeCreate) - mux.HandleFunc("POST /recipe", controller.RecipeCreate(db)) - mux.HandleFunc("GET /recipe/{id}", view.RecipeRead(db)) - mux.HandleFunc("POST /recipe/{id}", controller.RecipeUpdate(db)) - mux.HandleFunc("DELETE /recipe/{id}", controller.RecipeDelete(db)) + mux.Handle("GET /recipe/create", view.RecipeCreate()) + mux.Handle("POST /recipe", controller.RecipeCreate(db)) + mux.Handle("GET /recipe/{id}", view.RecipeRead(db)) + mux.Handle("POST /recipe/{id}", controller.RecipeUpdate(db)) + mux.Handle("DELETE /recipe/{id}", controller.RecipeDelete(db)) - mux.HandleFunc("GET /favicon.ico", view.FaviconRead) + mux.Handle("GET /favicon.ico", view.FaviconRead()) - mux.HandleFunc("GET /", view.IndexRead) + mux.Handle("GET /", view.IndexRead()) var srv http.Server srv.Addr = addr -- cgit v1.2.3-70-g09d2