Browse Source

refactoring for Repofile

Lunny Xiao 11 years ago
parent
commit
aa8b38fe35
1 changed files with 3 additions and 17 deletions
  1. 3 17
      models/repo2.go

+ 3 - 17
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,