Skip to content

Commit 01a7674

Browse files
strkstrk
authored
Merge pull request #110 from strk/MixedCaseConst
Use MixedCase constant names
2 parents 5d430c9 + b7bf9df commit 01a7674

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+398
-398
lines changed

‎cmd/serve.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ func parseCmd(cmd string) (string, string) {
6464

6565
var (
6666
allowedCommands = map[string]models.AccessMode{
67-
"git-upload-pack": models.ACCESS_MODE_READ,
68-
"git-upload-archive": models.ACCESS_MODE_READ,
69-
"git-receive-pack": models.ACCESS_MODE_WRITE,
67+
"git-upload-pack": models.AccessModeRead,
68+
"git-upload-archive": models.AccessModeRead,
69+
"git-receive-pack": models.AccessModeWrite,
7070
}
7171
)
7272

@@ -191,7 +191,7 @@ func runServ(c *cli.Context) error {
191191
}
192192

193193
// Prohibit push to mirror repositories.
194-
if requestedMode > models.ACCESS_MODE_READ && repo.IsMirror {
194+
if requestedMode > models.AccessModeRead && repo.IsMirror {
195195
fail("mirror repository is read-only", "")
196196
}
197197

@@ -200,7 +200,7 @@ func runServ(c *cli.Context) error {
200200
keyID int64
201201
user *models.User
202202
)
203-
if requestedMode == models.ACCESS_MODE_WRITE || repo.IsPrivate {
203+
if requestedMode == models.AccessModeWrite || repo.IsPrivate {
204204
keys := strings.Split(c.Args()[0], "-")
205205
if len(keys) != 2 {
206206
fail("Key ID format error", "Invalid key argument: %s", c.Args()[0])
@@ -213,7 +213,7 @@ func runServ(c *cli.Context) error {
213213
keyID = key.ID
214214

215215
// Check deploy key or user key.
216-
if key.Type == models.KEY_TYPE_DEPLOY {
216+
if key.Type == models.KeyTypeDeploy {
217217
if key.Mode < requestedMode {
218218
fail("Key permission denied", "Cannot push with deployment key: %d", key.ID)
219219
}
@@ -243,7 +243,7 @@ func runServ(c *cli.Context) error {
243243
fail("Internal error", "Fail to check access: %v", err)
244244
} else if mode < requestedMode {
245245
clientMessage := accessDenied
246-
if mode >= models.ACCESS_MODE_READ {
246+
if mode >= models.AccessModeRead {
247247
clientMessage = "You do not have sufficient authorization for this action"
248248
}
249249
fail(clientMessage,
@@ -276,7 +276,7 @@ func runServ(c *cli.Context) error {
276276
fail("Internal error", "Failed to execute git command: %v", err)
277277
}
278278

279-
if requestedMode == models.ACCESS_MODE_WRITE {
279+
if requestedMode == models.AccessModeWrite {
280280
handleUpdateTask(uuid, user, repoUser, reponame, isUncyclo)
281281
}
282282

‎models/access.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ import (
1313
type AccessMode int
1414

1515
const (
16-
ACCESS_MODE_NONE AccessMode = iota // 0
17-
ACCESS_MODE_READ // 1
18-
ACCESS_MODE_WRITE // 2
19-
ACCESS_MODE_ADMIN // 3
20-
ACCESS_MODE_OWNER // 4
16+
AccessModeNone AccessMode = iota // 0
17+
AccessModeRead // 1
18+
AccessModeWrite // 2
19+
AccessModeAdmin // 3
20+
AccessModeOwner // 4
2121
)
2222

2323
func (mode AccessMode) String() string {
2424
switch mode {
25-
case ACCESS_MODE_READ:
25+
case AccessModeRead:
2626
return "read"
27-
case ACCESS_MODE_WRITE:
27+
case AccessModeWrite:
2828
return "write"
29-
case ACCESS_MODE_ADMIN:
29+
case AccessModeAdmin:
3030
return "admin"
31-
case ACCESS_MODE_OWNER:
31+
case AccessModeOwner:
3232
return "owner"
3333
default:
3434
return "none"
@@ -39,11 +39,11 @@ func (mode AccessMode) String() string {
3939
func ParseAccessMode(permission string) AccessMode {
4040
switch permission {
4141
case "write":
42-
return ACCESS_MODE_WRITE
42+
return AccessModeWrite
4343
case "admin":
44-
return ACCESS_MODE_ADMIN
44+
return AccessModeAdmin
4545
default:
46-
return ACCESS_MODE_READ
46+
return AccessModeRead
4747
}
4848
}
4949

@@ -58,17 +58,17 @@ type Access struct {
5858
}
5959

6060
func accessLevel(e Engine, u *User, repo *Repository) (AccessMode, error) {
61-
mode := ACCESS_MODE_NONE
61+
mode := AccessModeNone
6262
if !repo.IsPrivate {
63-
mode = ACCESS_MODE_READ
63+
mode = AccessModeRead
6464
}
6565

6666
if u == nil {
6767
return mode, nil
6868
}
6969

7070
if u.ID == repo.OwnerID {
71-
return ACCESS_MODE_OWNER, nil
71+
return AccessModeOwner, nil
7272
}
7373

7474
a := &Access{UserID: u.ID, RepoID: repo.ID}
@@ -135,7 +135,7 @@ func (user *User) GetAccessibleRepositories(limit int) (repos []*Repository, _ e
135135
}
136136

137137
func maxAccessMode(modes ...AccessMode) AccessMode {
138-
max := ACCESS_MODE_NONE
138+
max := AccessModeNone
139139
for _, mode := range modes {
140140
if mode > max {
141141
max = mode
@@ -146,9 +146,9 @@ func maxAccessMode(modes ...AccessMode) AccessMode {
146146

147147
// FIXME: do corss-comparison so reduce deletions and additions to the minimum?
148148
func (repo *Repository) refreshAccesses(e Engine, accessMap map[int64]AccessMode) (err error) {
149-
minMode := ACCESS_MODE_READ
149+
minMode := AccessModeRead
150150
if !repo.IsPrivate {
151-
minMode = ACCESS_MODE_WRITE
151+
minMode = AccessModeWrite
152152
}
153153

154154
newAccesses := make([]Access, 0, len(accessMap))
@@ -212,7 +212,7 @@ func (repo *Repository) recalculateTeamAccesses(e Engine, ignTeamID int64) (err
212212
// Owner team gets owner access, and skip for teams that do not
213213
// have relations with repository.
214214
if t.IsOwnerTeam() {
215-
t.Authorize = ACCESS_MODE_OWNER
215+
t.Authorize = AccessModeOwner
216216
} else if !t.hasRepository(e, repo.ID) {
217217
continue
218218
}

‎models/action.go

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@ import (
2727
type ActionType int
2828

2929
const (
30-
ACTION_CREATE_REPO ActionType = iota + 1 // 1
31-
ACTION_RENAME_REPO // 2
32-
ACTION_STAR_REPO // 3
33-
ACTION_WATCH_REPO // 4
34-
ACTION_COMMIT_REPO // 5
35-
ACTION_CREATE_ISSUE // 6
36-
ACTION_CREATE_PULL_REQUEST // 7
37-
ACTION_TRANSFER_REPO // 8
38-
ACTION_PUSH_TAG // 9
39-
ACTION_COMMENT_ISSUE // 10
40-
ACTION_MERGE_PULL_REQUEST // 11
41-
ACTION_CLOSE_ISSUE // 12
42-
ACTION_REOPEN_ISSUE // 13
43-
ACTION_CLOSE_PULL_REQUEST // 14
44-
ACTION_REOPEN_PULL_REQUEST // 15
30+
ActionCreateRepo ActionType = iota + 1 // 1
31+
ActionRenameRepo // 2
32+
ActionStarRepo // 3
33+
ActionWatchRepo // 4
34+
ActionCommitRepo // 5
35+
ActionCreateIssue // 6
36+
ActionCreatePullRequest // 7
37+
ActionTransferRepo // 8
38+
ActionPushTag // 9
39+
ActionCommentIssue // 10
40+
ActionMergePullRequest // 11
41+
ActionCloseIssue // 12
42+
ActionReopenIssue // 13
43+
ActionClosePullRequest // 14
44+
ActionReopenPullRequest // 15
4545
)
4646

4747
var (
@@ -176,7 +176,7 @@ func newRepoAction(e Engine, u *User, repo *Repository) (err error) {
176176
if err = notifyWatchers(e, &Action{
177177
ActUserID: u.ID,
178178
ActUserName: u.Name,
179-
OpType: ACTION_CREATE_REPO,
179+
OpType: ActionCreateRepo,
180180
RepoID: repo.ID,
181181
RepoUserName: repo.Owner.Name,
182182
RepoName: repo.Name,
@@ -198,7 +198,7 @@ func renameRepoAction(e Engine, actUser *User, oldRepoName string, repo *Reposit
198198
if err = notifyWatchers(e, &Action{
199199
ActUserID: actUser.ID,
200200
ActUserName: actUser.Name,
201-
OpType: ACTION_RENAME_REPO,
201+
OpType: ActionRenameRepo,
202202
RepoID: repo.ID,
203203
RepoUserName: repo.Owner.Name,
204204
RepoName: repo.Name,
@@ -454,10 +454,10 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
454454
}
455455

456456
isNewBranch := false
457-
opType := ACTION_COMMIT_REPO
457+
opType := ActionCommitRepo
458458
// Check it's tag push or branch.
459459
if strings.HasPrefix(opts.RefFullName, git.TAG_PREFIX) {
460-
opType = ACTION_PUSH_TAG
460+
opType = ActionPushTag
461461
opts.Commits = &PushCommits{}
462462
} else {
463463
// if not the first commit, set the compare URL.
@@ -503,8 +503,8 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
503503
apiPusher := pusher.APIFormat()
504504
apiRepo := repo.APIFormat(nil)
505505
switch opType {
506-
case ACTION_COMMIT_REPO: // Push
507-
if err = PrepareWebhooks(repo, HOOK_EVENT_PUSH, &api.PushPayload{
506+
case ActionCommitRepo: // Push
507+
if err = PrepareWebhooks(repo, HookEventPush, &api.PushPayload{
508508
Ref: opts.RefFullName,
509509
Before: opts.OldCommitID,
510510
After: opts.NewCommitID,
@@ -518,16 +518,16 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
518518
}
519519

520520
if isNewBranch {
521-
return PrepareWebhooks(repo, HOOK_EVENT_CREATE, &api.CreatePayload{
521+
return PrepareWebhooks(repo, HookEventCreate, &api.CreatePayload{
522522
Ref: refName,
523523
RefType: "branch",
524524
Repo: apiRepo,
525525
Sender: apiPusher,
526526
})
527527
}
528528

529-
case ACTION_PUSH_TAG: // Create
530-
return PrepareWebhooks(repo, HOOK_EVENT_CREATE, &api.CreatePayload{
529+
case ActionPushTag: // Create
530+
return PrepareWebhooks(repo, HookEventCreate, &api.CreatePayload{
531531
Ref: refName,
532532
RefType: "tag",
533533
Repo: apiRepo,
@@ -542,7 +542,7 @@ func transferRepoAction(e Engine, doer, oldOwner *User, repo *Repository) (err e
542542
if err = notifyWatchers(e, &Action{
543543
ActUserID: doer.ID,
544544
ActUserName: doer.Name,
545-
OpType: ACTION_TRANSFER_REPO,
545+
OpType: ActionTransferRepo,
546546
RepoID: repo.ID,
547547
RepoUserName: repo.Owner.Name,
548548
RepoName: repo.Name,
@@ -572,7 +572,7 @@ func mergePullRequestAction(e Engine, doer *User, repo *Repository, issue *Issue
572572
return notifyWatchers(e, &Action{
573573
ActUserID: doer.ID,
574574
ActUserName: doer.Name,
575-
OpType: ACTION_MERGE_PULL_REQUEST,
575+
OpType: ActionMergePullRequest,
576576
Content: fmt.Sprintf("%d|%s", issue.Index, issue.Title),
577577
RepoID: repo.ID,
578578
RepoUserName: repo.Owner.Name,

‎models/admin.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
type NoticeType int
2323

2424
const (
25-
NOTICE_REPOSITORY NoticeType = iota + 1
25+
NoticeRepository NoticeType = iota + 1
2626
)
2727

2828
// Notice represents a system notice for admin.
@@ -65,9 +65,9 @@ func CreateNotice(tp NoticeType, desc string) error {
6565
return err
6666
}
6767

68-
// CreateRepositoryNotice creates new system notice with type NOTICE_REPOSITORY.
68+
// CreateRepositoryNotice creates new system notice with type NoticeRepository.
6969
func CreateRepositoryNotice(desc string) error {
70-
return CreateNotice(NOTICE_REPOSITORY, desc)
70+
return CreateNotice(NoticeRepository, desc)
7171
}
7272

7373
// RemoveAllWithNotice removes all directories in given path and

0 commit comments

Comments
 (0)