Skip to content

Commit 99bc452

Browse files
lunnylunny
committed
Move and rename UpdateRepository
1 parent 8c9d2bd commit 99bc452

File tree

9 files changed

+160
-172
lines changed

9 files changed

+160
-172
lines changed

‎modules/repository/create.go

-102
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,9 @@ import (
88
"fmt"
99
"os"
1010
"path/filepath"
11-
"strings"
1211

13-
activities_model "code.gitea.io/gitea/models/activities"
14-
"code.gitea.io/gitea/models/db"
1512
git_model "code.gitea.io/gitea/models/git"
16-
access_model "code.gitea.io/gitea/models/perm/access"
1713
repo_model "code.gitea.io/gitea/models/repo"
18-
issue_indexer "code.gitea.io/gitea/modules/indexer/issues"
19-
"code.gitea.io/gitea/modules/log"
20-
api "code.gitea.io/gitea/modules/structs"
21-
"code.gitea.io/gitea/modules/util"
2214
)
2315

2416
const notRegularFileMode = os.ModeSymlink | os.ModeNamedPipe | os.ModeSocket | os.ModeDevice | os.ModeCharDevice | os.ModeIrregular
@@ -63,97 +55,3 @@ func UpdateRepoSize(ctx context.Context, repo *repo_model.Repository) error {
6355

6456
return repo_model.UpdateRepoSize(ctx, repo.ID, size, lfsSize)
6557
}
66-
67-
// CheckDaemonExportOK creates/removes git-daemon-export-ok for git-daemon...
68-
func CheckDaemonExportOK(ctx context.Context, repo *repo_model.Repository) error {
69-
if err := repo.LoadOwner(ctx); err != nil {
70-
return err
71-
}
72-
73-
// Create/Remove git-daemon-export-ok for git-daemon...
74-
daemonExportFile := filepath.Join(repo.RepoPath(), `git-daemon-export-ok`)
75-
76-
isExist, err := util.IsExist(daemonExportFile)
77-
if err != nil {
78-
log.Error("Unable to check if %s exists. Error: %v", daemonExportFile, err)
79-
return err
80-
}
81-
82-
isPublic := !repo.IsPrivate && repo.Owner.Visibility == api.VisibleTypePublic
83-
if !isPublic && isExist {
84-
if err = util.Remove(daemonExportFile); err != nil {
85-
log.Error("Failed to remove %s: %v", daemonExportFile, err)
86-
}
87-
} else if isPublic && !isExist {
88-
if f, err := os.Create(daemonExportFile); err != nil {
89-
log.Error("Failed to create %s: %v", daemonExportFile, err)
90-
} else {
91-
f.Close()
92-
}
93-
}
94-
95-
return nil
96-
}
97-
98-
// UpdateRepository updates a repository with db context
99-
func UpdateRepository(ctx context.Context, repo *repo_model.Repository, visibilityChanged bool) (err error) {
100-
repo.LowerName = strings.ToLower(repo.Name)
101-
102-
e := db.GetEngine(ctx)
103-
104-
if _, err = e.ID(repo.ID).AllCols().Update(repo); err != nil {
105-
return fmt.Errorf("update: %w", err)
106-
}
107-
108-
if err = UpdateRepoSize(ctx, repo); err != nil {
109-
log.Error("Failed to update size for repository: %v", err)
110-
}
111-
112-
if visibilityChanged {
113-
if err = repo.LoadOwner(ctx); err != nil {
114-
return fmt.Errorf("LoadOwner: %w", err)
115-
}
116-
if repo.Owner.IsOrganization() {
117-
// Organization repository need to recalculate access table when visibility is changed.
118-
if err = access_model.RecalculateTeamAccesses(ctx, repo, 0); err != nil {
119-
return fmt.Errorf("recalculateTeamAccesses: %w", err)
120-
}
121-
}
122-
123-
// If repo has become private, we need to set its actions to private.
124-
if repo.IsPrivate {
125-
_, err = e.Where("repo_id = ?", repo.ID).Cols("is_private").Update(&activities_model.Action{
126-
IsPrivate: true,
127-
})
128-
if err != nil {
129-
return err
130-
}
131-
132-
if err = repo_model.ClearRepoStars(ctx, repo.ID); err != nil {
133-
return err
134-
}
135-
}
136-
137-
// Create/Remove git-daemon-export-ok for git-daemon...
138-
if err := CheckDaemonExportOK(ctx, repo); err != nil {
139-
return err
140-
}
141-
142-
forkRepos, err := repo_model.GetRepositoriesByForkID(ctx, repo.ID)
143-
if err != nil {
144-
return fmt.Errorf("getRepositoriesByForkID: %w", err)
145-
}
146-
for i := range forkRepos {
147-
forkRepos[i].IsPrivate = repo.IsPrivate || repo.Owner.Visibility == api.VisibleTypePrivate
148-
if err = UpdateRepository(ctx, forkRepos[i], true); err != nil {
149-
return fmt.Errorf("updateRepository[%d]: %w", forkRepos[i].ID, err)
150-
}
151-
}
152-
153-
// If visibility is changed, we need to update the issue indexer.
154-
// Since the data in the issue indexer have field to indicate if the repo is public or not.
155-
issue_indexer.UpdateRepoIndexer(ctx, repo.ID)
156-
}
157-
158-
return nil
159-
}

‎modules/repository/create_test.go

-21
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,13 @@ package repository
66
import (
77
"testing"
88

9-
activities_model "code.gitea.io/gitea/models/activities"
109
"code.gitea.io/gitea/models/db"
1110
repo_model "code.gitea.io/gitea/models/repo"
1211
"code.gitea.io/gitea/models/unittest"
1312

1413
"github.com/stretchr/testify/assert"
1514
)
1615

17-
func TestUpdateRepositoryVisibilityChanged(t *testing.T) {
18-
assert.NoError(t, unittest.PrepareTestDatabase())
19-
20-
// Get sample repo and change visibility
21-
repo, err := repo_model.GetRepositoryByID(db.DefaultContext, 9)
22-
assert.NoError(t, err)
23-
repo.IsPrivate = true
24-
25-
// Update it
26-
err = UpdateRepository(db.DefaultContext, repo, true)
27-
assert.NoError(t, err)
28-
29-
// Check visibility of action has become private
30-
act := activities_model.Action{}
31-
_, err = db.GetEngine(db.DefaultContext).ID(3).Get(&act)
32-
33-
assert.NoError(t, err)
34-
assert.True(t, act.IsPrivate)
35-
}
36-
3716
func TestGetDirectorySize(t *testing.T) {
3817
assert.NoError(t, unittest.PrepareTestDatabase())
3918
repo, err := repo_model.GetRepositoryByID(db.DefaultContext, 1)

‎services/repository/adopt.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func AdoptRepository(ctx context.Context, doer, u *user_model.User, opts CreateR
8484
return fmt.Errorf("adoptRepository: %w", err)
8585
}
8686

87-
if err := repo_module.CheckDaemonExportOK(ctx, repo); err != nil {
87+
if err := checkDaemonExportOK(ctx, repo); err != nil {
8888
return fmt.Errorf("checkDaemonExportOK: %w", err)
8989
}
9090

@@ -192,7 +192,7 @@ func adoptRepository(ctx context.Context, repo *repo_model.Repository, defaultBr
192192
return fmt.Errorf("setDefaultBranch: %w", err)
193193
}
194194
}
195-
if err = repo_module.UpdateRepository(ctx, repo, false); err != nil {
195+
if err = updateRepository(ctx, repo, false); err != nil {
196196
return fmt.Errorf("updateRepository: %w", err)
197197
}
198198

‎services/repository/create.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,9 @@ func initRepository(ctx context.Context, u *user_model.User, repo *repo_model.Re
192192
}
193193
}
194194

195-
if err = UpdateRepository(ctx, repo, false); err != nil {
196-
return fmt.Errorf("updateRepository: %w", err)
197-
}
198-
199-
return nil
195+
return db.WithTx(ctx, func(ctx context.Context) error {
196+
return updateRepository(ctx, repo, false)
197+
})
200198
}
201199

202200
// CreateRepositoryDirectly creates a repository for the user/organization.
@@ -294,7 +292,7 @@ func CreateRepositoryDirectly(ctx context.Context, doer, u *user_model.User, opt
294292
}
295293
}
296294

297-
if err := repo_module.CheckDaemonExportOK(ctx, repo); err != nil {
295+
if err := checkDaemonExportOK(ctx, repo); err != nil {
298296
return fmt.Errorf("checkDaemonExportOK: %w", err)
299297
}
300298

‎services/repository/fork.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork
160160
return fmt.Errorf("git clone: %w", err)
161161
}
162162

163-
if err := repo_module.CheckDaemonExportOK(txCtx, repo); err != nil {
163+
if err := checkDaemonExportOK(txCtx, repo); err != nil {
164164
return fmt.Errorf("checkDaemonExportOK: %w", err)
165165
}
166166

@@ -235,7 +235,7 @@ func ConvertForkToNormalRepository(ctx context.Context, repo *repo_model.Reposit
235235
repo.IsFork = false
236236
repo.ForkID = 0
237237

238-
if err := repo_module.UpdateRepository(ctx, repo, false); err != nil {
238+
if err := updateRepository(ctx, repo, false); err != nil {
239239
log.Error("Unable to update repository %-v whilst converting from fork. Error: %v", repo, err)
240240
return err
241241
}

‎services/repository/generate.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"strings"
1616
"time"
1717

18+
"code.gitea.io/gitea/models/db"
1819
git_model "code.gitea.io/gitea/models/git"
1920
repo_model "code.gitea.io/gitea/models/repo"
2021
user_model "code.gitea.io/gitea/models/user"
@@ -284,11 +285,9 @@ func generateGitContent(ctx context.Context, repo, templateRepo, generateRepo *r
284285
if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
285286
return fmt.Errorf("setDefaultBranch: %w", err)
286287
}
287-
if err = UpdateRepository(ctx, repo, false); err != nil {
288-
return fmt.Errorf("updateRepository: %w", err)
289-
}
290-
291-
return nil
288+
return db.WithTx(ctx, func(ctx context.Context) error {
289+
return updateRepository(ctx, repo, false)
290+
})
292291
}
293292

294293
// GenerateGitContent generates git content from a template repository
@@ -366,7 +365,7 @@ func generateRepository(ctx context.Context, doer, owner *user_model.User, templ
366365
return generateRepo, err
367366
}
368367

369-
if err = repo_module.CheckDaemonExportOK(ctx, generateRepo); err != nil {
368+
if err = checkDaemonExportOK(ctx, generateRepo); err != nil {
370369
return generateRepo, fmt.Errorf("checkDaemonExportOK: %w", err)
371370
}
372371

‎services/repository/migrate.go

+11-3
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func MigrateRepositoryGitData(ctx context.Context, u *user_model.User,
118118
repo.Owner = u
119119
}
120120

121-
if err := repo_module.CheckDaemonExportOK(ctx, repo); err != nil {
121+
if err := checkDaemonExportOK(ctx, repo); err != nil {
122122
return repo, fmt.Errorf("checkDaemonExportOK: %w", err)
123123
}
124124

@@ -226,7 +226,9 @@ func MigrateRepositoryGitData(ctx context.Context, u *user_model.User,
226226
}
227227

228228
repo.IsMirror = true
229-
if err = UpdateRepository(ctx, repo, false); err != nil {
229+
if err := db.WithTx(ctx, func(ctx context.Context) error {
230+
return updateRepository(ctx, repo, false)
231+
}); err != nil {
230232
return nil, err
231233
}
232234

@@ -299,5 +301,11 @@ func CleanUpMigrateInfo(ctx context.Context, repo *repo_model.Repository) (*repo
299301
}
300302
}
301303

302-
return repo, UpdateRepository(ctx, repo, false)
304+
if err := db.WithTx(ctx, func(ctx context.Context) error {
305+
return updateRepository(ctx, repo, false)
306+
}); err != nil {
307+
return repo, fmt.Errorf("updateRepository: %w", err)
308+
}
309+
310+
return repo, nil
303311
}

0 commit comments

Comments
 (0)