Skip to content

Commit 9f7b042

Browse files
lunnylunny
committed
update
1 parent fd7c364 commit 9f7b042

File tree

7 files changed

+145
-156
lines changed

7 files changed

+145
-156
lines changed

‎modules/repository/create.go‎

Lines changed: 0 additions & 102 deletions
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‎

Lines changed: 0 additions & 21 deletions
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func adoptRepository(ctx context.Context, repo *repo_model.Repository, defaultBr
196196
return fmt.Errorf("setDefaultBranch: %w", err)
197197
}
198198
}
199-
if err = repo_module.UpdateRepository(ctx, repo, false); err != nil {
199+
if err = updateRepository(ctx, repo, false); err != nil {
200200
return fmt.Errorf("updateRepository: %w", err)
201201
}
202202

‎services/repository/create.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ func cleanupRepository(doer *user_model.User, repoID int64) {
469469
}
470470

471471
func updateGitRepoAfterCreate(ctx context.Context, repo *repo_model.Repository) error {
472-
if err := repo_module.CheckDaemonExportOK(ctx, repo); err != nil {
472+
if err := checkDaemonExportOK(ctx, repo); err != nil {
473473
return fmt.Errorf("checkDaemonExportOK: %w", err)
474474
}
475475

‎services/repository/fork.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ func ConvertForkToNormalRepository(ctx context.Context, repo *repo_model.Reposit
227227
repo.IsFork = false
228228
repo.ForkID = 0
229229

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

‎services/repository/repository.go‎

Lines changed: 121 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,28 @@ import (
77
"context"
88
"errors"
99
"fmt"
10+
"os"
11+
"path/filepath"
12+
"strings"
1013

14+
activities_model "code.gitea.io/gitea/models/activities"
1115
"code.gitea.io/gitea/models/db"
1216
"code.gitea.io/gitea/models/git"
1317
issues_model "code.gitea.io/gitea/models/issues"
1418
"code.gitea.io/gitea/models/organization"
19+
access_model "code.gitea.io/gitea/models/perm/access"
1520
repo_model "code.gitea.io/gitea/models/repo"
1621
system_model "code.gitea.io/gitea/models/system"
1722
"code.gitea.io/gitea/models/unit"
1823
user_model "code.gitea.io/gitea/models/user"
1924
"code.gitea.io/gitea/modules/graceful"
25+
issue_indexer "code.gitea.io/gitea/modules/indexer/issues"
2026
"code.gitea.io/gitea/modules/log"
2127
"code.gitea.io/gitea/modules/queue"
2228
repo_module "code.gitea.io/gitea/modules/repository"
2329
"code.gitea.io/gitea/modules/setting"
2430
"code.gitea.io/gitea/modules/structs"
31+
"code.gitea.io/gitea/modules/util"
2532
notify_service "code.gitea.io/gitea/services/notify"
2633
pull_service "code.gitea.io/gitea/services/pull"
2734
)
@@ -112,42 +119,32 @@ func Init(ctx context.Context) error {
112119

113120
// UpdateRepository updates a repository
114121
func UpdateRepository(ctx context.Context, repo *repo_model.Repository, visibilityChanged bool) (err error) {
115-
ctx, committer, err := db.TxContext(ctx)
116-
if err != nil {
117-
return err
118-
}
119-
defer committer.Close()
120-
121-
if err = repo_module.UpdateRepository(ctx, repo, visibilityChanged); err != nil {
122-
return fmt.Errorf("updateRepository: %w", err)
123-
}
124-
125-
return committer.Commit()
126-
}
127-
128-
func UpdateRepositoryVisibility(ctx context.Context, repo *repo_model.Repository, isPrivate bool) (err error) {
129-
ctx, committer, err := db.TxContext(ctx)
130-
if err != nil {
131-
return err
132-
}
133-
134-
defer committer.Close()
135-
136-
repo.IsPrivate = isPrivate
137-
138-
if err = repo_module.UpdateRepository(ctx, repo, true); err != nil {
139-
return fmt.Errorf("UpdateRepositoryVisibility: %w", err)
140-
}
141-
142-
return committer.Commit()
122+
return db.WithTx(ctx, func(ctx context.Context) error {
123+
if err = updateRepository(ctx, repo, visibilityChanged); err != nil {
124+
return fmt.Errorf("updateRepository: %w", err)
125+
}
126+
return nil
127+
})
143128
}
144129

145130
func MakeRepoPublic(ctx context.Context, repo *repo_model.Repository) (err error) {
146-
return UpdateRepositoryVisibility(ctx, repo, false)
131+
return db.WithTx(ctx, func(ctx context.Context) error {
132+
repo.IsPrivate = false
133+
if err = updateRepository(ctx, repo, true); err != nil {
134+
return fmt.Errorf("MakeRepoPublic: %w", err)
135+
}
136+
return nil
137+
})
147138
}
148139

149140
func MakeRepoPrivate(ctx context.Context, repo *repo_model.Repository) (err error) {
150-
return UpdateRepositoryVisibility(ctx, repo, true)
141+
return db.WithTx(ctx, func(ctx context.Context) error {
142+
repo.IsPrivate = true
143+
if err = updateRepository(ctx, repo, true); err != nil {
144+
return fmt.Errorf("MakeRepoPrivate: %w", err)
145+
}
146+
return nil
147+
})
151148
}
152149

153150
// LinkedRepository returns the linked repo if any
@@ -173,3 +170,97 @@ func LinkedRepository(ctx context.Context, a *repo_model.Attachment) (*repo_mode
173170
}
174171
return nil, -1, nil
175172
}
173+
174+
// checkDaemonExportOK creates/removes git-daemon-export-ok for git-daemon...
175+
func checkDaemonExportOK(ctx context.Context, repo *repo_model.Repository) error {
176+
if err := repo.LoadOwner(ctx); err != nil {
177+
return err
178+
}
179+
180+
// Create/Remove git-daemon-export-ok for git-daemon...
181+
daemonExportFile := filepath.Join(repo.RepoPath(), `git-daemon-export-ok`)
182+
183+
isExist, err := util.IsExist(daemonExportFile)
184+
if err != nil {
185+
log.Error("Unable to check if %s exists. Error: %v", daemonExportFile, err)
186+
return err
187+
}
188+
189+
isPublic := !repo.IsPrivate && repo.Owner.Visibility == structs.VisibleTypePublic
190+
if !isPublic && isExist {
191+
if err = util.Remove(daemonExportFile); err != nil {
192+
log.Error("Failed to remove %s: %v", daemonExportFile, err)
193+
}
194+
} else if isPublic && !isExist {
195+
if f, err := os.Create(daemonExportFile); err != nil {
196+
log.Error("Failed to create %s: %v", daemonExportFile, err)
197+
} else {
198+
f.Close()
199+
}
200+
}
201+
202+
return nil
203+
}
204+
205+
// updateRepository updates a repository with db context
206+
func updateRepository(ctx context.Context, repo *repo_model.Repository, visibilityChanged bool) (err error) {
207+
repo.LowerName = strings.ToLower(repo.Name)
208+
209+
e := db.GetEngine(ctx)
210+
211+
if _, err = e.ID(repo.ID).AllCols().Update(repo); err != nil {
212+
return fmt.Errorf("update: %w", err)
213+
}
214+
215+
if err = repo_module.UpdateRepoSize(ctx, repo); err != nil {
216+
log.Error("Failed to update size for repository: %v", err)
217+
}
218+
219+
if visibilityChanged {
220+
if err = repo.LoadOwner(ctx); err != nil {
221+
return fmt.Errorf("LoadOwner: %w", err)
222+
}
223+
if repo.Owner.IsOrganization() {
224+
// Organization repository need to recalculate access table when visibility is changed.
225+
if err = access_model.RecalculateTeamAccesses(ctx, repo, 0); err != nil {
226+
return fmt.Errorf("recalculateTeamAccesses: %w", err)
227+
}
228+
}
229+
230+
// If repo has become private, we need to set its actions to private.
231+
if repo.IsPrivate {
232+
_, err = e.Where("repo_id = ?", repo.ID).Cols("is_private").Update(&activities_model.Action{
233+
IsPrivate: true,
234+
})
235+
if err != nil {
236+
return err
237+
}
238+
239+
if err = repo_model.ClearRepoStars(ctx, repo.ID); err != nil {
240+
return err
241+
}
242+
}
243+
244+
// Create/Remove git-daemon-export-ok for git-daemon...
245+
if err := checkDaemonExportOK(ctx, repo); err != nil {
246+
return err
247+
}
248+
249+
forkRepos, err := repo_model.GetRepositoriesByForkID(ctx, repo.ID)
250+
if err != nil {
251+
return fmt.Errorf("getRepositoriesByForkID: %w", err)
252+
}
253+
for i := range forkRepos {
254+
forkRepos[i].IsPrivate = repo.IsPrivate || repo.Owner.Visibility == structs.VisibleTypePrivate
255+
if err = updateRepository(ctx, forkRepos[i], true); err != nil {
256+
return fmt.Errorf("updateRepository[%d]: %w", forkRepos[i].ID, err)
257+
}
258+
}
259+
260+
// If visibility is changed, we need to update the issue indexer.
261+
// Since the data in the issue indexer have field to indicate if the repo is public or not.
262+
issue_indexer.UpdateRepoIndexer(ctx, repo.ID)
263+
}
264+
265+
return nil
266+
}

‎services/repository/repository_test.go‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package repository
66
import (
77
"testing"
88

9+
activities_model "code.gitea.io/gitea/models/activities"
910
"code.gitea.io/gitea/models/db"
1011
repo_model "code.gitea.io/gitea/models/repo"
1112
"code.gitea.io/gitea/models/unit"
@@ -40,3 +41,23 @@ func TestLinkedRepository(t *testing.T) {
4041
})
4142
}
4243
}
44+
45+
func TestUpdateRepositoryVisibilityChanged(t *testing.T) {
46+
assert.NoError(t, unittest.PrepareTestDatabase())
47+
48+
// Get sample repo and change visibility
49+
repo, err := repo_model.GetRepositoryByID(db.DefaultContext, 9)
50+
assert.NoError(t, err)
51+
repo.IsPrivate = true
52+
53+
// Update it
54+
err = updateRepository(db.DefaultContext, repo, true)
55+
assert.NoError(t, err)
56+
57+
// Check visibility of action has become private
58+
act := activities_model.Action{}
59+
_, err = db.GetEngine(db.DefaultContext).ID(3).Get(&act)
60+
61+
assert.NoError(t, err)
62+
assert.True(t, act.IsPrivate)
63+
}

0 commit comments

Comments
 (0)