Migrate storage.go to global config

2 files changed, 5 insertions, 5 deletions

diff --git a/handler.go b/handler.go
index f7a8840..b6c57c4 100644
--- a/handler.go
+++ b/handler.go
@@ -264,7 +264,7 @@ func recipeImageGet(w http.ResponseWriter, r *http.Request) {
 
 	// serve image
 	path := fmt.Sprintf("recipes/image/%s.jpg", idStr)
-	ServeStorage(w, r, config.Http.Storage, path)
+	ServeStorage(w, r, path)
 }
 
 func addRecipesGet(w http.ResponseWriter, r *http.Request) {
diff --git a/storage.go b/storage.go
index 02bc94d..10ec915 100644
--- a/storage.go
+++ b/storage.go
@@ -8,10 +8,10 @@ import (
 	"path/filepath"
 )
 
-func ServeStorage(w http.ResponseWriter, r *http.Request, storage string, path string) {
+func ServeStorage(w http.ResponseWriter, r *http.Request, path string) {
 
 	// generate absolute, cleaned path of ressource
-	path = filepath.Join(storage, path)
+	path = filepath.Join(config.Http.Storage, path)
 	path,err := filepath.Abs(path)
 	if err != nil {
 		log.Print(err)
@@ -25,7 +25,7 @@ func ServeStorage(w http.ResponseWriter, r *http.Request, storage string, path s
 	http.ServeFile(w, r, path)
 }
 
-func SaveStorageFile(data *[]byte, storage string, path string) error {
-	fullpath := filepath.Join(storage, path)
+func SaveStorageFile(data *[]byte, path string) error {
+	fullpath := filepath.Join(config.Http.Storage, path)
 	return ioutil.WriteFile(fullpath, *data, 0644)
 }