From 86454f35d3f681d76cbacec9c5987cc09a056a4d Mon Sep 17 00:00:00 2001 From: Andrew Siegman Date: Sun, 22 Oct 2017 17:12:45 -0500 Subject: [PATCH 1/3] refactor New functions slightly --- private_server/private_server.go | 10 ++++------ public_server/public_server.go | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/private_server/private_server.go b/private_server/private_server.go index ea6d296..941ced8 100644 --- a/private_server/private_server.go +++ b/private_server/private_server.go @@ -16,12 +16,10 @@ type privateHost struct { } func NewPrivateHost() privateHost { - priv := privateHost{} - - priv.Auth = 1 // Handle Auth - priv.Directory = "private/" - - return priv + return privateHost{ + Auth: 1, + Directory: "private/", + } } func (priv *privateHost) ServeHTTP(w http.ResponseWriter, req *http.Request) { diff --git a/public_server/public_server.go b/public_server/public_server.go index d918490..16aecc5 100644 --- a/public_server/public_server.go +++ b/public_server/public_server.go @@ -15,11 +15,9 @@ type publicWeb struct { } func NewPublicWeb() publicWeb { - pub := publicWeb{} - - pub.Directory = "public/" - - return pub + return publicWeb{ + Directory: "public/", + } } func (pub *publicWeb) ServeHTTP(w http.ResponseWriter, req *http.Request) { From 03c97bfdfed9b70f1ca26a5d820622b033727c91 Mon Sep 17 00:00:00 2001 From: Andrew Siegman Date: Sun, 22 Oct 2017 17:13:44 -0500 Subject: [PATCH 2/3] export types PrivateHost and PublicWeb golint specifically advises: "exported func NewPublicWeb returns unexported type public_server.publicWeb, which can be annoying to use" --- private_server/private_server.go | 8 ++++---- public_server/public_server.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/private_server/private_server.go b/private_server/private_server.go index 941ced8..936d7f9 100644 --- a/private_server/private_server.go +++ b/private_server/private_server.go @@ -10,19 +10,19 @@ import ( "github.com/Ennovar/gPanel/general/routing" ) -type privateHost struct { +type PrivateHost struct { Auth int Directory string } -func NewPrivateHost() privateHost { - return privateHost{ +func NewPrivateHost() PrivateHost { + return PrivateHost{ Auth: 1, Directory: "private/", } } -func (priv *privateHost) ServeHTTP(w http.ResponseWriter, req *http.Request) { +func (priv *PrivateHost) ServeHTTP(w http.ResponseWriter, req *http.Request) { path := req.URL.Path[1:] path = (priv.Directory + path) diff --git a/public_server/public_server.go b/public_server/public_server.go index 16aecc5..be5aa86 100644 --- a/public_server/public_server.go +++ b/public_server/public_server.go @@ -10,17 +10,17 @@ import ( "github.com/Ennovar/gPanel/general/routing" ) -type publicWeb struct { +type PublicWeb struct { Directory string } -func NewPublicWeb() publicWeb { - return publicWeb{ +func NewPublicWeb() PublicWeb { + return PublicWeb{ Directory: "public/", } } -func (pub *publicWeb) ServeHTTP(w http.ResponseWriter, req *http.Request) { +func (pub *PublicWeb) ServeHTTP(w http.ResponseWriter, req *http.Request) { path := req.URL.Path[1:] path = (pub.Directory + path) From 12b45e7b004e8860927dd0cacf65482ae1146697 Mon Sep 17 00:00:00 2001 From: Andrew Siegman Date: Sun, 22 Oct 2017 17:18:17 -0500 Subject: [PATCH 3/3] add comments for New functions --- private_server/private_server.go | 1 + public_server/public_server.go | 1 + 2 files changed, 2 insertions(+) diff --git a/private_server/private_server.go b/private_server/private_server.go index 936d7f9..0e9fdd4 100644 --- a/private_server/private_server.go +++ b/private_server/private_server.go @@ -15,6 +15,7 @@ type PrivateHost struct { Directory string } +// NewPrivateHost returns a new PrivateHost type. func NewPrivateHost() PrivateHost { return PrivateHost{ Auth: 1, diff --git a/public_server/public_server.go b/public_server/public_server.go index be5aa86..9c6e535 100644 --- a/public_server/public_server.go +++ b/public_server/public_server.go @@ -14,6 +14,7 @@ type PublicWeb struct { Directory string } +// NewPublicWeb returns a new PublicWeb type. func NewPublicWeb() PublicWeb { return PublicWeb{ Directory: "public/",