Switch webserver to global config struct

4 files changed, 38 insertions, 38 deletions

diff --git a/handler.go b/handler.go
index 3bdccfd..f7a8840 100644
--- a/handler.go
+++ b/handler.go
@@ -17,7 +17,7 @@ const (
 	VALID_ID_REGEX = `^[0-9]+$`
 )
 
-func indexGet(w http.ResponseWriter, r *http.Request, db *Database, templateRoot string) {
+func indexGet(w http.ResponseWriter, r *http.Request, db *Database) {
 
 	// get data from database
 	cmd := "SELECT id,title FROM recipes ORDER BY title;"
@@ -49,11 +49,11 @@ func indexGet(w http.ResponseWriter, r *http.Request, db *Database, templateRoot
 	}
 
 	// render and return template
-	path := filepath.Join(templateRoot, "index.html")
+	path := filepath.Join(config.Http.Templates, "index.html")
 	ServeTemplate(w, "index", path, elements)
 }
 
-func recipeGet(w http.ResponseWriter, r *http.Request, db *Database, templateRoot string) {
+func recipeGet(w http.ResponseWriter, r *http.Request, db *Database) {
 
 	// get id from URL parameters
 	ids := r.URL.Query()["id"]
@@ -116,7 +116,7 @@ func recipeGet(w http.ResponseWriter, r *http.Request, db *Database, templateRoo
 	elements[0].RenderedDescriptionMarkdown = buf.String()
 
 	// render and return template
-	path := filepath.Join(templateRoot, "recipe.html")
+	path := filepath.Join(config.Http.Templates, "recipe.html")
 	ServeTemplate(w, "recipe", path, elements[0])
 }
 
@@ -144,7 +144,7 @@ func recipePost(w http.ResponseWriter, r *http.Request, db *Database) {
 	updateRecipe(db, body, idStr)
 }
 
-func recipeEditGet(w http.ResponseWriter, r *http.Request, db *Database, templateRoot string) {
+func recipeEditGet(w http.ResponseWriter, r *http.Request, db *Database) {
 
 	// get id from URL parameters
 	ids := r.URL.Query()["id"]
@@ -201,7 +201,7 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request, db *Database, templat
 	}
 
 	// render and return template
-	path := filepath.Join(templateRoot, "recipe_edit.html")
+	path := filepath.Join(config.Http.Templates, "recipe_edit.html")
 	ServeTemplate(w, "recipe", path, elements[0])
 }
 
@@ -245,7 +245,7 @@ func updateRecipe(db *Database, body string, idStr string) {
 	return
 }
 
-func recipeImageGet(w http.ResponseWriter, r *http.Request, storage string) {
+func recipeImageGet(w http.ResponseWriter, r *http.Request) {
 
 	// get ID
 	ids := r.URL.Query()["id"]
@@ -264,13 +264,13 @@ func recipeImageGet(w http.ResponseWriter, r *http.Request, storage string) {
 
 	// serve image
 	path := fmt.Sprintf("recipes/image/%s.jpg", idStr)
-	ServeStorage(w, r, storage, path)
+	ServeStorage(w, r, config.Http.Storage, path)
 }
 
-func addRecipesGet(w http.ResponseWriter, r *http.Request, static string) {
+func addRecipesGet(w http.ResponseWriter, r *http.Request) {
 
 	filename := "add.html"
-	path := filepath.Join(static, filename)
+	path := filepath.Join(config.Http.Static, filename)
 	log.Printf("Trying to serve: %s", path)
 	http.ServeFile(w, r, path)
 }
@@ -299,9 +299,9 @@ func addRecipesPost(w http.ResponseWriter, r *http.Request, db *Database) {
 	}
 }
 
-func staticGet(w http.ResponseWriter, r *http.Request, filename string, staticRoot string) {
+func staticGet(w http.ResponseWriter, r *http.Request, filename string) {
 
-	path := filepath.Join(staticRoot, filename)
+	path := filepath.Join(config.Http.Static, filename)
 	log.Printf("Trying to serve: %s\n", path)
 	http.ServeFile(w, r, path)
 }
diff --git a/main.go b/main.go
index cd32eb0..0473231 100644
--- a/main.go
+++ b/main.go
@@ -11,5 +11,5 @@ func main() {
 	config = GetRuntimeConfig()
 	log.Printf("Starting ceres with config file '%s'\n", config.Path)
 	db := InitDatabase()
-	runServer(config.Http, &db)
+	runServer(&db)
 }
diff --git a/mux.go b/mux.go
index a351ade..3aed42d 100644
--- a/mux.go
+++ b/mux.go
@@ -5,22 +5,22 @@ import (
 	"net/http"
 )
 
-func indexMux(db *Database, templateRoot string) func(http.ResponseWriter, *http.Request) {
+func indexMux(db *Database) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case "GET":
-			indexGet(w, r, db, templateRoot)
+			indexGet(w, r, db)
 		default:
 			http.Error(w, "Bad Request", 400)
 		}
 	}
 }
 
-func recipeMux(db *Database, templateRoot string) func(http.ResponseWriter, *http.Request) {
+func recipeMux(db *Database) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case "GET":
-			recipeGet(w, r, db, templateRoot)
+			recipeGet(w, r, db)
 		case "POST":
 			recipePost(w, r, db)
 		default:
@@ -29,11 +29,11 @@ func recipeMux(db *Database, templateRoot string) func(http.ResponseWriter, *htt
 	}
 }
 
-func recipeEditMux(db *Database, templateRoot string) func(http.ResponseWriter, *http.Request) {
+func recipeEditMux(db *Database) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case "GET":
-			recipeEditGet(w, r, db, templateRoot)
+			recipeEditGet(w, r, db)
 		case "POST":
 			recipeEditPost(w, r, db)
 		default:
@@ -42,22 +42,22 @@ func recipeEditMux(db *Database, templateRoot string) func(http.ResponseWriter,
 	}
 }
 
-func recipeImageMux(storage string) func(http.ResponseWriter, *http.Request) {
+func recipeImageMux() func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case "GET":
-			recipeImageGet(w, r, storage)
+			recipeImageGet(w, r)
 		default:
 			http.Error(w, "Bad Request", 400)
 		}
 	}
 }
 
-func addRecipesMux(db *Database, storage string, static string) func(http.ResponseWriter, *http.Request) {
+func addRecipesMux(db *Database) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case "GET":
-			addRecipesGet(w, r, static)
+			addRecipesGet(w, r)
 		case "POST":
 			addRecipesPost(w, r, db)
 		default:
@@ -66,22 +66,22 @@ func addRecipesMux(db *Database, storage string, static string) func(http.Respon
 	}
 }
 
-func staticStyleMux(file string, static string) func(http.ResponseWriter, *http.Request) {
+func staticStyleMux() func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case "GET":
-			staticGet(w, r, file, static)
+			staticGet(w, r, "style.css")
 		default:
 			http.Error(w, "Bad Request", 400)
 		}
 	}
 }
 
-func faviconMux(file string, static string) func(http.ResponseWriter, *http.Request) {
+func faviconMux() func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case "GET":
-			staticGet(w, r, file, static)
+			staticGet(w, r, "favicon.ico")
 		default:
 			http.Error(w, "Bad Request", 400)
 		}
diff --git a/server.go b/server.go
index ef7397d..f7f67f4 100644
--- a/server.go
+++ b/server.go
@@ -6,21 +6,21 @@ import (
 	"net/http"
 )
 
-func setupRoutes(config HttpConfig, db *Database) {
+func setupRoutes(db *Database) {
 
-	http.HandleFunc("/", indexMux(db, config.Templates))
-	http.HandleFunc("/recipe", recipeMux(db, config.Templates))
-	http.HandleFunc("/recipe/edit", recipeEditMux(db, config.Templates))
-	http.HandleFunc("/recipe/image", recipeImageMux(config.Storage))
-	http.HandleFunc("/add_recipes", addRecipesMux(db, config.Storage, config.Static))
-	http.HandleFunc("/static/style.css", staticStyleMux("style.css", config.Static))
-	http.HandleFunc("/favicon.ico", faviconMux("favicon.ico", config.Static))
+	http.HandleFunc("/", indexMux(db))
+	http.HandleFunc("/recipe", recipeMux(db))
+	http.HandleFunc("/recipe/edit", recipeEditMux(db))
+	http.HandleFunc("/recipe/image", recipeImageMux())
+	http.HandleFunc("/add_recipes", addRecipesMux(db))
+	http.HandleFunc("/static/style.css", staticStyleMux())
+	http.HandleFunc("/favicon.ico", faviconMux())
 }
 
-func runServer(config HttpConfig, db *Database) {
+func runServer(db *Database) {
 
-	setupRoutes(config, db)
-	address := config.Host + ":" + config.Port
+	setupRoutes(db)
+	address := config.Http.Host + ":" + config.Http.Port
 	log.Println("Binding to 'http://" + address)
 	log.Fatal(http.ListenAndServe(address, nil))
 }