From aa8b38fe3544b77dd601997179fa51e10117613c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 15 Mar 2014 22:43:55 +0800 Subject: [PATCH] refactoring for Repofile --- models/repo2.go | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/models/repo2.go b/models/repo2.go index beeb8021ed5..d879130acef 100644 --- a/models/repo2.go +++ b/models/repo2.go @@ -12,22 +12,12 @@ import ( ) type RepoFile struct { - Id *git.Oid - Type int - Name string + *git.TreeEntry Path string Message string Created time.Time } -func (f *RepoFile) IsFile() bool { - return f.Type == git.FileModeBlob || f.Type == git.FileModeBlobExec -} - -func (f *RepoFile) IsDir() bool { - return f.Type == git.FileModeTree -} - func GetReposFiles(userName, reposName, branchName, rpath string) ([]*RepoFile, error) { f := RepoPath(userName, reposName) @@ -53,18 +43,14 @@ func GetReposFiles(userName, reposName, branchName, rpath string) ([]*RepoFile, switch entry.Filemode { case git.FileModeBlob, git.FileModeBlobExec: repofiles = append(repofiles, &RepoFile{ - entry.Id, - entry.Filemode, - entry.Name, + entry, path.Join(dirname, entry.Name), lastCommit.Message(), lastCommit.Committer.When, }) case git.FileModeTree: repodirs = append(repodirs, &RepoFile{ - entry.Id, - entry.Filemode, - entry.Name, + entry, path.Join(dirname, entry.Name), lastCommit.Message(), lastCommit.Committer.When,