From f456fa1a6d3a6633af3b420f1eddbc1a96ffcdf1 Mon Sep 17 00:00:00 2001
From: xengineering <me@xengineering.eu>
Date: Tue, 25 Apr 2023 17:39:48 +0200
Subject: Introduce routing table

This removes a lot of repetative code.
---
 handler.go |  8 ++++---
 mux.go     | 72 --------------------------------------------------------------
 server.go  | 45 +++++++++++++++++++++++++++------------
 3 files changed, 37 insertions(+), 88 deletions(-)
 delete mode 100644 mux.go

diff --git a/handler.go b/handler.go
index 98bcc2d..32a9d4d 100644
--- a/handler.go
+++ b/handler.go
@@ -181,8 +181,10 @@ func addRecipesGet(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, redirect, 303)
 }
 
-func staticGet(w http.ResponseWriter, r *http.Request, filename string) {
+func staticGet(filename string) (func(w http.ResponseWriter, r *http.Request)) {
 
-	path := filepath.Join(config.Static, filename)
-	http.ServeFile(w, r, path)
+	return func(w http.ResponseWriter, r *http.Request) {
+		path := filepath.Join(config.Static, filename)
+		http.ServeFile(w, r, path)
+	}
 }
diff --git a/mux.go b/mux.go
deleted file mode 100644
index 9fb0dad..0000000
--- a/mux.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package main
-
-import (
-	"net/http"
-)
-
-func indexMux(w http.ResponseWriter, r *http.Request) {
-	switch r.Method {
-	case "GET":
-		indexGet(w, r)
-	default:
-		http.Error(w, "Bad Request", 400)
-	}
-}
-
-func recipeMux(w http.ResponseWriter, r *http.Request) {
-	switch r.Method {
-	case "GET":
-		recipeGet(w, r)
-	default:
-		http.Error(w, "Bad Request", 400)
-	}
-}
-
-func recipeEditMux(w http.ResponseWriter, r *http.Request) {
-	switch r.Method {
-	case "GET":
-		recipeEditGet(w, r)
-	case "POST":
-		recipeEditPost(w, r)
-	default:
-		http.Error(w, "Bad Request", 400)
-	}
-}
-
-func recipeConfirmDeletionMux(w http.ResponseWriter, r *http.Request) {
-	switch r.Method {
-	case "GET":
-		recipeConfirmDeletionGet(w, r)
-	case "POST":
-		recipeConfirmDeletionPost(w, r)
-	default:
-		http.Error(w, "Bad Request", 400)
-	}
-}
-
-func addRecipesMux(w http.ResponseWriter, r *http.Request) {
-	switch r.Method {
-	case "GET":
-		addRecipesGet(w, r)
-	default:
-		http.Error(w, "Bad Request", 400)
-	}
-}
-
-func staticStyleMux(w http.ResponseWriter, r *http.Request) {
-	switch r.Method {
-	case "GET":
-		staticGet(w, r, "style.css")
-	default:
-		http.Error(w, "Bad Request", 400)
-	}
-}
-
-func faviconMux(w http.ResponseWriter, r *http.Request) {
-	switch r.Method {
-	case "GET":
-		staticGet(w, r, "favicon.ico")
-	default:
-		http.Error(w, "Bad Request", 400)
-	}
-}
diff --git a/server.go b/server.go
index 891a7b9..3c82f36 100644
--- a/server.go
+++ b/server.go
@@ -3,23 +3,42 @@ package main
 import (
 	"log"
 	"net/http"
+	"strings"
 )
 
-func setupRoutes() {
-
-	http.HandleFunc("/", indexMux)
-	http.HandleFunc("/recipe", recipeMux)
-	http.HandleFunc("/recipe/edit", recipeEditMux)
-	http.HandleFunc("/recipe/confirm-deletion", recipeConfirmDeletionMux)
-	http.HandleFunc("/add_recipes", addRecipesMux)
-	http.HandleFunc("/static/style.css", staticStyleMux)
-	http.HandleFunc("/favicon.ico", faviconMux)
-}
-
 func runServer() {
-
-	setupRoutes()
 	address := config.Host + ":" + config.Port
+	http.HandleFunc("/", route)
 	log.Println("Serving content at 'http://" + address + "'.")
 	log.Fatal(http.ListenAndServe(address, nil))
 }
+
+func route(w http.ResponseWriter, r *http.Request) {
+
+	tab := routingTable{
+		{"/favicon.ico", "GET", staticGet("favicon.ico")},
+		{"/static/style.css", "GET", staticGet("style.css")},
+		{"/add_recipes", "GET", addRecipesGet},
+		{"/recipe/confirm-deletion", "GET", recipeConfirmDeletionGet},
+		{"/recipe/confirm-deletion", "POST", recipeConfirmDeletionPost},
+		{"/recipe/edit", "GET", recipeEditGet},
+		{"/recipe/edit", "POST", recipeEditPost},
+		{"/recipe", "GET", recipeGet},
+		{"/", "GET", indexGet},
+	}
+
+	for _, v := range(tab) {
+		if strings.HasPrefix(r.URL.String(), v.target) && r.Method == v.method {
+			v.handler(w, r)
+			return
+		}
+	}
+
+	http.Error(w, "Bad Request", 400)
+}
+
+type routingTable []struct {
+	target string
+	method string
+	handler func(w http.ResponseWriter, r *http.Request)
+}
-- 
cgit v1.2.3-70-g09d2