New UI merge in progress

1 files changed, 174 insertions, 343 deletions

diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 44a2b84f80..d1e196a0bd 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -5,22 +5,15 @@
 package repo
 
 import (
-	"bytes"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"io/ioutil"
+	"os"
 	"path"
-	"path/filepath"
-	"strings"
 
-	"github.com/go-martini/martini"
-
-	"github.com/gogits/git"
+	"github.com/Unknwon/com"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
 	"github.com/gogits/gogs/modules/base"
+	"github.com/gogits/gogs/modules/git"
 	"github.com/gogits/gogs/modules/log"
 	"github.com/gogits/gogs/modules/middleware"
 )
@@ -28,47 +21,63 @@ import (
 const (
 	CREATE  base.TplName = "repo/create"
 	MIGRATE base.TplName = "repo/migrate"
-	SINGLE  base.TplName = "repo/single"
 )
 
 func Create(ctx *middleware.Context) {
-	ctx.Data["Title"] = "Create repository"
-	ctx.Data["PageIsNewRepo"] = true
-	ctx.Data["LanguageIgns"] = models.LanguageIgns
+	ctx.Data["Title"] = ctx.Tr("new_repo")
+	ctx.Data["PageIsRepoCreate"] = true
+
+	// Give default value for template to render.
+	ctx.Data["gitignore"] = "0"
+	ctx.Data["license"] = "0"
+	ctx.Data["Gitignores"] = models.Gitignores
 	ctx.Data["Licenses"] = models.Licenses
 
 	ctxUser := ctx.User
-	orgId, _ := base.StrTo(ctx.Query("org")).Int64()
-	if orgId > 0 {
-		org, err := models.GetUserById(orgId)
-		if err != nil && err != models.ErrUserNotExist {
-			ctx.Handle(500, "home.Dashboard(GetUserById)", err)
-			return
-		}
-		ctxUser = org
-	}
+	// orgId := com.StrTo(ctx.Query("org")).MustInt64()
+	// if orgId > 0 {
+	// 	org, err := models.GetUserById(orgId)
+	// 	if err != nil && err != models.ErrUserNotExist {
+	// 		ctx.Handle(500, "home.Dashboard(GetUserById)", err)
+	// 		return
+	// 	}
+	// 	ctxUser = org
+	// }
 	ctx.Data["ContextUser"] = ctxUser
 
-	if err := ctx.User.GetOrganizations(); err != nil {
-		ctx.Handle(500, "home.Dashboard(GetOrganizations)", err)
-		return
-	}
-	ctx.Data["AllUsers"] = append([]*models.User{ctx.User}, ctx.User.Orgs...)
+	// if err := ctx.User.GetOrganizations(); err != nil {
+	// 	ctx.Handle(500, "home.Dashboard(GetOrganizations)", err)
+	// 	return
+	// }
+	// ctx.Data["AllUsers"] = append([]*models.User{ctx.User}, ctx.User.Orgs...)
 
 	ctx.HTML(200, CREATE)
 }
 
 func CreatePost(ctx *middleware.Context, form auth.CreateRepoForm) {
-	ctx.Data["Title"] = "Create repository"
-	ctx.Data["PageIsNewRepo"] = true
-	ctx.Data["LanguageIgns"] = models.LanguageIgns
+	ctx.Data["Title"] = ctx.Tr("new_repo")
+	ctx.Data["PageIsRepoCreate"] = true
+
+	ctx.Data["Gitignores"] = models.Gitignores
 	ctx.Data["Licenses"] = models.Licenses
 
-	if err := ctx.User.GetOrganizations(); err != nil {
-		ctx.Handle(500, "home.CreatePost(GetOrganizations)", err)
-		return
-	}
-	ctx.Data["Orgs"] = ctx.User.Orgs
+	ctxUser := ctx.User
+	// orgId := com.StrTo(ctx.Query("org")).MustInt64()
+	// if orgId > 0 {
+	// 	org, err := models.GetUserById(orgId)
+	// 	if err != nil && err != models.ErrUserNotExist {
+	// 		ctx.Handle(500, "home.Dashboard(GetUserById)", err)
+	// 		return
+	// 	}
+	// 	ctxUser = org
+	// }
+	ctx.Data["ContextUser"] = ctxUser
+
+	// if err := ctx.User.GetOrganizations(); err != nil {
+	// 	ctx.Handle(500, "home.CreatePost(GetOrganizations)", err)
+	// 	return
+	// }
+	// ctx.Data["Orgs"] = ctx.User.Orgs
 
 	if ctx.HasError() {
 		ctx.HTML(200, CREATE)
@@ -97,337 +106,159 @@ func CreatePost(ctx *middleware.Context, form auth.CreateRepoForm) {
 	}
 
 	repo, err := models.CreateRepository(u, form.RepoName, form.Description,
-		form.Language, form.License, form.Private, false, form.InitReadme)
+		form.Gitignore, form.License, form.Private, false, form.InitReadme)
 	if err == nil {
-		log.Trace("%s Repository created: %s/%s", ctx.Req.RequestURI, u.LowerName, form.RepoName)
+		log.Trace("Repository created: %s/%s", u.Name, form.RepoName)
 		ctx.Redirect("/" + u.Name + "/" + form.RepoName)
 		return
 	} else if err == models.ErrRepoAlreadyExist {
-		ctx.RenderWithErr("Repository name has already been used", CREATE, &form)
+		ctx.RenderWithErr(ctx.Tr("form.repo_name_been_taken"), CREATE, &form)
 		return
 	} else if err == models.ErrRepoNameIllegal {
-		ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), CREATE, &form)
+		ctx.RenderWithErr(ctx.Tr("form.illegal_repo_name"), CREATE, &form)
 		return
 	}
 
 	if repo != nil {
 		if errDelete := models.DeleteRepository(u.Id, repo.Id, u.Name); errDelete != nil {
-			log.Error("repo.CreatePost(DeleteRepository): %v", errDelete)
+			log.Error(4, "DeleteRepository: %v", errDelete)
 		}
 	}
-	ctx.Handle(500, "repo.CreatePost(CreateRepository)", err)
-}
-
-func Migrate(ctx *middleware.Context) {
-	ctx.Data["Title"] = "Migrate repository"
-	ctx.Data["PageIsNewRepo"] = true
-
-	if err := ctx.User.GetOrganizations(); err != nil {
-		ctx.Handle(500, "home.Migrate(GetOrganizations)", err)
-		return
-	}
-	ctx.Data["Orgs"] = ctx.User.Orgs
-
-	ctx.HTML(200, MIGRATE)
+	ctx.Handle(500, "CreateRepository", err)
 }
 
-func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) {
-	ctx.Data["Title"] = "Migrate repository"
-	ctx.Data["PageIsNewRepo"] = true
-
-	if err := ctx.User.GetOrganizations(); err != nil {
-		ctx.Handle(500, "home.MigratePost(GetOrganizations)", err)
+// func Migrate(ctx *middleware.Context) {
+// 	ctx.Data["Title"] = "Migrate repository"
+// 	ctx.Data["PageIsNewRepo"] = true
+
+// 	if err := ctx.User.GetOrganizations(); err != nil {
+// 		ctx.Handle(500, "home.Migrate(GetOrganizations)", err)
+// 		return
+// 	}
+// 	ctx.Data["Orgs"] = ctx.User.Orgs
+
+// 	ctx.HTML(200, MIGRATE)
+// }
+
+// func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) {
+// 	ctx.Data["Title"] = "Migrate repository"
+// 	ctx.Data["PageIsNewRepo"] = true
+
+// 	if err := ctx.User.GetOrganizations(); err != nil {
+// 		ctx.Handle(500, "home.MigratePost(GetOrganizations)", err)
+// 		return
+// 	}
+// 	ctx.Data["Orgs"] = ctx.User.Orgs
+
+// 	if ctx.HasError() {
+// 		ctx.HTML(200, MIGRATE)
+// 		return
+// 	}
+
+// 	u := ctx.User
+// 	// Not equal means current user is an organization.
+// 	if u.Id != form.Uid {
+// 		var err error
+// 		u, err = models.GetUserById(form.Uid)
+// 		if err != nil {
+// 			if err == models.ErrUserNotExist {
+// 				ctx.Handle(404, "home.MigratePost(GetUserById)", err)
+// 			} else {
+// 				ctx.Handle(500, "home.MigratePost(GetUserById)", err)
+// 			}
+// 			return
+// 		}
+// 	}
+
+// 	authStr := strings.Replace(fmt.Sprintf("://%s:%s",
+// 		form.AuthUserName, form.AuthPasswd), "@", "%40", -1)
+// 	url := strings.Replace(form.Url, "://", authStr+"@", 1)
+// 	repo, err := models.MigrateRepository(u, form.RepoName, form.Description, form.Private,
+// 		form.Mirror, url)
+// 	if err == nil {
+// 		log.Trace("%s Repository migrated: %s/%s", ctx.Req.RequestURI, u.LowerName, form.RepoName)
+// 		ctx.Redirect("/" + u.Name + "/" + form.RepoName)
+// 		return
+// 	} else if err == models.ErrRepoAlreadyExist {
+// 		ctx.RenderWithErr("Repository name has already been used", MIGRATE, &form)
+// 		return
+// 	} else if err == models.ErrRepoNameIllegal {
+// 		ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), MIGRATE, &form)
+// 		return
+// 	}
+
+// 	if repo != nil {
+// 		if errDelete := models.DeleteRepository(u.Id, repo.Id, u.Name); errDelete != nil {
+// 			log.Error("repo.MigratePost(DeleteRepository): %v", errDelete)
+// 		}
+// 	}
+
+// 	if strings.Contains(err.Error(), "Authentication failed") {
+// 		ctx.RenderWithErr(err.Error(), MIGRATE, &form)
+// 		return
+// 	}
+// 	ctx.Handle(500, "repo.Migrate(MigrateRepository)", err)
+// }
+
+// func Action(ctx *middleware.Context, params martini.Params) {
+// 	var err error
+// 	switch params["action"] {
+// 	case "watch":
+// 		err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, true)
+// 	case "unwatch":
+// 		err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, false)
+// 	case "desc":
+// 		if !ctx.Repo.IsOwner {
+// 			ctx.Error(404)
+// 			return
+// 		}
+
+// 		ctx.Repo.Repository.Description = ctx.Query("desc")
+// 		ctx.Repo.Repository.Website = ctx.Query("site")
+// 		err = models.UpdateRepository(ctx.Repo.Repository)
+// 	}
+
+// 	if err != nil {
+// 		log.Error("repo.Action(%s): %v", params["action"], err)
+// 		ctx.JSON(200, map[string]interface{}{
+// 			"ok":  false,
+// 			"err": err.Error(),
+// 		})
+// 		return
+// 	}
+// 	ctx.JSON(200, map[string]interface{}{
+// 		"ok": true,
+// 	})
+// }
+
+func Download(ctx *middleware.Context) {
+	ext := "." + ctx.Params(":ext")
+
+	var archivePath string
+	switch ext {
+	case ".zip":
+		archivePath = path.Join(ctx.Repo.GitRepo.Path, "archives/zip")
+	case ".tar.gz":
+		archivePath = path.Join(ctx.Repo.GitRepo.Path, "archives/targz")
+	default:
+		ctx.Error(404)
 		return
 	}
-	ctx.Data["Orgs"] = ctx.User.Orgs
 
-	if ctx.HasError() {
-		ctx.HTML(200, MIGRATE)
-		return
-	}
-
-	u := ctx.User
-	// Not equal means current user is an organization.
-	if u.Id != form.Uid {
-		var err error
-		u, err = models.GetUserById(form.Uid)
-		if err != nil {
-			if err == models.ErrUserNotExist {
-				ctx.Handle(404, "home.MigratePost(GetUserById)", err)
-			} else {
-				ctx.Handle(500, "home.MigratePost(GetUserById)", err)
-			}
+	if !com.IsDir(archivePath) {
+		if err := os.MkdirAll(archivePath, os.ModePerm); err != nil {
+			ctx.Handle(500, "Download -> os.MkdirAll(archivePath)", err)
 			return
 		}
 	}
 
-	authStr := strings.Replace(fmt.Sprintf("://%s:%s",
-		form.AuthUserName, form.AuthPasswd), "@", "%40", -1)
-	url := strings.Replace(form.Url, "://", authStr+"@", 1)
-	repo, err := models.MigrateRepository(u, form.RepoName, form.Description, form.Private,
-		form.Mirror, url)
-	if err == nil {
-		log.Trace("%s Repository migrated: %s/%s", ctx.Req.RequestURI, u.LowerName, form.RepoName)
-		ctx.Redirect("/" + u.Name + "/" + form.RepoName)
-		return
-	} else if err == models.ErrRepoAlreadyExist {
-		ctx.RenderWithErr("Repository name has already been used", MIGRATE, &form)
-		return
-	} else if err == models.ErrRepoNameIllegal {
-		ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), MIGRATE, &form)
-		return
-	}
-
-	if repo != nil {
-		if errDelete := models.DeleteRepository(u.Id, repo.Id, u.Name); errDelete != nil {
-			log.Error("repo.MigratePost(DeleteRepository): %v", errDelete)
-		}
-	}
-
-	if strings.Contains(err.Error(), "Authentication failed") {
-		ctx.RenderWithErr(err.Error(), MIGRATE, &form)
-		return
-	}
-	ctx.Handle(500, "repo.Migrate(MigrateRepository)", err)
-}
-
-func Single(ctx *middleware.Context, params martini.Params) {
-	branchName := ctx.Repo.BranchName
-	userName := ctx.Repo.Owner.Name
-	repoName := ctx.Repo.Repository.Name
-
-	repoLink := ctx.Repo.RepoLink
-	branchLink := ctx.Repo.RepoLink + "/src/" + branchName
-	rawLink := ctx.Repo.RepoLink + "/raw/" + branchName
-
-	// Get tree path
-	treename := params["_1"]
-
-	if len(treename) > 0 && treename[len(treename)-1] == '/' {
-		ctx.Redirect(repoLink + "/src/" + branchName + "/" + treename[:len(treename)-1])
-		return
-	}
-
-	ctx.Data["IsRepoToolbarSource"] = true
-
-	isViewBranch := ctx.Repo.IsBranch
-	ctx.Data["IsViewBranch"] = isViewBranch
-
-	treePath := treename
-	if len(treePath) != 0 {
-		treePath = treePath + "/"
-	}
-
-	entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treename)
-	if err != nil && err != git.ErrNotExist {
-		ctx.Handle(404, "repo.Single(GetTreeEntryByPath)", err)
-		return
-	}
-
-	if len(treename) != 0 && entry == nil {
-		ctx.Handle(404, "repo.Single", nil)
-		return
-	}
-
-	if entry != nil && !entry.IsDir() {
-		blob := entry.Blob()
-
-		if dataRc, err := blob.Data(); err != nil {
-			ctx.Handle(404, "repo.Single(blob.Data)", err)
-		} else {
-			ctx.Data["FileSize"] = blob.Size()
-			ctx.Data["IsFile"] = true
-			ctx.Data["FileName"] = blob.Name()
-			ext := path.Ext(blob.Name())
-			if len(ext) > 0 {
-				ext = ext[1:]
-			}
-			ctx.Data["FileExt"] = ext
-			ctx.Data["FileLink"] = rawLink + "/" + treename
-
-			buf := make([]byte, 1024)
-			n, _ := dataRc.Read(buf)
-			if n > 0 {
-				buf = buf[:n]
-			}
-
-			defer func() {
-				dataRc.Close()
-			}()
-
-			_, isTextFile := base.IsTextFile(buf)
-			_, isImageFile := base.IsImageFile(buf)
-			ctx.Data["FileIsText"] = isTextFile
-
-			switch {
-			case isImageFile:
-				ctx.Data["IsImageFile"] = true
-			case isTextFile:
-				d, _ := ioutil.ReadAll(dataRc)
-				buf = append(buf, d...)
-				readmeExist := base.IsMarkdownFile(blob.Name()) || base.IsReadmeFile(blob.Name())
-				ctx.Data["ReadmeExist"] = readmeExist
-				if readmeExist {
-					ctx.Data["FileContent"] = string(base.RenderMarkdown(buf, ""))
-				} else {
-					ctx.Data["FileContent"] = string(buf)
-				}
-			}
-		}
-
-	} else {
-		// Directory and file list.
-		tree, err := ctx.Repo.Commit.SubTree(treename)
-		if err != nil {
-			ctx.Handle(404, "repo.Single(SubTree)", err)
-			return
-		}
-		entries := tree.ListEntries()
-		entries.Sort()
-
-		files := make([][]interface{}, 0, len(entries))
-
-		for _, te := range entries {
-			c, err := ctx.Repo.Commit.GetCommitOfRelPath(filepath.Join(treePath, te.Name()))
-			if err != nil {
-				ctx.Handle(404, "repo.Single(SubTree)", err)
-				return
-			}
-
-			files = append(files, []interface{}{te, c})
-		}
-
-		ctx.Data["Files"] = files
-
-		var readmeFile *git.Blob
-
-		for _, f := range entries {
-			if f.IsDir() || !base.IsReadmeFile(f.Name()) {
-				continue
-			} else {
-				readmeFile = f.Blob()
-				break
-			}
-		}
-
-		if readmeFile != nil {
-			ctx.Data["ReadmeInSingle"] = true
-			ctx.Data["ReadmeExist"] = true
-			if dataRc, err := readmeFile.Data(); err != nil {
-				ctx.Handle(404, "repo.Single(readmeFile.LookupBlob)", err)
-				return
-			} else {
-
-				buf := make([]byte, 1024)
-				n, _ := dataRc.Read(buf)
-				if n > 0 {
-					buf = buf[:n]
-				}
-				defer func() {
-					dataRc.Close()
-				}()
-
-				ctx.Data["FileSize"] = readmeFile.Size
-				ctx.Data["FileLink"] = rawLink + "/" + treename
-				_, isTextFile := base.IsTextFile(buf)
-				ctx.Data["FileIsText"] = isTextFile
-				ctx.Data["FileName"] = readmeFile.Name()
-				if isTextFile {
-					d, _ := ioutil.ReadAll(dataRc)
-					buf = append(buf, d...)
-					switch {
-					case base.IsMarkdownFile(readmeFile.Name()):
-						buf = base.RenderMarkdown(buf, branchLink)
-					default:
-						buf = bytes.Replace(buf, []byte("\n"), []byte(`<br>`), -1)
-					}
-					ctx.Data["FileContent"] = string(buf)
-				}
-			}
-		}
-	}
-
-	ctx.Data["Username"] = userName
-	ctx.Data["Reponame"] = repoName
-
-	var treenames []string
-	Paths := make([]string, 0)
-
-	if len(treename) > 0 {
-		treenames = strings.Split(treename, "/")
-		for i, _ := range treenames {
-			Paths = append(Paths, strings.Join(treenames[0:i+1], "/"))
-		}
-
-		ctx.Data["HasParentPath"] = true
-		if len(Paths)-2 >= 0 {
-			ctx.Data["ParentPath"] = "/" + Paths[len(Paths)-2]
-		}
-	}
-
-	ctx.Data["LastCommit"] = ctx.Repo.Commit
-	ctx.Data["Paths"] = Paths
-	ctx.Data["TreeName"] = treename
-	ctx.Data["Treenames"] = treenames
-	ctx.Data["TreePath"] = treePath
-	ctx.Data["BranchLink"] = branchLink
-	ctx.HTML(200, SINGLE)
-}
-
-func basicEncode(username, password string) string {
-	auth := username + ":" + password
-	return base64.StdEncoding.EncodeToString([]byte(auth))
-}
-
-func basicDecode(encoded string) (user string, name string, err error) {
-	var s []byte
-	s, err = base64.StdEncoding.DecodeString(encoded)
-	if err != nil {
-		return
-	}
-
-	a := strings.Split(string(s), ":")
-	if len(a) == 2 {
-		user, name = a[0], a[1]
-	} else {
-		err = errors.New("decode failed")
-	}
-	return
-}
-
-func authRequired(ctx *middleware.Context) {
-	ctx.ResponseWriter.Header().Set("WWW-Authenticate", "Basic realm=\".\"")
-	ctx.Data["ErrorMsg"] = "no basic auth and digit auth"
-	ctx.HTML(401, base.TplName("status/401"))
-}
-
-func Action(ctx *middleware.Context, params martini.Params) {
-	var err error
-	switch params["action"] {
-	case "watch":
-		err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, true)
-	case "unwatch":
-		err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, false)
-	case "desc":
-		if !ctx.Repo.IsOwner {
-			ctx.Error(404)
+	archivePath = path.Join(archivePath, ctx.Repo.CommitId+ext)
+	if !com.IsFile(archivePath) {
+		if err := ctx.Repo.Commit.CreateArchive(archivePath, git.ZIP); err != nil {
+			ctx.Handle(500, "Download -> CreateArchive "+archivePath, err)
 			return
 		}
-
-		ctx.Repo.Repository.Description = ctx.Query("desc")
-		ctx.Repo.Repository.Website = ctx.Query("site")
-		err = models.UpdateRepository(ctx.Repo.Repository)
 	}
 
-	if err != nil {
-		log.Error("repo.Action(%s): %v", params["action"], err)
-		ctx.JSON(200, map[string]interface{}{
-			"ok":  false,
-			"err": err.Error(),
-		})
-		return
-	}
-	ctx.JSON(200, map[string]interface{}{
-		"ok": true,
-	})
+	ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+"-"+base.ShortSha(ctx.Repo.CommitId)+ext)
 }