tyler.durden/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-25 06:46:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug

Browse Source
This commit is contained in:
Lunny Xiao 2025-01-05 21:56:03 -08:00
parent c949f42d4d
commit 64c7e08df2
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
1 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
services/repository/files/tree.go
View File

@ -413,9 +413,29 @@ func GetTreeInformation(ctx context.Context, repo *repo_model.Repository, treePa
return nil, err return nil, err
} }
var treeList []*TreeEntry var dir string
var lastDirEntry *git.TreeEntry
if treePath == "" {
dir = treePath
lastDirEntry = rootEntry
} else {
lastDirEntry, err = commit.GetTreeEntryByPath(treePath)
if err != nil {
return nil, err
}
dir = treePath
if lastDirEntry.IsRegular() {
dir = path.Dir(treePath)
lastDirEntry, err = commit.GetTreeEntryByPath(dir)
if err != nil {
return nil, err
}
}
}
treeList := make([]*TreeEntry, 0, len(rootEntries))
fields := strings.Split(dir, "/")
var parentEntry *TreeEntry var parentEntry *TreeEntry
fields := strings.SplitN(treePath, "/", 2)
for _, entry := range rootEntries { for _, entry := range rootEntries {
treeEntry := &TreeEntry{ treeEntry := &TreeEntry{
Name: entry.Name(), Name: entry.Name(),
@ -423,40 +443,15 @@ func GetTreeInformation(ctx context.Context, repo *repo_model.Repository, treePa
Path: entry.Name(), Path: entry.Name(),
} }
treeList = append(treeList, treeEntry) treeList = append(treeList, treeEntry)
if fields[0] == entry.Name() { if dir != "" && fields[0] == entry.Name() {
if len(fields) == 1 {
if treeEntry.IsFile {
return treeList, nil
}
}
parentEntry = treeEntry parentEntry = treeEntry
} }
} }
if treePath == "" || parentEntry == nil { if dir == "" || parentEntry == nil {
return treeList, nil return treeList, nil
} }
listEntry, err := commit.GetTreeEntryByPath(treePath)
if err != nil {
return nil, err
}
dir := treePath
// list current entry or parent entry if it's a file's children
// If the entry is a file, we return a FileContentResponse object
if listEntry.IsRegular() {
dir = path.Dir(treePath)
if dir == "" {
return treeList, nil
}
fields = fields[:len(fields)-1]
listEntry, err = commit.GetTreeEntryByPath(dir)
if err != nil {
return nil, err
}
}
for i := 1; i < len(fields); i++ { for i := 1; i < len(fields); i++ {
parentEntry.Children = []*TreeEntry{ parentEntry.Children = []*TreeEntry{
{ {
@ -468,7 +463,7 @@ func GetTreeInformation(ctx context.Context, repo *repo_model.Repository, treePa
parentEntry = parentEntry.Children[0] parentEntry = parentEntry.Children[0]
} }
entries, err := listEntry.Tree().ListEntries() entries, err := lastDirEntry.Tree().ListEntries()
if err != nil { if err != nil {
return nil, err return nil, err
} }