From 565a62b769b76a300316cfe4f9f1a218df6604ab Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 19 Mar 2025 12:00:50 -0700 Subject: [PATCH] Fix --- models/repo/repo.go | 6 ++++- models/repo/wiki_test.go | 4 +-- modules/gitrepo/wiki.go | 46 --------------------------------- routers/web/repo/wiki.go | 10 +++---- routers/web/repo/wiki_test.go | 2 +- services/mirror/mirror_pull.go | 4 +-- services/mirror/mirror_push.go | 6 ++--- services/repository/delete.go | 4 +-- services/repository/transfer.go | 5 ++-- services/wiki/wiki.go | 6 ++--- services/wiki/wiki_test.go | 2 +- 11 files changed, 27 insertions(+), 68 deletions(-) delete mode 100644 modules/gitrepo/wiki.go diff --git a/models/repo/repo.go b/models/repo/repo.go index a8732f60bf..972828aa4c 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -219,6 +219,10 @@ func RelativePath(ownerName, repoName string) string { return strings.ToLower(ownerName) + "/" + strings.ToLower(repoName) + ".git" } +func RelativeWikiPath(ownerName, repoName string) string { + return strings.ToLower(ownerName) + "/" + strings.ToLower(repoName) + ".wiki.git" +} + // RelativePath should be an unix style path like username/reponame.git func (repo *Repository) RelativePath() string { return RelativePath(repo.OwnerName, repo.Name) @@ -232,7 +236,7 @@ func (sr StorageRepo) RelativePath() string { } func (repo *Repository) WikiStorageRepo() StorageRepo { - return StorageRepo(strings.ToLower(repo.OwnerName) + "/" + strings.ToLower(repo.Name) + ".wiki.git") + return StorageRepo(RelativeWikiPath(repo.OwnerName, repo.Name)) } // SanitizedOriginalURL returns a sanitized OriginalURL diff --git a/models/repo/wiki_test.go b/models/repo/wiki_test.go index 54f1fd4665..cfb398ab59 100644 --- a/models/repo/wiki_test.go +++ b/models/repo/wiki_test.go @@ -40,12 +40,12 @@ func TestRepository_WikiPath(t *testing.T) { func TestRepository_HasWiki(t *testing.T) { unittest.PrepareTestEnv(t) repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - exist, err := gitrepo.IsWikiRepositoryExist(t.Context(), repo1) + exist, err := gitrepo.IsRepositoryExist(t.Context(), repo1.WikiStorageRepo()) assert.NoError(t, err) assert.True(t, exist) repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}) - exist, err = gitrepo.IsWikiRepositoryExist(t.Context(), repo2) + exist, err = gitrepo.IsRepositoryExist(t.Context(), repo2.WikiStorageRepo()) assert.NoError(t, err) assert.False(t, exist) } diff --git a/modules/gitrepo/wiki.go b/modules/gitrepo/wiki.go deleted file mode 100644 index 86636f1281..0000000000 --- a/modules/gitrepo/wiki.go +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2025 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package gitrepo - -import ( - "context" - "fmt" - "path/filepath" - "strings" - - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" -) - -func absWikiPath(owner, name string) string { - return filepath.Join(setting.RepoRootPath, strings.ToLower(owner), strings.ToLower(name)+".wiki.git") -} - -func wikiPath(repo Repository) string { - return absWikiPath(repo.GetOwnerName(), repo.GetName()) -} - -func OpenWikiRepository(ctx context.Context, repo Repository) (*git.Repository, error) { - return git.OpenRepository(ctx, wikiPath(repo)) -} - -// IsWikiRepositoryExist returns true if the repository directory exists in the disk -func IsWikiRepositoryExist(ctx context.Context, repo Repository) (bool, error) { - return util.IsDir(wikiPath(repo)) -} - -// RenameRepository renames a repository's name on disk -func RenameWikiRepository(ctx context.Context, repo Repository, newName string) error { - newRepoPath := absWikiPath(repo.GetOwnerName(), newName) - if err := util.Rename(wikiPath(repo), newRepoPath); err != nil { - return fmt.Errorf("rename repository directory: %w", err) - } - return nil -} - -// DeleteWikiRepository deletes the repository directory from the disk -func DeleteWikiRepository(ctx context.Context, repo Repository) error { - return util.RemoveAll(wikiPath(repo)) -} diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index dbdf64ac51..da84df2279 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -557,7 +557,7 @@ func Wiki(ctx *context.Context) { return } - hasWiki, err := gitrepo.IsWikiRepositoryExist(ctx, ctx.Repo.Repository) + hasWiki, err := gitrepo.IsRepositoryExist(ctx, ctx.Repo.Repository.WikiStorageRepo()) if err != nil { ctx.ServerError("IsWikiRepositoryExist", err) return @@ -603,7 +603,7 @@ func Wiki(ctx *context.Context) { func WikiRevision(ctx *context.Context) { ctx.Data["CanWriteWiki"] = ctx.Repo.CanWrite(unit.TypeWiki) && !ctx.Repo.Repository.IsArchived - hasWiki, err := gitrepo.IsWikiRepositoryExist(ctx, ctx.Repo.Repository) + hasWiki, err := gitrepo.IsRepositoryExist(ctx, ctx.Repo.Repository.WikiStorageRepo()) if err != nil { ctx.ServerError("IsWikiRepositoryExist", err) return @@ -644,7 +644,7 @@ func WikiRevision(ctx *context.Context) { // WikiPages render wiki pages list page func WikiPages(ctx *context.Context) { - hasWiki, err := gitrepo.IsWikiRepositoryExist(ctx, ctx.Repo.Repository) + hasWiki, err := gitrepo.IsRepositoryExist(ctx, ctx.Repo.Repository.WikiStorageRepo()) if err != nil { ctx.ServerError("IsWikiRepositoryExist", err) return @@ -768,7 +768,7 @@ func WikiRaw(ctx *context.Context) { func NewWiki(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.wiki.new_page") - hasWiki, err := gitrepo.IsWikiRepositoryExist(ctx, ctx.Repo.Repository) + hasWiki, err := gitrepo.IsRepositoryExist(ctx, ctx.Repo.Repository.WikiStorageRepo()) if err != nil { ctx.ServerError("IsWikiRepositoryExist", err) return @@ -826,7 +826,7 @@ func NewWikiPost(ctx *context.Context) { func EditWiki(ctx *context.Context) { ctx.Data["PageIsWikiEdit"] = true - hasWiki, err := gitrepo.IsWikiRepositoryExist(ctx, ctx.Repo.Repository) + hasWiki, err := gitrepo.IsRepositoryExist(ctx, ctx.Repo.Repository.WikiStorageRepo()) if err != nil { ctx.ServerError("IsWikiRepositoryExist", err) return diff --git a/routers/web/repo/wiki_test.go b/routers/web/repo/wiki_test.go index 51b38b46bc..0f4d394eff 100644 --- a/routers/web/repo/wiki_test.go +++ b/routers/web/repo/wiki_test.go @@ -241,7 +241,7 @@ func TestDefaultWikiBranch(t *testing.T) { // repo with no wiki repoWithNoWiki := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}) - exist, err := gitrepo.IsWikiRepositoryExist(db.DefaultContext, repoWithNoWiki) + exist, err := gitrepo.IsRepositoryExist(db.DefaultContext, repoWithNoWiki.WikiStorageRepo()) assert.NoError(t, err) assert.False(t, exist) assert.NoError(t, wiki_service.ChangeDefaultWikiBranch(db.DefaultContext, repoWithNoWiki, "main")) diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index 362aa5f7bd..92c9e5332b 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -52,7 +52,7 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error return err } - hasWiki, err := gitrepo.IsWikiRepositoryExist(ctx, m.Repo) + hasWiki, err := gitrepo.IsRepositoryExist(ctx, m.Repo.WikiStorageRepo()) if err != nil { return err } @@ -353,7 +353,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo log.Error("SyncMirrors [repo: %-v]: failed to update size for mirror repository: %v", m.Repo.FullName(), err) } - hasWiki, err := gitrepo.IsWikiRepositoryExist(ctx, m.Repo) + hasWiki, err := gitrepo.IsRepositoryExist(ctx, m.Repo.WikiStorageRepo()) if err != nil { log.Error("SyncMirrors [repo: %-v]: failed to check if wiki repository exists: %v", m.Repo.FullName(), err) } diff --git a/services/mirror/mirror_push.go b/services/mirror/mirror_push.go index ae8cd3b4fd..7e0300fbb6 100644 --- a/services/mirror/mirror_push.go +++ b/services/mirror/mirror_push.go @@ -47,7 +47,7 @@ func AddPushMirrorRemote(ctx context.Context, m *repo_model.PushMirror, addr str return err } - hasWiki, err := gitrepo.IsWikiRepositoryExist(ctx, m.Repo) + hasWiki, err := gitrepo.IsRepositoryExist(ctx, m.Repo.WikiStorageRepo()) if err != nil { return err } @@ -72,7 +72,7 @@ func RemovePushMirrorRemote(ctx context.Context, m *repo_model.PushMirror) error return err } - hasWiki, err := gitrepo.IsWikiRepositoryExist(ctx, m.Repo) + hasWiki, err := gitrepo.IsRepositoryExist(ctx, m.Repo.WikiStorageRepo()) if err != nil { return err } @@ -191,7 +191,7 @@ func runPushSync(ctx context.Context, m *repo_model.PushMirror) error { return err } - hasWiki, err := gitrepo.IsWikiRepositoryExist(ctx, m.Repo) + hasWiki, err := gitrepo.IsRepositoryExist(ctx, m.Repo.WikiStorageRepo()) if err != nil { return err } diff --git a/services/repository/delete.go b/services/repository/delete.go index 1610854353..160ea4513b 100644 --- a/services/repository/delete.go +++ b/services/repository/delete.go @@ -298,8 +298,8 @@ func DeleteRepositoryDirectly(ctx context.Context, doer *user_model.User, repoID } } - // Remove wiki files - if err := gitrepo.DeleteWikiRepository(ctx, repo); err != nil { + // Remove wiki files if it exists. + if err := gitrepo.DeleteRepository(ctx, repo.WikiStorageRepo()); err != nil { desc := fmt.Sprintf("Delete wiki repository files [%s]: %v", repo.FullName(), err) // Note we use the db.DefaultContext here rather than passing in a context as the context may be cancelled if err = system_model.CreateNotice(db.DefaultContext, system_model.NoticeRepository, desc); err != nil { diff --git a/services/repository/transfer.go b/services/repository/transfer.go index cf0cba0b76..3814136735 100644 --- a/services/repository/transfer.go +++ b/services/repository/transfer.go @@ -341,13 +341,14 @@ func changeRepositoryName(ctx context.Context, repo *repo_model.Repository, newR return fmt.Errorf("rename repository directory: %w", err) } - isExist, err := gitrepo.IsWikiRepositoryExist(ctx, repo) + isExist, err := gitrepo.IsRepositoryExist(ctx, repo.WikiStorageRepo()) if err != nil { log.Error("Unable to check if the wiki of %s exists. Error: %v", repo.FullName(), err) return err } if isExist { - if err = gitrepo.RenameWikiRepository(ctx, repo, newRepoName); err != nil { + if err = gitrepo.RenameRepository(ctx, repo.WikiStorageRepo(), repo_model.StorageRepo( + repo_model.RelativeWikiPath(repo.OwnerName, newRepoName))); err != nil { return fmt.Errorf("rename repository wiki: %w", err) } } diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index 0bbe0c6b50..ed467b02e7 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -35,7 +35,7 @@ func getWikiWorkingLockKey(repoID int64) string { // InitWiki initializes a wiki for repository, // it does nothing when repository already has wiki. func InitWiki(ctx context.Context, repo *repo_model.Repository) error { - if exist, err := gitrepo.IsWikiRepositoryExist(ctx, repo); err != nil { + if exist, err := gitrepo.IsRepositoryExist(ctx, repo.WikiStorageRepo()); err != nil { return err } else if exist { return nil @@ -365,7 +365,7 @@ func DeleteWiki(ctx context.Context, repo *repo_model.Repository) error { return err } - if err := gitrepo.DeleteWikiRepository(ctx, repo); err != nil { + if err := gitrepo.DeleteRepository(ctx, repo.WikiStorageRepo()); err != nil { desc := fmt.Sprintf("Delete wiki repository files [%s]: %v", repo.FullName(), err) // Note we use the db.DefaultContext here rather than passing in a context as the context may be cancelled if err = system_model.CreateNotice(db.DefaultContext, system_model.NoticeRepository, desc); err != nil { @@ -386,7 +386,7 @@ func ChangeDefaultWikiBranch(ctx context.Context, repo *repo_model.Repository, n return fmt.Errorf("unable to update database: %w", err) } - if exist, err := gitrepo.IsWikiRepositoryExist(ctx, repo); err != nil { + if exist, err := gitrepo.IsRepositoryExist(ctx, repo.WikiStorageRepo()); err != nil { return err } else if !exist { return nil diff --git a/services/wiki/wiki_test.go b/services/wiki/wiki_test.go index 9fe464bf48..b7e55b31d5 100644 --- a/services/wiki/wiki_test.go +++ b/services/wiki/wiki_test.go @@ -149,7 +149,7 @@ func TestRepository_InitWiki(t *testing.T) { // repo2 does not already have a wiki repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}) assert.NoError(t, InitWiki(git.DefaultContext, repo2)) - exist, err := gitrepo.IsWikiRepositoryExist(git.DefaultContext, repo2) + exist, err := gitrepo.IsRepositoryExist(git.DefaultContext, repo2.WikiStorageRepo()) assert.NoError(t, err) assert.True(t, exist) }