Some refactors

Author: lunny

modules/gitrepo/gitrepo.go

@@ -5,6 +5,7 @@ package gitrepo
 
 import (
 	"context"
+	"fmt"
 	"io"
 	"path/filepath"
 	"strings"
@@ -20,8 +21,12 @@ type Repository interface {
 	GetOwnerName() string
 }
 
+func absPath(owner, name string) string {
+	return filepath.Join(setting.RepoRootPath, strings.ToLower(owner), strings.ToLower(name)+".git")
+}
+
 func repoPath(repo Repository) string {
-	return filepath.Join(setting.RepoRootPath, strings.ToLower(repo.GetOwnerName()), strings.ToLower(repo.GetName())+".git")
+	return absPath(repo.GetOwnerName(), repo.GetName())
 }
 
 func wikiPath(repo Repository) string {
@@ -79,3 +84,12 @@ func IsRepositoryExist(ctx context.Context, repo Repository) (bool, error) {
 func DeleteRepository(ctx context.Context, repo Repository) error {
 	return util.RemoveAll(repoPath(repo))
 }
+
+// RenameRepository renames a repository's name on disk
+func RenameRepository(ctx context.Context, repo Repository, newName string) error {
+	newRepoPath := absPath(repo.GetOwnerName(), newName)
+	if err := util.Rename(repoPath(repo), newRepoPath); err != nil {
+		return fmt.Errorf("rename repository directory: %w", err)
+	}
+	return nil
+}

services/repository/transfer.go

@@ -17,6 +17,7 @@ import (
 	project_model "code.gitea.io/gitea/models/project"
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/globallock"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/util"
@@ -335,8 +336,7 @@ func changeRepositoryName(ctx context.Context, repo *repo_model.Repository, newR
 		}
 	}
 
-	newRepoPath := repo_model.RepoPath(repo.Owner.Name, newRepoName)
-	if err = util.Rename(repo.RepoPath(), newRepoPath); err != nil {
+	if err = gitrepo.RenameRepository(ctx, repo, newRepoName); err != nil {
 		return fmt.Errorf("rename repository directory: %w", err)
 	}