Add postgres support, clean code, code review

1 files changed, 226 insertions, 15 deletions

diff --git a/models/repo.go b/models/repo.go
index 7f0307308b..1b74f19d46 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -24,6 +25,7 @@ import (
 	"github.com/gogits/gogs/modules/log"
 )
 
+// Repository represents a git repository.
 type Repository struct {
 	Id          int64
 	OwnerId     int64 `xorm:"unique(s)"`
@@ -63,7 +65,7 @@ func init() {
 	zip.Verbose = false
 }
 
-// check if repository is exist
+// IsRepositoryExist returns true if the repository with given name under user has already existed.
 func IsRepositoryExist(user *User, repoName string) (bool, error) {
 	repo := Repository{OwnerId: user.Id}
 	has, err := orm.Where("lower_name = ?", strings.ToLower(repoName)).Get(&repo)
@@ -94,8 +96,8 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv
 		Private:     private,
 	}
 
-	f := RepoPath(user.Name, repoName)
-	if err = initRepository(f, user, repo, initReadme, repoLang, license); err != nil {
+	repoPath := RepoPath(user.Name, repoName)
+	if err = initRepository(repoPath, user, repo, initReadme, repoLang, license); err != nil {
 		return nil, err
 	}
 	session := orm.NewSession()
@@ -103,9 +105,10 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv
 	session.Begin()
 
 	if _, err = session.Insert(repo); err != nil {
-		if err2 := os.RemoveAll(f); err2 != nil {
+		if err2 := os.RemoveAll(repoPath); err2 != nil {
+			log.Error("repo.CreateRepository(repo): %v", err)
 			return nil, errors.New(fmt.Sprintf(
-				"delete repo directory %s/%s failed", user.Name, repoName))
+				"delete repo directory %s/%s failed(1): %v", user.Name, repoName, err2))
 		}
 		session.Rollback()
 		return nil, err
@@ -118,33 +121,39 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv
 	}
 	if _, err = session.Insert(&access); err != nil {
 		session.Rollback()
-		if err2 := os.RemoveAll(f); err2 != nil {
+		if err2 := os.RemoveAll(repoPath); err2 != nil {
+			log.Error("repo.CreateRepository(access): %v", err)
 			return nil, errors.New(fmt.Sprintf(
-				"delete repo directory %s/%s failed", user.Name, repoName))
+				"delete repo directory %s/%s failed(2): %v", user.Name, repoName, err2))
 		}
 		return nil, err
 	}
 
-	if _, err = session.Exec("update user set num_repos = num_repos + 1 where id = ?", user.Id); err != nil {
+	rawSql := "UPDATE user SET num_repos = num_repos + 1 WHERE id = ?"
+	if base.Cfg.MustValue("database", "DB_TYPE") == "postgres" {
+		rawSql = "UPDATE \"user\" SET num_repos = num_repos + 1 WHERE id = ?"
+	}
+	if _, err = session.Exec(rawSql, user.Id); err != nil {
 		session.Rollback()
-		if err2 := os.RemoveAll(f); err2 != nil {
+		if err2 := os.RemoveAll(repoPath); err2 != nil {
+			log.Error("repo.CreateRepository(repo count): %v", err)
 			return nil, errors.New(fmt.Sprintf(
-				"delete repo directory %s/%s failed", user.Name, repoName))
+				"delete repo directory %s/%s failed(3): %v", user.Name, repoName, err2))
 		}
 		return nil, err
 	}
 
 	if err = session.Commit(); err != nil {
 		session.Rollback()
-		if err2 := os.RemoveAll(f); err2 != nil {
+		if err2 := os.RemoveAll(repoPath); err2 != nil {
+			log.Error("repo.CreateRepository(commit): %v", err)
 			return nil, errors.New(fmt.Sprintf(
-				"delete repo directory %s/%s failed", user.Name, repoName))
+				"delete repo directory %s/%s failed(3): %v", user.Name, repoName, err2))
 		}
 		return nil, err
 	}
 
 	return repo, NewRepoAction(user, repo)
-	return nil, nil
 }
 
 // extractGitBareZip extracts git-bare.zip to repository path.
@@ -255,6 +264,7 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
 	return nil
 }
 
+// GetRepositoryByName returns the repository by given name under user if exists.
 func GetRepositoryByName(user *User, repoName string) (*Repository, error) {
 	repo := &Repository{
 		OwnerId:   user.Id,
@@ -269,6 +279,7 @@ func GetRepositoryByName(user *User, repoName string) (*Repository, error) {
 	return repo, err
 }
 
+// GetRepositoryById returns the repository by given id if exists.
 func GetRepositoryById(id int64) (repo *Repository, err error) {
 	has, err := orm.Id(id).Get(repo)
 	if err != nil {
@@ -336,7 +347,11 @@ func DeleteRepository(userId, repoId int64, userName string) (err error) {
 		session.Rollback()
 		return err
 	}
-	if _, err = session.Exec("update user set num_repos = num_repos - 1 where id = ?", userId); err != nil {
+	rawSql := "UPDATE user SET num_repos = num_repos - 1 WHERE id = ?"
+	if base.Cfg.MustValue("database", "DB_TYPE") == "postgres" {
+		rawSql = "UPDATE \"user\" SET num_repos = num_repos - 1 WHERE id = ?"
+	}
+	if _, err = session.Exec(rawSql, userId); err != nil {
 		session.Rollback()
 		return err
 	}
@@ -346,8 +361,204 @@ func DeleteRepository(userId, repoId int64, userName string) (err error) {
 	}
 	if err = os.RemoveAll(RepoPath(userName, repo.Name)); err != nil {
 		// TODO: log and delete manully
-		log.Error("delete repo %s/%s failed", userName, repo.Name)
+		log.Error("delete repo %s/%s failed: %v", userName, repo.Name, err)
 		return err
 	}
 	return nil
 }
+
+// Commit represents a git commit.
+type Commit struct {
+	Author  string
+	Email   string
+	Date    time.Time
+	SHA     string
+	Message string
+}
+
+var (
+	ErrRepoFileNotLoaded = fmt.Errorf("repo file not loaded")
+)
+
+// RepoFile represents a file object in git repository.
+type RepoFile struct {
+	*git.TreeEntry
+	Path       string
+	Message    string
+	Created    time.Time
+	Size       int64
+	Repo       *git.Repository
+	LastCommit string
+}
+
+// LookupBlob returns the content of an object.
+func (file *RepoFile) LookupBlob() (*git.Blob, error) {
+	if file.Repo == nil {
+		return nil, ErrRepoFileNotLoaded
+	}
+
+	return file.Repo.LookupBlob(file.Id)
+}
+
+// GetBranches returns all branches of given repository.
+func GetBranches(userName, reposName string) ([]string, error) {
+	repo, err := git.OpenRepository(RepoPath(userName, reposName))
+	if err != nil {
+		return nil, err
+	}
+
+	refs, err := repo.AllReferences()
+	if err != nil {
+		return nil, err
+	}
+
+	brs := make([]string, len(refs))
+	for i, ref := range refs {
+		brs[i] = ref.Name
+	}
+	return brs, nil
+}
+
+// GetReposFiles returns a list of file object in given directory of repository.
+func GetReposFiles(userName, reposName, branchName, rpath string) ([]*RepoFile, error) {
+	repo, err := git.OpenRepository(RepoPath(userName, reposName))
+	if err != nil {
+		return nil, err
+	}
+
+	ref, err := repo.LookupReference("refs/heads/" + branchName)
+	if err != nil {
+		return nil, err
+	}
+
+	lastCommit, err := repo.LookupCommit(ref.Oid)
+	if err != nil {
+		return nil, err
+	}
+
+	var repodirs []*RepoFile
+	var repofiles []*RepoFile
+	lastCommit.Tree.Walk(func(dirname string, entry *git.TreeEntry) int {
+		if dirname == rpath {
+			size, err := repo.ObjectSize(entry.Id)
+			if err != nil {
+				return 0
+			}
+
+			var cm = lastCommit
+
+			for {
+				if cm.ParentCount() == 0 {
+					break
+				} else if cm.ParentCount() == 1 {
+					pt, _ := repo.SubTree(cm.Parent(0).Tree, dirname)
+					if pt == nil {
+						break
+					}
+					pEntry := pt.EntryByName(entry.Name)
+					if pEntry == nil || !pEntry.Id.Equal(entry.Id) {
+						break
+					} else {
+						cm = cm.Parent(0)
+					}
+				} else {
+					var emptyCnt = 0
+					var sameIdcnt = 0
+					for i := 0; i < cm.ParentCount(); i++ {
+						p := cm.Parent(i)
+						pt, _ := repo.SubTree(p.Tree, dirname)
+						var pEntry *git.TreeEntry
+						if pt != nil {
+							pEntry = pt.EntryByName(entry.Name)
+						}
+
+						if pEntry == nil {
+							if emptyCnt == cm.ParentCount()-1 {
+								goto loop
+							} else {
+								emptyCnt = emptyCnt + 1
+								continue
+							}
+						} else {
+							if !pEntry.Id.Equal(entry.Id) {
+								goto loop
+							} else {
+								if sameIdcnt == cm.ParentCount()-1 {
+									// TODO: now follow the first parent commit?
+									cm = cm.Parent(0)
+									break
+								}
+								sameIdcnt = sameIdcnt + 1
+							}
+						}
+					}
+				}
+			}
+
+		loop:
+
+			rp := &RepoFile{
+				entry,
+				path.Join(dirname, entry.Name),
+				cm.Message(),
+				cm.Committer.When,
+				size,
+				repo,
+				cm.Id().String(),
+			}
+
+			if entry.IsFile() {
+				repofiles = append(repofiles, rp)
+			} else if entry.IsDir() {
+				repodirs = append(repodirs, rp)
+			}
+		}
+		return 0
+	})
+
+	return append(repodirs, repofiles...), nil
+}
+
+// GetLastestCommit returns the latest commit of given repository.
+func GetLastestCommit(userName, repoName string) (*Commit, error) {
+	stdout, _, err := com.ExecCmd("git", "--git-dir="+RepoPath(userName, repoName), "log", "-1")
+	if err != nil {
+		return nil, err
+	}
+
+	commit := new(Commit)
+	for _, line := range strings.Split(stdout, "\n") {
+		if len(line) == 0 {
+			continue
+		}
+		switch {
+		case line[0] == 'c':
+			commit.SHA = line[7:]
+		case line[0] == 'A':
+			infos := strings.SplitN(line, " ", 3)
+			commit.Author = infos[1]
+			commit.Email = infos[2][1 : len(infos[2])-1]
+		case line[0] == 'D':
+			commit.Date, err = time.Parse("Mon Jan 02 15:04:05 2006 -0700", line[8:])
+			if err != nil {
+				return nil, err
+			}
+		case line[:4] == "    ":
+			commit.Message = line[4:]
+		}
+	}
+	return commit, nil
+}
+
+// GetCommits returns all commits of given branch of repository.
+func GetCommits(userName, reposName, branchname string) ([]*git.Commit, error) {
+	repo, err := git.OpenRepository(RepoPath(userName, reposName))
+	if err != nil {
+		return nil, err
+	}
+	r, err := repo.LookupReference(fmt.Sprintf("refs/heads/%s", branchname))
+	if err != nil {
+		return nil, err
+	}
+	return r.AllCommits()
+}