Skip to content

Commit 33c51f2

Browse files
pratikjupratikju
committed
refactoring and linting
1 parent 138d428 commit 33c51f2

12 files changed

+68
-75
lines changed

‎api_handler.go

Lines changed: 32 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@ type Payload struct {
1717

1818
func rootHandler(w http.ResponseWriter, r *http.Request) {
1919
baseResp := BaseResponse{
20-
CreateRepositoryUrl: fmt.Sprintf(GetProtocol(config.SSLEnabled) + r.Host + GetRepoCreateUrl()),
21-
UserRepositoriesUrl: fmt.Sprintf(GetProtocol(config.SSLEnabled) + r.Host + GetReposUrl()),
22-
UserRepositoryUrl: fmt.Sprintf(GetProtocol(config.SSLEnabled) + r.Host + GetRepoUrl()),
23-
BranchesUrl: fmt.Sprintf(GetProtocol(config.SSLEnabled) + r.Host + GetBranchesUrl()+"{/branch-name}"),
20+
CreateRepositoryURL: fmt.Sprintf(GetProtocol(config.SSLEnabled) + r.Host + GetRepoCreateURL()),
21+
UserRepositoriesURL: fmt.Sprintf(GetProtocol(config.SSLEnabled) + r.Host + GetReposURL()),
22+
UserRepositoryURL: fmt.Sprintf(GetProtocol(config.SSLEnabled) + r.Host + GetRepoURL()),
23+
BranchesURL: fmt.Sprintf(GetProtocol(config.SSLEnabled) + r.Host + GetBranchesURL()+"{/branch-name}"),
2424
}
2525

26-
WriteIndentedJson(w, baseResp, "", " ")
26+
WriteIndentedJSON(w, baseResp, "", " ")
2727
}
2828

2929
func repoCreateHandler(w http.ResponseWriter, r *http.Request) {
3030
var resp CreateResponse
3131
resp.ResponseMessage = "Unknown error. Follow README"
32-
resp.CloneUrl = ""
32+
resp.CloneURL = ""
3333

3434
wd, _ := os.Getwd()
3535

3636
defer func() {
37-
WriteIndentedJson(w, resp, "", " ")
37+
WriteIndentedJSON(w, resp, "", " ")
3838
if err := os.Chdir(wd); err != nil {
3939
log.Println(err)
4040
}
@@ -45,26 +45,19 @@ func repoCreateHandler(w http.ResponseWriter, r *http.Request) {
4545
if err := decoder.Decode(&payload); err != nil {
4646
log.Println(err)
4747
return
48-
} else {
49-
if payload.Username == "" || payload.RepoName == "" {
50-
log.Println("Empty username or reponame")
51-
return
52-
}
48+
}
49+
if payload.Username == "" || payload.RepoName == "" {
50+
log.Println("Empty username or reponame")
51+
return
5352
}
5453

5554
usrPath := UserPath(payload.Username)
5655
bareRepo := FormatRepoName(payload.RepoName)
5756
url := FormCloneURL(r.Host, payload.Username, bareRepo)
5857

59-
// if _, err := os.Stat(RepoPath(payload.Username, payload.RepoName)); err == nil {
60-
// resp.ResponseMessage = fmt.Sprintf("repository already exists for %s", payload.Username)
61-
// resp.CloneUrl = url
62-
// return
63-
// }
64-
6558
if ok := IsExistingRepository(RepoPath(payload.Username, payload.RepoName)); ok {
6659
resp.ResponseMessage = fmt.Sprintf("repository already exists for %s", payload.Username)
67-
resp.CloneUrl = url
60+
resp.CloneURL = url
6861
return
6962
}
7063

@@ -81,7 +74,7 @@ func repoCreateHandler(w http.ResponseWriter, r *http.Request) {
8174
cmd := exec.Command(config.GitPath, "init", "--bare", bareRepo)
8275

8376
if err := cmd.Start(); err == nil {
84-
resp.CloneUrl = url
77+
resp.CloneURL = url
8578
resp.ResponseMessage = "repository created successfully"
8679
} else {
8780
resp.ResponseMessage = "error while creating new repository"
@@ -95,64 +88,64 @@ func repoCreateHandler(w http.ResponseWriter, r *http.Request) {
9588

9689
func repoIndexHandler(w http.ResponseWriter, r *http.Request) {
9790
userName, _, _ := GetParamValues(r)
98-
var errJson Error
91+
var errJSON Error
9992
list, ok := FindAllDir(UserPath(userName))
10093
if !ok {
101-
errJson = Error{Message: "repository not found"}
102-
WriteIndentedJson(w, errJson, "", " ")
94+
errJSON = Error{Message: "repository not found"}
95+
WriteIndentedJSON(w, errJSON, "", " ")
10396
return
10497
}
10598
var repo Repository
106-
repos := make([]Repository, 0)
99+
var repos []Repository
107100

108101
for i := 0; i < len(list); i++ {
109102
repo = GetRepository(r.Host, userName, list[i].Name())
110103
repos = append(repos, repo)
111104
}
112-
WriteIndentedJson(w, repos, "", " ")
105+
WriteIndentedJSON(w, repos, "", " ")
113106
}
114107

115108
func repoShowHandler(w http.ResponseWriter, r *http.Request) {
116-
var errJson Error
109+
var errJSON Error
117110
userName, repoName, _ := GetParamValues(r)
118111
if ok := IsExistingRepository(RepoPath(userName, repoName)); !ok {
119-
errJson = Error{Message: "repository not found"}
120-
WriteIndentedJson(w, errJson, "", " ")
112+
errJSON = Error{Message: "repository not found"}
113+
WriteIndentedJSON(w, errJSON, "", " ")
121114
return
122115
}
123116
repo := GetRepository(r.Host, userName, FormatRepoName(repoName))
124-
WriteIndentedJson(w, repo, "", " ")
117+
WriteIndentedJSON(w, repo, "", " ")
125118
}
126119

127120
func branchIndexHandler(w http.ResponseWriter, r *http.Request) {
128-
var errJson Error
121+
var errJSON Error
129122
userName, repoName, _ := GetParamValues(r)
130123
if ok := IsExistingRepository(RepoPath(userName, repoName)); !ok {
131-
errJson = Error{Message: "repository not found"}
132-
WriteIndentedJson(w, errJson, "", " ")
124+
errJSON = Error{Message: "repository not found"}
125+
WriteIndentedJSON(w, errJSON, "", " ")
133126
return
134127
}
135128
re, _ := git.OpenRepository(RepoPath(userName, repoName))
136129
branches, _ := GetBranches(re)
137-
WriteIndentedJson(w, branches, "", " ")
130+
WriteIndentedJSON(w, branches, "", " ")
138131
}
139132

140133
func branchShowHandler(w http.ResponseWriter, r *http.Request) {
141-
var errJson Error
134+
var errJSON Error
142135
userName, repoName, branchName := GetParamValues(r)
143136
if ok := IsExistingRepository(RepoPath(userName, repoName)); !ok {
144-
errJson = Error{Message: "repository not found"}
145-
WriteIndentedJson(w, errJson, "", " ")
137+
errJSON = Error{Message: "repository not found"}
138+
WriteIndentedJSON(w, errJSON, "", " ")
146139
return
147140
}
148141

149142
re, _ := git.OpenRepository(RepoPath(userName, repoName))
150143
branch, ok := GetBranchByName(branchName, re)
151144
if !ok {
152-
errJson = Error{Message: "branch not found"}
153-
WriteIndentedJson(w, errJson, "", " ")
145+
errJSON = Error{Message: "branch not found"}
146+
WriteIndentedJSON(w, errJSON, "", " ")
154147
return
155148
}
156149

157-
WriteIndentedJson(w, branch, "", " ")
150+
WriteIndentedJSON(w, branch, "", " ")
158151
}

‎api_utils.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
func FindAllDir(targetPath string) ([]os.FileInfo, bool) {
13-
list := make([]os.FileInfo, 0)
13+
var list []os.FileInfo
1414
var err error
1515
if list, err = ioutil.ReadDir(targetPath); err != nil {
1616
log.Println("Error finding repository:", err)
@@ -23,23 +23,23 @@ func FormCloneURL(host, userName, repoName string) string {
2323
return (fmt.Sprintf(GetProtocol(config.SSLEnabled) + host + "/" + userName + "/" + repoName))
2424
}
2525

26-
func GetRepoCreateUrl() string {
26+
func GetRepoCreateURL() string {
2727
return "/api/repos/create"
2828
}
2929

30-
func GetReposUrl() string {
30+
func GetReposURL() string {
3131
return "/api/{user-name}/repos"
3232
}
3333

34-
func GetRepoUrl() string {
34+
func GetRepoURL() string {
3535
return "/api/{user-name}/repos/{repo-name}"
3636
}
3737

38-
func GetBranchesUrl() string {
38+
func GetBranchesURL() string {
3939
return "/api/{user-name}/repos/{repo-name}/branches"
4040
}
4141

42-
func GetBranchUrl() string {
42+
func GetBranchURL() string {
4343
return "/api/{user-name}/repos/{repo-name}/branches/{branch-name}"
4444
}
4545

@@ -50,7 +50,7 @@ func GetProtocol(ssl bool) string {
5050
return "http://"
5151
}
5252

53-
func WriteIndentedJson(w io.Writer, v interface{}, prefix, indent string) {
53+
func WriteIndentedJSON(w io.Writer, v interface{}, prefix, indent string) {
5454
resp, _ := json.MarshalIndent(v, prefix, indent)
5555
w.Write(resp)
5656
w.Write([]byte("\n"))

‎basic_auth.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ func matchPassword(savedPwd string, sentPwd string) bool {
5555
func renderUnauthorized(w http.ResponseWriter, error string) {
5656
w.Header().Set("WWW-Authenticate", "Basic realm=\"\"")
5757
w.WriteHeader(http.StatusUnauthorized)
58-
errJson := Error{Message: error}
59-
WriteIndentedJson(w, errJson, "", " ")
58+
errJSON := Error{Message: error}
59+
WriteIndentedJSON(w, errJSON, "", " ")
6060
}

‎branch.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type Branch struct {
1313

1414
func GetBranches(repo *git.Repository) ([]Branch, error) {
1515
var branch Branch
16-
branches := make([]Branch, 0)
16+
var branches []Branch
1717

1818
itr, _ := repo.NewReferenceIterator()
1919
refs := getReferences(itr)
@@ -34,7 +34,7 @@ func GetBranches(repo *git.Repository) ([]Branch, error) {
3434

3535
func getReferences(itr *git.ReferenceIterator) []*git.Reference {
3636
var ref *git.Reference
37-
refs := make([]*git.Reference, 0)
37+
var refs []*git.Reference
3838
var err error
3939
for {
4040
ref, err = itr.Next()

‎commit.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ import (
66

77
type Commit struct {
88
Message string `json:"message"`
9-
Id string `json:"id"`
9+
ID string `json:"id"`
1010
ObjectType string `json:"object_type"`
1111
Author *git.Signature `json:"author"`
1212
}
1313

1414
func GetCommits(oid *git.Oid, revWalk *git.RevWalk) []Commit {
1515
var commit Commit
16-
commits := make([]Commit, 0)
16+
var commits []Commit
1717

1818
err := revWalk.Push(oid)
1919
if err != nil {
2020
return commits
2121
}
2222
f := func(c *git.Commit) bool {
23-
commit = Commit{Message: c.Summary(), Id: c.Id().String(), ObjectType: c.Type().String(), Author: c.Author()}
23+
commit = Commit{Message: c.Summary(), ID: c.Id().String(), ObjectType: c.Type().String(), Author: c.Author()}
2424
commits = append(commits, commit)
2525
return true
2626
}

‎receive_pack.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ func receivePackHandler(w http.ResponseWriter, r *http.Request) {
3232
}
3333
stdin.Write(reqBody)
3434

35-
content_type := "application/x-git-receive-pack-result"
36-
SetHeader(w, content_type)
35+
contentType := "application/x-git-receive-pack-result"
36+
SetHeader(w, contentType)
3737

3838
go io.Copy(w, stdout)
3939
go io.Copy(w, stderr)

‎repo.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ import (
77

88
type Repository struct {
99
Name string `json:"name"`
10-
CloneUrl string `json:"clone_url"`
10+
CloneURL string `json:"clone_url"`
1111
Owner string `json:"owner"`
12-
BranchesUrl string `json:"branches_url"`
12+
BranchesURL string `json:"branches_url"`
1313
}
1414

1515
func GetRepository(h, u, r string) Repository {
1616
var repo Repository
1717
rawRepoName := strings.Split(r, ".git")[0]
1818
repo = Repository{Name: rawRepoName,
19-
CloneUrl: FormCloneURL(h, u, r),
19+
CloneURL: FormCloneURL(h, u, r),
2020
Owner: u,
21-
BranchesUrl: fmt.Sprintf("%s/api/%s/repos/%s/branches{/branch-name}", GetProtocol(config.SSLEnabled)+h, u, rawRepoName),
21+
BranchesURL: fmt.Sprintf("%s/api/%s/repos/%s/branches{/branch-name}", GetProtocol(config.SSLEnabled)+h, u, rawRepoName),
2222
}
2323
return repo
2424
}

‎response.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package main
22

33
type BaseResponse struct {
4-
CreateRepositoryUrl string `json:"create_repo_url"`
5-
UserRepositoriesUrl string `json:"user_repositories_url"`
6-
UserRepositoryUrl string `json:"user_repository_url"`
7-
BranchesUrl string `json:"branches_url"`
4+
CreateRepositoryURL string `json:"create_repo_url"`
5+
UserRepositoriesURL string `json:"user_repositories_url"`
6+
UserRepositoryURL string `json:"user_repository_url"`
7+
BranchesURL string `json:"branches_url"`
88
}
99

1010
type CreateResponse struct {
1111
ResponseMessage string `json:"response_message"`
12-
CloneUrl string `json:"clone_url"`
12+
CloneURL string `json:"clone_url"`
1313
}

‎server.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ func attachHandler(r *mux.Router) {
3333

3434
//APIs handlers
3535
r.HandleFunc("/", rootHandler).Methods("GET")
36-
r.HandleFunc(GetRepoCreateUrl(), basicAuthentication(repoCreateHandler)).Methods("POST")
37-
r.HandleFunc(GetReposUrl(), repoIndexHandler).Methods("GET")
38-
r.HandleFunc(GetRepoUrl(), repoShowHandler).Methods("GET")
39-
r.HandleFunc(GetBranchesUrl(), branchIndexHandler).Methods("GET")
40-
r.HandleFunc(GetBranchUrl(), branchShowHandler).Methods("GET")
36+
r.HandleFunc(GetRepoCreateURL(), basicAuthentication(repoCreateHandler)).Methods("POST")
37+
r.HandleFunc(GetReposURL(), repoIndexHandler).Methods("GET")
38+
r.HandleFunc(GetRepoURL(), repoShowHandler).Methods("GET")
39+
r.HandleFunc(GetBranchesURL(), branchIndexHandler).Methods("GET")
40+
r.HandleFunc(GetBranchURL(), branchShowHandler).Methods("GET")
4141
}

‎server_utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ func FindService(r *http.Request) string {
2727
return service
2828
}
2929

30-
func SetHeader(w http.ResponseWriter, content_type string) {
30+
func SetHeader(w http.ResponseWriter, contentType string) {
3131
w.Header().Set("Expires", "Fri, 01 Jan 1980 00:00:00 GMT")
3232
w.Header().Set("Pragma", "no-cache")
3333
w.Header().Set("Cache-Control", "no-cache, max-age=0, must-revalidate")
34-
w.Header().Set("Content-Type", content_type)
34+
w.Header().Set("Content-Type", contentType)
3535
w.WriteHeader(http.StatusOK)
3636
}
3737

‎service.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func serviceHandler(w http.ResponseWriter, r *http.Request) {
3535
return
3636
}
3737

38-
content_type := fmt.Sprintf("application/x-git-%s-advertisement", service)
39-
SetHeader(w, content_type)
38+
contentType := fmt.Sprintf("application/x-git-%s-advertisement", service)
39+
SetHeader(w, contentType)
4040
w.Write([]byte(CreateFirstPKTLine(service)))
4141
go io.Copy(w, stdout)
4242
go io.Copy(w, stderr)

‎upload_pack.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ func uploadPackHandler(w http.ResponseWriter, r *http.Request) {
3232
}
3333
stdin.Write(reqBody)
3434

35-
content_type := "application/x-git-upload-pack-result"
36-
SetHeader(w, content_type)
35+
contentType := "application/x-git-upload-pack-result"
36+
SetHeader(w, contentType)
3737

3838
go io.Copy(w, stdout)
3939
go io.Copy(w, stderr)

0 commit comments

Comments
 (0)