From a91a13fa1f4d272ef52d8d7b07c0f762dc23885a Mon Sep 17 00:00:00 2001 From: Nazar Kanaev Date: Sun, 28 Jun 2020 17:48:09 +0100 Subject: [PATCH] refactoring --- server/handlers.go | 12 ++++++------ server/server.go | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/server/handlers.go b/server/handlers.go index 6d5f9fc..ea47987 100644 --- a/server/handlers.go +++ b/server/handlers.go @@ -9,7 +9,7 @@ import ( "mime" ) -func Index(rw http.ResponseWriter, req *http.Request) { +func IndexHandler(rw http.ResponseWriter, req *http.Request) { fmt.Println(os.Getwd()) f, err := os.Open("template/index.html") if err != nil { @@ -22,7 +22,7 @@ func Index(rw http.ResponseWriter, req *http.Request) { } -func Static(rw http.ResponseWriter, req *http.Request) { +func StaticHandler(rw http.ResponseWriter, req *http.Request) { path := "template/static/" + Vars(req)["path"] f, err := os.Open(path) if err != nil { @@ -34,14 +34,14 @@ func Static(rw http.ResponseWriter, req *http.Request) { io.Copy(rw, f) } -func FolderList(rw http.ResponseWriter, req *http.Request) { +func FolderListHandler(rw http.ResponseWriter, req *http.Request) { } -func Folder(rw http.ResponseWriter, req *http.Request) { +func FolderHandler(rw http.ResponseWriter, req *http.Request) { } -func FeedList(rw http.ResponseWriter, req *http.Request) { +func FeedListHandler(rw http.ResponseWriter, req *http.Request) { } -func Feed(rw http.ResponseWriter, req *http.Request) { +func FeedHandler(rw http.ResponseWriter, req *http.Request) { } diff --git a/server/server.go b/server/server.go index f9cbbe4..6718a45 100644 --- a/server/server.go +++ b/server/server.go @@ -32,12 +32,12 @@ func p(path string, handler func(http.ResponseWriter, *http.Request)) Route { } var routes []Route = []Route{ - p("/", Index), - p("/static/*path", Static), - p("/api/folders", FolderList), - p("/api/folders/:id", Folder), - p("/api/feeds", FeedList), - p("/api/feeds/:id", Feed), + p("/", IndexHandler), + p("/static/*path", StaticHandler), + p("/api/folders", FolderListHandler), + p("/api/folders/:id", FolderHandler), + p("/api/feeds", FeedListHandler), + p("/api/feeds/:id", FeedHandler), } func Vars(req *http.Request) map[string]string {