Skip to content

Commit 153793b

Browse files
lunnylunny
committed
Use *Context
1 parent d52f451 commit 153793b

File tree

10 files changed

+47
-47
lines changed

10 files changed

+47
-47
lines changed

‎models/avatar.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func HashedAvatarLink(email string, size int) string {
9595
Hash: sum,
9696
}
9797
// OK we're going to open a session just because I think that that might hide away any problems with postgres reporting errors
98-
if err := db.WithTx(func(ctx db.Context) error {
98+
if err := db.WithTx(func(ctx *db.Context) error {
9999
has, err := ctx.Engine().Where("email = ? AND hash = ?", emailHash.Email, emailHash.Hash).Get(new(EmailHash))
100100
if has || err != nil {
101101
// Seriously we don't care about any DB problems just return the lowerEmail - we expect the transaction to fail most of the time

‎models/db/context.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -42,30 +42,30 @@ type Committer interface {
4242
}
4343

4444
// TxContext represents a transaction Context
45-
func TxContext() (Context, Committer, error) {
45+
func TxContext() (*Context, Committer, error) {
4646
sess := x.NewSession()
4747
if err := sess.Begin(); err != nil {
4848
sess.Close()
49-
return Context{}, nil, err
49+
return nil, nil, err
5050
}
5151

52-
return Context{sess}, sess, nil
52+
return &Context{sess}, sess, nil
5353
}
5454

5555
// WithContext represents executing database operations
56-
func WithContext(f func(ctx Context) error) error {
57-
return f(Context{x})
56+
func WithContext(f func(ctx *Context) error) error {
57+
return f(&Context{x})
5858
}
5959

6060
// WithTx represents executing database operations on a transaction
61-
func WithTx(f func(ctx Context) error) error {
61+
func WithTx(f func(ctx *Context) error) error {
6262
sess := x.NewSession()
6363
defer sess.Close()
6464
if err := sess.Begin(); err != nil {
6565
return err
6666
}
6767

68-
if err := f(Context{sess}); err != nil {
68+
if err := f(&Context{sess}); err != nil {
6969
return err
7070
}
7171

@@ -80,7 +80,7 @@ func Iterate(ctx *Context, tableBean interface{}, cond builder.Cond, fun func(id
8080
}
8181

8282
// Insert inserts records into database
83-
func Insert(ctx Context, beans ...interface{}) error {
83+
func Insert(ctx *Context, beans ...interface{}) error {
8484
_, err := ctx.e.Insert(beans...)
8585
return err
8686
}

‎modules/repository/adopt.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func AdoptRepository(doer, u *models.User, opts models.CreateRepoOptions) (*mode
4747
IsEmpty: !opts.AutoInit,
4848
}
4949

50-
if err := db.WithTx(func(ctx db.Context) error {
50+
if err := db.WithTx(func(ctx *db.Context) error {
5151
repoPath := models.RepoPath(u.Name, repo.Name)
5252
isExist, err := util.IsExist(repoPath)
5353
if err != nil {
@@ -61,16 +61,16 @@ func AdoptRepository(doer, u *models.User, opts models.CreateRepoOptions) (*mode
6161
}
6262
}
6363

64-
if err := models.CreateRepository(&ctx, doer, u, repo, true); err != nil {
64+
if err := models.CreateRepository(ctx, doer, u, repo, true); err != nil {
6565
return err
6666
}
67-
if err := adoptRepository(&ctx, repoPath, doer, repo, opts); err != nil {
67+
if err := adoptRepository(ctx, repoPath, doer, repo, opts); err != nil {
6868
return fmt.Errorf("createDelegateHooks: %v", err)
6969
}
7070

7171
// Initialize Issue Labels if selected
7272
if len(opts.IssueLabels) > 0 {
73-
if err := models.InitializeLabels(&ctx, repo.ID, opts.IssueLabels, false); err != nil {
73+
if err := models.InitializeLabels(ctx, repo.ID, opts.IssueLabels, false); err != nil {
7474
return fmt.Errorf("InitializeLabels: %v", err)
7575
}
7676
}

‎modules/repository/create.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ func CreateRepository(doer, u *models.User, opts models.CreateRepoOptions) (*mod
5555

5656
var rollbackRepo *models.Repository
5757

58-
if err := db.WithTx(func(ctx db.Context) error {
59-
if err := models.CreateRepository(&ctx, doer, u, repo, false); err != nil {
58+
if err := db.WithTx(func(ctx *db.Context) error {
59+
if err := models.CreateRepository(ctx, doer, u, repo, false); err != nil {
6060
return err
6161
}
6262

@@ -86,7 +86,7 @@ func CreateRepository(doer, u *models.User, opts models.CreateRepoOptions) (*mod
8686
}
8787
}
8888

89-
if err = initRepository(&ctx, repoPath, doer, repo, opts); err != nil {
89+
if err = initRepository(ctx, repoPath, doer, repo, opts); err != nil {
9090
if err2 := util.RemoveAll(repoPath); err2 != nil {
9191
log.Error("initRepository: %v", err)
9292
return fmt.Errorf(
@@ -97,7 +97,7 @@ func CreateRepository(doer, u *models.User, opts models.CreateRepoOptions) (*mod
9797

9898
// Initialize Issue Labels if selected
9999
if len(opts.IssueLabels) > 0 {
100-
if err = models.InitializeLabels(&ctx, repo.ID, opts.IssueLabels, false); err != nil {
100+
if err = models.InitializeLabels(ctx, repo.ID, opts.IssueLabels, false); err != nil {
101101
rollbackRepo = repo
102102
rollbackRepo.OwnerID = u.ID
103103
return fmt.Errorf("InitializeLabels: %v", err)

‎modules/repository/fork.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,17 @@ func ForkRepository(doer, owner *models.User, opts models.ForkRepoOptions) (_ *m
7979
panic(panicErr)
8080
}()
8181

82-
err = db.WithTx(func(ctx db.Context) error {
83-
if err = models.CreateRepository(&ctx, doer, owner, repo, false); err != nil {
82+
err = db.WithTx(func(ctx *db.Context) error {
83+
if err = models.CreateRepository(ctx, doer, owner, repo, false); err != nil {
8484
return err
8585
}
8686

87-
if err = models.IncrementRepoForkNum(&ctx, opts.BaseRepo.ID); err != nil {
87+
if err = models.IncrementRepoForkNum(ctx, opts.BaseRepo.ID); err != nil {
8888
return err
8989
}
9090

9191
// copy lfs files failure should not be ignored
92-
if err = models.CopyLFS(&ctx, repo, opts.BaseRepo); err != nil {
92+
if err = models.CopyLFS(ctx, repo, opts.BaseRepo); err != nil {
9393
return err
9494
}
9595

@@ -136,8 +136,8 @@ func ForkRepository(doer, owner *models.User, opts models.ForkRepoOptions) (_ *m
136136

137137
// ConvertForkToNormalRepository convert the provided repo from a forked repo to normal repo
138138
func ConvertForkToNormalRepository(repo *models.Repository) error {
139-
err := db.WithTx(func(ctx db.Context) error {
140-
repo, err := models.GetRepositoryByIDCtx(&ctx, repo.ID)
139+
err := db.WithTx(func(ctx *db.Context) error {
140+
repo, err := models.GetRepositoryByIDCtx(ctx, repo.ID)
141141
if err != nil {
142142
return err
143143
}
@@ -146,15 +146,15 @@ func ConvertForkToNormalRepository(repo *models.Repository) error {
146146
return nil
147147
}
148148

149-
if err := models.DecrementRepoForkNum(&ctx, repo.ForkID); err != nil {
149+
if err := models.DecrementRepoForkNum(ctx, repo.ForkID); err != nil {
150150
log.Error("Unable to decrement repo fork num for old root repo %d of repository %-v whilst converting from fork. Error: %v", repo.ForkID, repo, err)
151151
return err
152152
}
153153

154154
repo.IsFork = false
155155
repo.ForkID = 0
156156

157-
if err := models.UpdateRepositoryCtx(&ctx, repo, false); err != nil {
157+
if err := models.UpdateRepositoryCtx(ctx, repo, false); err != nil {
158158
log.Error("Unable to update repository %-v whilst converting from fork. Error: %v", repo, err)
159159
return err
160160
}

‎modules/repository/update.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import (
1717

1818
// PushUpdateAddDeleteTags updates a number of added and delete tags
1919
func PushUpdateAddDeleteTags(repo *models.Repository, gitRepo *git.Repository, addTags, delTags []string) error {
20-
return db.WithTx(func(ctx db.Context) error {
21-
if err := models.PushUpdateDeleteTagsContext(&ctx, repo, delTags); err != nil {
20+
return db.WithTx(func(ctx *db.Context) error {
21+
if err := models.PushUpdateDeleteTagsContext(ctx, repo, delTags); err != nil {
2222
return err
2323
}
24-
return pushUpdateAddTags(&ctx, repo, gitRepo, addTags)
24+
return pushUpdateAddTags(ctx, repo, gitRepo, addTags)
2525
})
2626
}
2727

‎services/archiver/archiver.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func doArchive(r *ArchiveRequest) (*models.RepoArchiver, error) {
104104
}
105105
defer commiter.Close()
106106

107-
archiver, err := models.GetRepoArchiver(&ctx, r.RepoID, r.Type, r.CommitID)
107+
archiver, err := models.GetRepoArchiver(ctx, r.RepoID, r.Type, r.CommitID)
108108
if err != nil {
109109
return nil, err
110110
}
@@ -122,7 +122,7 @@ func doArchive(r *ArchiveRequest) (*models.RepoArchiver, error) {
122122
CommitID: r.CommitID,
123123
Status: models.RepoArchiverGenerating,
124124
}
125-
if err := models.AddRepoArchiver(&ctx, archiver); err != nil {
125+
if err := models.AddRepoArchiver(ctx, archiver); err != nil {
126126
return nil, err
127127
}
128128
}
@@ -136,7 +136,7 @@ func doArchive(r *ArchiveRequest) (*models.RepoArchiver, error) {
136136
if err == nil {
137137
if archiver.Status == models.RepoArchiverGenerating {
138138
archiver.Status = models.RepoArchiverReady
139-
return archiver, models.UpdateRepoArchiverStatus(&ctx, archiver)
139+
return archiver, models.UpdateRepoArchiverStatus(ctx, archiver)
140140
}
141141
return archiver, nil
142142
}
@@ -202,7 +202,7 @@ func doArchive(r *ArchiveRequest) (*models.RepoArchiver, error) {
202202

203203
if archiver.Status == models.RepoArchiverGenerating {
204204
archiver.Status = models.RepoArchiverReady
205-
if err = models.UpdateRepoArchiverStatus(&ctx, archiver); err != nil {
205+
if err = models.UpdateRepoArchiverStatus(ctx, archiver); err != nil {
206206
return nil, err
207207
}
208208
}

‎services/attachment/attachment.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func NewAttachment(attach *models.Attachment, file io.Reader) (*models.Attachmen
2323
return nil, fmt.Errorf("attachment %s should belong to a repository", attach.Name)
2424
}
2525

26-
err := db.WithTx(func(ctx db.Context) error {
26+
err := db.WithTx(func(ctx *db.Context) error {
2727
attach.UUID = uuid.New().String()
2828
size, err := storage.Attachments.Save(attach.RelativePath(), file, -1)
2929
if err != nil {

‎services/release/release.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -195,18 +195,18 @@ func UpdateRelease(doer *models.User, gitRepo *git.Repository, rel *models.Relea
195195
}
196196
defer commiter.Close()
197197

198-
if err = models.UpdateRelease(&ctx, rel); err != nil {
198+
if err = models.UpdateRelease(ctx, rel); err != nil {
199199
return err
200200
}
201201

202-
if err = models.AddReleaseAttachments(&ctx, rel.ID, addAttachmentUUIDs); err != nil {
202+
if err = models.AddReleaseAttachments(ctx, rel.ID, addAttachmentUUIDs); err != nil {
203203
return fmt.Errorf("AddReleaseAttachments: %v", err)
204204
}
205205

206206
var deletedUUIDsMap = make(map[string]bool)
207207
if len(delAttachmentUUIDs) > 0 {
208208
// Check attachments
209-
attachments, err := models.GetAttachmentsByUUIDs(&ctx, delAttachmentUUIDs)
209+
attachments, err := models.GetAttachmentsByUUIDs(ctx, delAttachmentUUIDs)
210210
if err != nil {
211211
return fmt.Errorf("GetAttachmentsByUUIDs [uuids: %v]: %v", delAttachmentUUIDs, err)
212212
}
@@ -217,7 +217,7 @@ func UpdateRelease(doer *models.User, gitRepo *git.Repository, rel *models.Relea
217217
deletedUUIDsMap[attach.UUID] = true
218218
}
219219

220-
if _, err := models.DeleteAttachments(&ctx, attachments, false); err != nil {
220+
if _, err := models.DeleteAttachments(ctx, attachments, false); err != nil {
221221
return fmt.Errorf("DeleteAttachments [uuids: %v]: %v", delAttachmentUUIDs, err)
222222
}
223223
}
@@ -228,7 +228,7 @@ func UpdateRelease(doer *models.User, gitRepo *git.Repository, rel *models.Relea
228228
updateAttachmentsList = append(updateAttachmentsList, k)
229229
}
230230
// Check attachments
231-
attachments, err := models.GetAttachmentsByUUIDs(&ctx, updateAttachmentsList)
231+
attachments, err := models.GetAttachmentsByUUIDs(ctx, updateAttachmentsList)
232232
if err != nil {
233233
return fmt.Errorf("GetAttachmentsByUUIDs [uuids: %v]: %v", updateAttachmentsList, err)
234234
}
@@ -240,7 +240,7 @@ func UpdateRelease(doer *models.User, gitRepo *git.Repository, rel *models.Relea
240240

241241
for uuid, newName := range editAttachments {
242242
if !deletedUUIDsMap[uuid] {
243-
if err = models.UpdateAttachmentByUUID(&ctx, &models.Attachment{
243+
if err = models.UpdateAttachmentByUUID(ctx, &models.Attachment{
244244
UUID: uuid,
245245
Name: newName,
246246
}, "name"); err != nil {

‎services/repository/generate.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,50 +21,50 @@ func GenerateRepository(doer, owner *models.User, templateRepo *models.Repositor
2121
}
2222

2323
var generateRepo *models.Repository
24-
if err = db.WithTx(func(ctx db.Context) error {
25-
generateRepo, err = repo_module.GenerateRepository(&ctx, doer, owner, templateRepo, opts)
24+
if err = db.WithTx(func(ctx *db.Context) error {
25+
generateRepo, err = repo_module.GenerateRepository(ctx, doer, owner, templateRepo, opts)
2626
if err != nil {
2727
return err
2828
}
2929

3030
// Git Content
3131
if opts.GitContent && !templateRepo.IsEmpty {
32-
if err = repo_module.GenerateGitContent(&ctx, templateRepo, generateRepo); err != nil {
32+
if err = repo_module.GenerateGitContent(ctx, templateRepo, generateRepo); err != nil {
3333
return err
3434
}
3535
}
3636

3737
// Topics
3838
if opts.Topics {
39-
if err = models.GenerateTopics(&ctx, templateRepo, generateRepo); err != nil {
39+
if err = models.GenerateTopics(ctx, templateRepo, generateRepo); err != nil {
4040
return err
4141
}
4242
}
4343

4444
// Git Hooks
4545
if opts.GitHooks {
46-
if err = models.GenerateGitHooks(&ctx, templateRepo, generateRepo); err != nil {
46+
if err = models.GenerateGitHooks(ctx, templateRepo, generateRepo); err != nil {
4747
return err
4848
}
4949
}
5050

5151
// Webhooks
5252
if opts.Webhooks {
53-
if err = models.GenerateWebhooks(&ctx, templateRepo, generateRepo); err != nil {
53+
if err = models.GenerateWebhooks(ctx, templateRepo, generateRepo); err != nil {
5454
return err
5555
}
5656
}
5757

5858
// Avatar
5959
if opts.Avatar && len(templateRepo.Avatar) > 0 {
60-
if err = models.GenerateAvatar(&ctx, templateRepo, generateRepo); err != nil {
60+
if err = models.GenerateAvatar(ctx, templateRepo, generateRepo); err != nil {
6161
return err
6262
}
6363
}
6464

6565
// Issue Labels
6666
if opts.IssueLabels {
67-
if err = models.GenerateIssueLabels(&ctx, templateRepo, generateRepo); err != nil {
67+
if err = models.GenerateIssueLabels(ctx, templateRepo, generateRepo); err != nil {
6868
return err
6969
}
7070
}

0 commit comments

Comments
 (0)