Skip to content

Commit 0880969

Browse files
lunnylunny
committed
Some improvements
1 parent e4a41a8 commit 0880969

File tree

11 files changed

+31
-32
lines changed

11 files changed

+31
-32
lines changed

‎modules/repository/temp.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022 The Gitea Authors. All rights reserved.
1+
// Copyright 2019 The Gitea Authors. All rights reserved.
22
// Use of this source code is governed by a MIT-style
33
// license that can be found in the LICENSE file.
44

@@ -12,6 +12,7 @@ import (
1212

1313
"code.gitea.io/gitea/modules/log"
1414
"code.gitea.io/gitea/modules/setting"
15+
"code.gitea.io/gitea/modules/util"
1516
)
1617

1718
// LocalCopyPath returns the local repository temporary copy path.
@@ -36,3 +37,11 @@ func CreateTemporaryPath(prefix string) (string, error) {
3637
}
3738
return basePath, nil
3839
}
40+
41+
// RemoveTemporaryPath removes the temporary path
42+
func RemoveTemporaryPath(basePath string) error {
43+
if _, err := os.Stat(basePath); !os.IsNotExist(err) {
44+
return util.RemoveAll(basePath)
45+
}
46+
return nil
47+
}

‎modules/util/remove.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,6 @@ func RemoveAll(name string) error {
7171
return err
7272
}
7373

74-
// RemoveTemporaryPath removes the temporary path
75-
func RemoveTemporaryPath(basePath string) error {
76-
if _, err := os.Stat(basePath); !os.IsNotExist(err) {
77-
return RemoveAll(basePath)
78-
}
79-
return nil
80-
}
81-
8274
// Rename renames (moves) oldpath to newpath with at most 5 attempts.
8375
func Rename(oldpath, newpath string) error {
8476
var err error

‎routers/init.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func mustInitCtx(ctx context.Context, fn func(ctx context.Context) error) {
7373
func InitGitServices() {
7474
setting.NewServices()
7575
mustInit(storage.Init)
76-
mustInit(repo_service.NewContext)
76+
mustInit(repo_service.Init)
7777
}
7878

7979
func syncAppPathForGit(ctx context.Context) error {
@@ -140,7 +140,7 @@ func GlobalInitInstalled(ctx context.Context) {
140140
mustInit(oauth2.Init)
141141

142142
models.NewRepoContext()
143-
mustInit(repo_service.NewContext)
143+
mustInit(repo_service.Init)
144144

145145
// Booting long running goroutines.
146146
cron.NewContext(ctx)

‎routers/web/repo/lfs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func LFSLocks(ctx *context.Context) {
111111
return
112112
}
113113
defer func() {
114-
if err := util.RemoveTemporaryPath(tmpBasePath); err != nil {
114+
if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
115115
log.Error("LFSLocks: RemoveTemporaryPath: %v", err)
116116
}
117117
}()

‎services/pull/merge.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
repo_module "code.gitea.io/gitea/modules/repository"
3131
"code.gitea.io/gitea/modules/setting"
3232
"code.gitea.io/gitea/modules/timeutil"
33-
"code.gitea.io/gitea/modules/util"
3433
asymkey_service "code.gitea.io/gitea/services/asymkey"
3534
issue_service "code.gitea.io/gitea/services/issue"
3635
)
@@ -143,7 +142,7 @@ func rawMerge(ctx context.Context, pr *models.PullRequest, doer *user_model.User
143142
return "", err
144143
}
145144
defer func() {
146-
if err := util.RemoveTemporaryPath(tmpBasePath); err != nil {
145+
if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
147146
log.Error("Merge: RemoveTemporaryPath: %s", err)
148147
}
149148
}()

‎services/pull/patch.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"code.gitea.io/gitea/modules/graceful"
2121
"code.gitea.io/gitea/modules/log"
2222
"code.gitea.io/gitea/modules/process"
23+
repo_module "code.gitea.io/gitea/modules/repository"
2324
"code.gitea.io/gitea/modules/util"
2425

2526
"github.com/gobwas/glob"
@@ -64,7 +65,7 @@ func TestPatch(pr *models.PullRequest) error {
6465
return err
6566
}
6667
defer func() {
67-
if err := util.RemoveTemporaryPath(tmpBasePath); err != nil {
68+
if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
6869
log.Error("Merge: RemoveTemporaryPath: %s", err)
6970
}
7071
}()

‎services/pull/temp_repo.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"code.gitea.io/gitea/modules/git"
1818
"code.gitea.io/gitea/modules/log"
1919
repo_module "code.gitea.io/gitea/modules/repository"
20-
"code.gitea.io/gitea/modules/util"
2120
)
2221

2322
// createTemporaryRepo creates a temporary repo with "base" for pr.BaseBranch and "tracking" for pr.HeadBranch
@@ -59,7 +58,7 @@ func createTemporaryRepo(ctx context.Context, pr *models.PullRequest) (string, e
5958

6059
if err := git.InitRepository(ctx, tmpBasePath, false); err != nil {
6160
log.Error("git init tmpBasePath: %v", err)
62-
if err := util.RemoveTemporaryPath(tmpBasePath); err != nil {
61+
if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
6362
log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
6463
}
6564
return "", err
@@ -87,7 +86,7 @@ func createTemporaryRepo(ctx context.Context, pr *models.PullRequest) (string, e
8786

8887
if err := addCacheRepo(tmpBasePath, baseRepoPath); err != nil {
8988
log.Error("Unable to add base repository to temporary repo [%s -> %s]: %v", pr.BaseRepo.FullName(), tmpBasePath, err)
90-
if err := util.RemoveTemporaryPath(tmpBasePath); err != nil {
89+
if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
9190
log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
9291
}
9392
return "", fmt.Errorf("Unable to add base repository to temporary repo [%s -> tmpBasePath]: %v", pr.BaseRepo.FullName(), err)
@@ -101,7 +100,7 @@ func createTemporaryRepo(ctx context.Context, pr *models.PullRequest) (string, e
101100
Stderr: &errbuf,
102101
}); err != nil {
103102
log.Error("Unable to add base repository as origin [%s -> %s]: %v\n%s\n%s", pr.BaseRepo.FullName(), tmpBasePath, err, outbuf.String(), errbuf.String())
104-
if err := util.RemoveTemporaryPath(tmpBasePath); err != nil {
103+
if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
105104
log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
106105
}
107106
return "", fmt.Errorf("Unable to add base repository as origin [%s -> tmpBasePath]: %v\n%s\n%s", pr.BaseRepo.FullName(), err, outbuf.String(), errbuf.String())
@@ -116,7 +115,7 @@ func createTemporaryRepo(ctx context.Context, pr *models.PullRequest) (string, e
116115
Stderr: &errbuf,
117116
}); err != nil {
118117
log.Error("Unable to fetch origin base branch [%s:%s -> base, original_base in %s]: %v:\n%s\n%s", pr.BaseRepo.FullName(), pr.BaseBranch, tmpBasePath, err, outbuf.String(), errbuf.String())
119-
if err := util.RemoveTemporaryPath(tmpBasePath); err != nil {
118+
if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
120119
log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
121120
}
122121
return "", fmt.Errorf("Unable to fetch origin base branch [%s:%s -> base, original_base in tmpBasePath]: %v\n%s\n%s", pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
@@ -131,7 +130,7 @@ func createTemporaryRepo(ctx context.Context, pr *models.PullRequest) (string, e
131130
Stderr: &errbuf,
132131
}); err != nil {
133132
log.Error("Unable to set HEAD as base branch [%s]: %v\n%s\n%s", tmpBasePath, err, outbuf.String(), errbuf.String())
134-
if err := util.RemoveTemporaryPath(tmpBasePath); err != nil {
133+
if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
135134
log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
136135
}
137136
return "", fmt.Errorf("Unable to set HEAD as base branch [tmpBasePath]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
@@ -141,7 +140,7 @@ func createTemporaryRepo(ctx context.Context, pr *models.PullRequest) (string, e
141140

142141
if err := addCacheRepo(tmpBasePath, headRepoPath); err != nil {
143142
log.Error("Unable to add head repository to temporary repo [%s -> %s]: %v", pr.HeadRepo.FullName(), tmpBasePath, err)
144-
if err := util.RemoveTemporaryPath(tmpBasePath); err != nil {
143+
if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
145144
log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
146145
}
147146
return "", fmt.Errorf("Unable to head base repository to temporary repo [%s -> tmpBasePath]: %v", pr.HeadRepo.FullName(), err)
@@ -154,7 +153,7 @@ func createTemporaryRepo(ctx context.Context, pr *models.PullRequest) (string, e
154153
Stderr: &errbuf,
155154
}); err != nil {
156155
log.Error("Unable to add head repository as head_repo [%s -> %s]: %v\n%s\n%s", pr.HeadRepo.FullName(), tmpBasePath, err, outbuf.String(), errbuf.String())
157-
if err := util.RemoveTemporaryPath(tmpBasePath); err != nil {
156+
if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
158157
log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
159158
}
160159
return "", fmt.Errorf("Unable to add head repository as head_repo [%s -> tmpBasePath]: %v\n%s\n%s", pr.HeadRepo.FullName(), err, outbuf.String(), errbuf.String())
@@ -178,7 +177,7 @@ func createTemporaryRepo(ctx context.Context, pr *models.PullRequest) (string, e
178177
Stdout: &outbuf,
179178
Stderr: &errbuf,
180179
}); err != nil {
181-
if err := util.RemoveTemporaryPath(tmpBasePath); err != nil {
180+
if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
182181
log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
183182
}
184183
if !git.IsBranchExist(ctx, pr.HeadRepo.RepoPath(), pr.HeadBranch) {

‎services/pull/update.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
user_model "code.gitea.io/gitea/models/user"
1515
"code.gitea.io/gitea/modules/git"
1616
"code.gitea.io/gitea/modules/log"
17-
"code.gitea.io/gitea/modules/util"
17+
repo_module "code.gitea.io/gitea/modules/repository"
1818
)
1919

2020
// Update updates pull request with base branch.
@@ -155,7 +155,7 @@ func GetDiverging(ctx context.Context, pr *models.PullRequest) (*git.DivergeObje
155155
return nil, err
156156
}
157157
defer func() {
158-
if err := util.RemoveTemporaryPath(tmpRepo); err != nil {
158+
if err := repo_module.RemoveTemporaryPath(tmpRepo); err != nil {
159159
log.Error("Merge: RemoveTemporaryPath: %s", err)
160160
}
161161
}()

‎services/repository/files/temp_repo.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"code.gitea.io/gitea/modules/log"
2222
repo_module "code.gitea.io/gitea/modules/repository"
2323
"code.gitea.io/gitea/modules/setting"
24-
"code.gitea.io/gitea/modules/util"
2524
asymkey_service "code.gitea.io/gitea/services/asymkey"
2625
"code.gitea.io/gitea/services/gitdiff"
2726
)
@@ -47,7 +46,7 @@ func NewTemporaryUploadRepository(ctx context.Context, repo *repo_model.Reposito
4746
// Close the repository cleaning up all files
4847
func (t *TemporaryUploadRepository) Close() {
4948
defer t.gitRepo.Close()
50-
if err := util.RemoveTemporaryPath(t.basePath); err != nil {
49+
if err := repo_module.RemoveTemporaryPath(t.basePath); err != nil {
5150
log.Error("Failed to remove temporary path %s: %v", t.basePath, err)
5251
}
5352
}

‎services/repository/repository.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ func PushCreateRepo(authUser, owner *user_model.User, repoName string) (*repo_mo
7878
return repo, nil
7979
}
8080

81-
// NewContext start repository service
82-
func NewContext() error {
81+
// Init start repository service
82+
func Init() error {
8383
repo_module.LoadRepoConfig()
8484
admin_model.RemoveAllWithNotice(db.DefaultContext, "Clean up temporary repository uploads", setting.Repository.Upload.TempPath)
8585
admin_model.RemoveAllWithNotice(db.DefaultContext, "Clean up temporary repositories", repo_module.LocalCopyPath())

‎services/wiki/wiki.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func updateUncycloPage(ctx context.Context, doer *user_model.User, repo *repo_model
138138
return err
139139
}
140140
defer func() {
141-
if err := util.RemoveTemporaryPath(basePath); err != nil {
141+
if err := repo_module.RemoveTemporaryPath(basePath); err != nil {
142142
log.Error("Merge: RemoveTemporaryPath: %s", err)
143143
}
144144
}()
@@ -292,7 +292,7 @@ func DeleteUncycloPage(ctx context.Context, doer *user_model.User, repo *repo_model
292292
return err
293293
}
294294
defer func() {
295-
if err := util.RemoveTemporaryPath(basePath); err != nil {
295+
if err := repo_module.RemoveTemporaryPath(basePath); err != nil {
296296
log.Error("Merge: RemoveTemporaryPath: %s", err)
297297
}
298298
}()

0 commit comments

Comments
 (0)