From 19d53b1d5bff90bda8a7676e52ee9fa7229b12c7 Mon Sep 17 00:00:00 2001
From: arnaucode <idoctnef@openmailbox.org>
Date: Wed, 21 Jun 2017 16:10:45 +0200
Subject: [PATCH] update

---
 config.json   | 4 ++--
 handlers.go   | 4 ++--
 main.go       | 2 +-
 readConfig.go | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/config.json b/config.json
index 04e457d..52451c1 100644
--- a/config.json
+++ b/config.json
@@ -1,8 +1,8 @@
 {
+    "serverIP": "127.0.0.1",
+    "serverPort": "3050",
     "folder": "files",
     "blockedIPs": [
-        "192.168.1.3",
-        "147.116.48.158"
     ],
     "allowedIPs": [
         "127.0.0.1"
diff --git a/handlers.go b/handlers.go
index d4d9ae4..39905d1 100644
--- a/handlers.go
+++ b/handlers.go
@@ -18,7 +18,7 @@ func ImageShow(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	imageName := vars["imageName"]
 
-	file, err := ioutil.ReadFile(imageName)
+	file, err := ioutil.ReadFile(config.Folder + "/" + imageName)
 	if err != nil {
 		fmt.Fprintln(w, err)
 	}
@@ -63,5 +63,5 @@ func NewImage(w http.ResponseWriter, r *http.Request) {
 		fmt.Println(err)
 	}
 
-	fmt.Fprintln(w, "url:", fileName)
+	fmt.Fprintln(w, config.ServerIP+":"+config.ServerPort+"/images/"+fileName)
 }
diff --git a/main.go b/main.go
index 5a08f94..9ff41d2 100644
--- a/main.go
+++ b/main.go
@@ -12,5 +12,5 @@ func main() {
 
 	router := NewRouter()
 
-	log.Fatal(http.ListenAndServe(":3050", router))
+	log.Fatal(http.ListenAndServe(":"+config.ServerPort, router))
 }
diff --git a/readConfig.go b/readConfig.go
index 234a329..2ce4319 100644
--- a/readConfig.go
+++ b/readConfig.go
@@ -7,6 +7,8 @@ import (
 )
 
 type Config struct {
+	ServerIP   string   `json:"serverIP"`
+	ServerPort string   `json:"serverPort"`
 	Folder     string   `json:"foldIPs`
 	BlockedIPs []string `json:"blockedIPs"`
 	AllowedIPs []string `json:"allowedIPs"`