Some improvements

Author: lunny

routers/web/repo/tree.go

@@ -98,7 +98,7 @@ func Tree(ctx *context.Context) {
 	var results []*files_service.TreeViewNode
 	var err error
 	if !recursive {
-		results, err = files_service.GetTreeList(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo, ctx.Repo.TreePath, ctx.Repo.RefFullName, false)
+		results, err = files_service.GetTreeList(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo, ctx.Repo.TreePath, ctx.Repo.RefFullName)
 	} else {
 		results, err = files_service.GetTreeInformation(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo, ctx.Repo.TreePath, ctx.Repo.RefFullName)
 	}

services/repository/files/tree.go

@@ -235,7 +235,7 @@ Example 3: (path: d3/d3d1)
 	    "path": "d3/d3d1/d3d1f2"
 	}]
 */
-func GetTreeList(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, treePath string, ref git.RefName, recursive bool) ([]*TreeViewNode, error) {
+func GetTreeList(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, treePath string, ref git.RefName) ([]*TreeViewNode, error) {
 	if repo.IsEmpty {
 		return nil, nil
 	}
@@ -244,7 +244,7 @@ func GetTreeList(ctx context.Context, repo *repo_model.Repository, gitRepo *git.
 	}
 
 	// Check that the path given in opts.treePath is valid (not a git path)
-	cleanTreePath := CleanUploadFileName(treePath)
+	cleanTreePath := util.PathJoinRel(treePath)
 	if cleanTreePath == "" && treePath != "" {
 		return nil, ErrFilenameInvalid{
 			Path: treePath,
@@ -273,12 +273,8 @@ func GetTreeList(ctx context.Context, repo *repo_model.Repository, gitRepo *git.
 	if err != nil {
 		return nil, err
 	}
-	var entries git.Entries
-	if recursive {
-		entries, err = gitTree.ListEntriesRecursiveFast()
-	} else {
-		entries, err = gitTree.ListEntries()
-	}
+
+	entries, err := gitTree.ListEntries()
 	if err != nil {
 		return nil, err
 	}
@@ -440,7 +436,7 @@ func GetTreeInformation(ctx context.Context, repo *repo_model.Repository, gitRep
 	}
 
 	// Check that the path given in opts.treePath is valid (not a git path)
-	cleanTreePath := CleanUploadFileName(treePath)
+	cleanTreePath := util.PathJoinRel(treePath)
 	if cleanTreePath == "" && treePath != "" {
 		return nil, ErrFilenameInvalid{
 			Path: treePath,

services/repository/files/tree_test.go

@@ -63,7 +63,7 @@ func Test_GetTreeList(t *testing.T) {
 
 	refName := git.RefNameFromBranch(ctx1.Repo.Repository.DefaultBranch)
 
-	treeList, err := GetTreeList(ctx1, ctx1.Repo.Repository, ctx1.Repo.GitRepo, "", refName, true)
+	treeList, err := GetTreeList(ctx1, ctx1.Repo.Repository, ctx1.Repo.GitRepo, "", refName)
 	assert.NoError(t, err)
 	assert.Len(t, treeList, 1)
 	assert.EqualValues(t, "README.md", treeList[0].Name)
@@ -80,19 +80,14 @@ func Test_GetTreeList(t *testing.T) {
 
 	refName = git.RefNameFromBranch(ctx2.Repo.Repository.DefaultBranch)
 
-	treeList, err = GetTreeList(ctx2, ctx2.Repo.Repository, ctx2.Repo.GitRepo, "", refName, true)
+	treeList, err = GetTreeList(ctx2, ctx2.Repo.Repository, ctx2.Repo.GitRepo, "", refName)
 	assert.NoError(t, err)
 	assert.Len(t, treeList, 2)
 
 	assert.EqualValues(t, "doc", treeList[0].Name)
 	assert.EqualValues(t, "doc", treeList[0].Path)
 	assert.EqualValues(t, "tree", treeList[0].Type)
-	assert.Len(t, treeList[0].Children, 1)
-
-	assert.EqualValues(t, "doc.md", treeList[0].Children[0].Name)
-	assert.EqualValues(t, "doc/doc.md", treeList[0].Children[0].Path)
-	assert.EqualValues(t, "blob", treeList[0].Children[0].Type)
-	assert.Empty(t, treeList[0].Children[0].Children)
+	assert.Empty(t, treeList[0].Children)
 
 	assert.EqualValues(t, "README.md", treeList[1].Name)
 	assert.EqualValues(t, "README.md", treeList[1].Path)