show folder first on file list page

release/v1.15
Lunny Xiao 2014-03-15 22:27:24 +08:00
parent f174633b36
commit 218cafed1d
1 changed files with 23 additions and 10 deletions

View File

@ -8,7 +8,7 @@ import (
"path"
"time"
git "github.com/speedata/gogit"
git "github.com/gogits/git"
)
type RepoFile struct {
@ -46,20 +46,33 @@ func GetReposFiles(userName, reposName, branchName, rpath string) ([]*RepoFile,
return nil, err
}
var repodirs []*RepoFile
var repofiles []*RepoFile
lastCommit.Tree.Walk(func(dirname string, entry *git.TreeEntry) int {
if dirname == rpath {
repofiles = append(repofiles, &RepoFile{
entry.Id,
entry.Filemode,
entry.Name,
path.Join(dirname, entry.Name),
lastCommit.Message(),
lastCommit.Committer.When,
})
switch entry.Filemode {
case git.FileModeBlob, git.FileModeBlobExec:
repofiles = append(repofiles, &RepoFile{
entry.Id,
entry.Filemode,
entry.Name,
path.Join(dirname, entry.Name),
lastCommit.Message(),
lastCommit.Committer.When,
})
case git.FileModeTree:
repodirs = append(repodirs, &RepoFile{
entry.Id,
entry.Filemode,
entry.Name,
path.Join(dirname, entry.Name),
lastCommit.Message(),
lastCommit.Committer.When,
})
}
}
return 0
})
return repofiles, nil
return append(repodirs, repofiles...), nil
}