Do not hardcode data directory

4 files changed, 15 insertions, 11 deletions

diff --git a/config.go b/config.go
index 4866b23..2c25031 100644
--- a/config.go
+++ b/config.go
@@ -15,6 +15,7 @@ type RuntimeConfig struct {
 	Port      string `json:"bind_port"`
 	Static    string `json:"static"`
 	Templates string `json:"templates"`
+	Data string `json:"data"`
 }
 
 func GetRuntimeConfig() RuntimeConfig {
diff --git a/config/debug.json b/config/debug.json
index 47e80ea..ff9b1d3 100644
--- a/config/debug.json
+++ b/config/debug.json
@@ -2,5 +2,6 @@
 	"bind_host":"127.0.0.1",
 	"bind_port":"8080",
 	"static":"./data/static",
-	"templates":"./data/templates"
+	"templates":"./data/templates",
+	"data":"./data/storage"
 }
diff --git a/config/default.json b/config/default.json
index 02220d3..05cb95d 100644
--- a/config/default.json
+++ b/config/default.json
@@ -2,5 +2,6 @@
 	"bind_host":"127.0.0.1",
 	"bind_port":"8080",
 	"static":"/usr/share/ceres/static",
-	"templates":"/usr/share/ceres/templates"
+	"templates":"/usr/share/ceres/templates",
+	"data":"/var/lib/ceres"
 }
diff --git a/handler.go b/handler.go
index e197be7..bbc2dc3 100644
--- a/handler.go
+++ b/handler.go
@@ -23,7 +23,7 @@ type Recipe struct {
 
 func indexGet(w http.ResponseWriter, r *http.Request) {
 
-	entries, err := os.ReadDir("data/storage/recipes")
+	entries, err := os.ReadDir(filepath.Join(config.Data, "recipes"))
 	if err != nil {
 		http.Error(w, "Could not list recipes!", 500)
 		return
@@ -41,7 +41,7 @@ func indexGet(w http.ResponseWriter, r *http.Request) {
 			continue
 		}
 
-		textpath := fmt.Sprintf("data/storage/recipes/%s/text", v.Name())
+		textpath := filepath.Join(config.Data, "recipes", v.Name(), "text")
 		data, _ := ioutil.ReadFile(textpath)
 		markup := Markup(data)
 
@@ -66,7 +66,7 @@ func recipeGet(w http.ResponseWriter, r *http.Request) {
 	}
 	idStr := ids[0]
 
-	textpath := fmt.Sprintf("data/storage/recipes/%s/text", idStr)
+	textpath := filepath.Join(config.Data, "recipes", idStr, "text")
 	data, _ := ioutil.ReadFile(textpath)
 	markup := Markup(data)
 
@@ -90,7 +90,7 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request) {
 	}
 	idStr := ids[0]
 
-	textpath := fmt.Sprintf("data/storage/recipes/%s/text", idStr)
+	textpath := filepath.Join(config.Data, "recipes", idStr, "text")
 	data, _ := ioutil.ReadFile(textpath)
 
 	recipe := Recipe{
@@ -124,7 +124,7 @@ func recipeEditPost(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	textpath := fmt.Sprintf("data/storage/recipes/%s/text", idStr)
+	textpath := filepath.Join(config.Data, "recipes", idStr, "text")
 	err = ioutil.WriteFile(textpath, buffer, 0644)
 	if err != nil {
 		http.Error(w, "Could not save new text for recipe.", 500)
@@ -152,7 +152,7 @@ func recipeConfirmDeletionPost(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	recipedir := fmt.Sprintf("data/storage/recipes/%s", ids[0])
+	recipedir := filepath.Join(config.Data, "recipes", ids[0])
 	err := os.RemoveAll(recipedir)
 	if err != nil {
 		http.Error(w, "Could not delete recipe.", 500)
@@ -164,7 +164,7 @@ func recipeConfirmDeletionPost(w http.ResponseWriter, r *http.Request) {
 
 func addRecipesGet(w http.ResponseWriter, r *http.Request) {
 
-	entries, err := os.ReadDir("data/storage/recipes")
+	entries, err := os.ReadDir(filepath.Join(config.Data, "recipes"))
 	if err != nil {
 		http.Error(w, "Could not get list of existing recipes!", 500)
 		return
@@ -188,15 +188,16 @@ func addRecipesGet(w http.ResponseWriter, r *http.Request) {
 	}
 
 	newId := biggest + 1
+	newIdStr := strconv.Itoa(newId)
 
-	recipedir := fmt.Sprintf("data/storage/recipes/%d", newId)
+	recipedir := filepath.Join(config.Data, "recipes", newIdStr)
 	err = os.Mkdir(recipedir, 0755)
 	if err != nil {
 		http.Error(w, "Could not create new recipe!", 500)
 		return
 	}
 
-	textpath := fmt.Sprintf("data/storage/recipes/%d/text", newId)
+	textpath := filepath.Join(config.Data, "recipes", newIdStr, "text")
 	err = os.WriteFile(textpath, make([]byte, 0), 0644)
 	if err != nil {
 		http.Error(w, "Could not create new recipe!", 500)