router/repo: code refactoring

4 files changed, 192 insertions, 194 deletions

diff --git a/routers/repo/download.go b/routers/repo/download.go
index 85aa76472b..faa30ac9d7 100644
--- a/routers/repo/download.go
+++ b/routers/repo/download.go
@@ -21,10 +21,8 @@ func ServeData(ctx *context.Context, name string, reader io.Reader) error {
 		buf = buf[:n]
 	}
 
-	_, isTextFile := base.IsTextFile(buf)
-	if !isTextFile {
-		_, isImageFile := base.IsImageFile(buf)
-		if !isImageFile {
+	if !base.IsTextFile(buf) {
+		if !base.IsImageFile(buf) {
 			ctx.Resp.Header().Set("Content-Disposition", "attachment; filename=\""+path.Base(ctx.Repo.TreePath)+"\"")
 			ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary")
 		}
diff --git a/routers/repo/editor.go b/routers/repo/editor.go
index 81f95956a3..465de00214 100644
--- a/routers/repo/editor.go
+++ b/routers/repo/editor.go
@@ -72,8 +72,7 @@ func editFile(ctx *context.Context, isNewFile bool) {
 		}
 
 		// Only text file are editable online.
-		_, isTextFile := base.IsTextFile(buf)
-		if !isTextFile {
+		if !base.IsTextFile(buf) {
 			ctx.Handle(404, "", nil)
 			return
 		}
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 24fecaf415..a5908c182f 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -795,7 +795,7 @@ func UpdateIssueAssignee(ctx *context.Context) {
 func NewComment(ctx *context.Context, form auth.CreateCommentForm) {
 	issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
 	if err != nil {
-		ctx.HandleError("GetIssueByIndex", models.IsErrIssueNotExist, err, 404)
+		ctx.NotFoundOrServerError("GetIssueByIndex", models.IsErrIssueNotExist, err)
 		return
 	}
 
@@ -881,7 +881,7 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) {
 func UpdateCommentContent(ctx *context.Context) {
 	comment, err := models.GetCommentByID(ctx.ParamsInt64(":id"))
 	if err != nil {
-		ctx.HandleError("GetCommentByID", models.IsErrCommentNotExist, err, 404)
+		ctx.NotFoundOrServerError("GetCommentByID", models.IsErrCommentNotExist, err)
 		return
 	}
 
@@ -913,7 +913,7 @@ func UpdateCommentContent(ctx *context.Context) {
 func DeleteComment(ctx *context.Context) {
 	comment, err := models.GetCommentByID(ctx.ParamsInt64(":id"))
 	if err != nil {
-		ctx.HandleError("GetCommentByID", models.IsErrCommentNotExist, err, 404)
+		ctx.NotFoundOrServerError("GetCommentByID", models.IsErrCommentNotExist, err)
 		return
 	}
 
diff --git a/routers/repo/view.go b/routers/repo/view.go
index 50b158467a..42bf62c606 100644
--- a/routers/repo/view.go
+++ b/routers/repo/view.go
@@ -32,222 +32,224 @@ const (
 	FORKS    base.TplName = "repo/forks"
 )
 
-func Home(ctx *context.Context) {
-	title := ctx.Repo.Repository.Owner.Name + "/" + ctx.Repo.Repository.Name
-	if len(ctx.Repo.Repository.Description) > 0 {
-		title += ": " + ctx.Repo.Repository.Description
+func renderDirectory(ctx *context.Context, treeLink string) {
+	tree, err := ctx.Repo.Commit.SubTree(ctx.Repo.TreePath)
+	if err != nil {
+		ctx.NotFoundOrServerError("Repo.Commit.SubTree", git.IsErrNotExist, err)
+		return
 	}
-	ctx.Data["Title"] = title
-	ctx.Data["PageIsViewCode"] = true
-	ctx.Data["RequireHighlightJS"] = true
-
-	branchName := ctx.Repo.BranchName
-	userName := ctx.Repo.Owner.Name
-	repoName := ctx.Repo.Repository.Name
-
-	branchLink := ctx.Repo.RepoLink + "/src/" + branchName
-	treeLink := branchLink
-	rawLink := ctx.Repo.RepoLink + "/raw/" + branchName
-	// uploadFileLink := ctx.Repo.RepoLink + "/upload/" + branchName
 
-	treePath := ctx.Repo.TreePath
-	if len(treePath) > 0 {
-		treeLink += "/" + treePath
+	entries, err := tree.ListEntries()
+	if err != nil {
+		ctx.Handle(500, "ListEntries", err)
+		return
 	}
+	entries.Sort()
 
-	entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treePath)
+	ctx.Data["Files"], err = entries.GetCommitsInfo(ctx.Repo.Commit, ctx.Repo.TreePath)
 	if err != nil {
-		if git.IsErrNotExist(err) {
-			ctx.Handle(404, "GetTreeEntryByPath", err)
-		} else {
-			ctx.Handle(500, "GetTreeEntryByPath", err)
-		}
+		ctx.Handle(500, "GetCommitsInfo", err)
 		return
 	}
 
-	if !entry.IsDir() {
-		blob := entry.Blob()
-		dataRc, err := blob.Data()
+	var readmeFile *git.Blob
+	for _, entry := range entries {
+		if entry.IsDir() || !markdown.IsReadmeFile(entry.Name()) {
+			continue
+		}
+
+		// TODO: collect all possible README files and show with priority.
+		readmeFile = entry.Blob()
+		break
+	}
+
+	if readmeFile != nil {
+		ctx.Data["ReadmeInList"] = true
+		ctx.Data["ReadmeExist"] = true
+
+		dataRc, err := readmeFile.Data()
 		if err != nil {
-			ctx.Handle(404, "blob.Data", err)
+			ctx.Handle(500, "Data", err)
 			return
 		}
 
-		ctx.Data["FileSize"] = blob.Size()
-		ctx.Data["IsFile"] = true
-		ctx.Data["FileName"] = blob.Name()
-		ctx.Data["HighlightClass"] = highlight.FileNameToHighlightClass(blob.Name())
-		ctx.Data["FileLink"] = rawLink + "/" + treePath
-
 		buf := make([]byte, 1024)
 		n, _ := dataRc.Read(buf)
 		if n > 0 {
 			buf = buf[:n]
 		}
 
-		_, isTextFile := base.IsTextFile(buf)
-		_, isImageFile := base.IsImageFile(buf)
-		_, isPDFFile := base.IsPDFFile(buf)
-		ctx.Data["IsFileText"] = isTextFile
-
-		// Assume file is not editable first.
-		if !isTextFile {
-			ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.cannot_edit_non_text_files")
-		}
-
-		switch {
-		case isPDFFile:
-			ctx.Data["IsPDFFile"] = true
-		case isImageFile:
-			ctx.Data["IsImageFile"] = true
-		case isTextFile:
-			if blob.Size() >= setting.UI.MaxDisplayFileSize {
-				ctx.Data["IsFileTooLarge"] = true
-			} else {
-				d, _ := ioutil.ReadAll(dataRc)
-				buf = append(buf, d...)
-
-				isMarkdown := markdown.IsMarkdownFile(blob.Name())
-				ctx.Data["IsMarkdown"] = isMarkdown
-
-				readmeExist := isMarkdown || markdown.IsReadmeFile(blob.Name())
-				ctx.Data["ReadmeExist"] = readmeExist
-				if readmeExist {
-					// TODO: don't need to render if it's a README but not Markdown file.
-					ctx.Data["FileContent"] = string(markdown.Render(buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeMetas()))
-				} else {
-					// Building code view blocks with line number on server side.
-					var filecontent string
-					if err, content := template.ToUTF8WithErr(buf); err != nil {
-						if err != nil {
-							log.Error(4, "ToUTF8WithErr: %s", err)
-						}
-						filecontent = string(buf)
-					} else {
-						filecontent = content
-					}
-
-					var output bytes.Buffer
-					lines := strings.Split(filecontent, "\n")
-					for index, line := range lines {
-						output.WriteString(fmt.Sprintf(`<li class="L%d" rel="L%d">%s</li>`, index+1, index+1, gotemplate.HTMLEscapeString(line)) + "\n")
-					}
-					ctx.Data["FileContent"] = gotemplate.HTML(output.String())
-
-					output.Reset()
-					for i := 0; i < len(lines); i++ {
-						output.WriteString(fmt.Sprintf(`<span id="L%d">%d</span>`, i+1, i+1))
-					}
-					ctx.Data["LineNums"] = gotemplate.HTML(output.String())
-				}
-			}
-
-			if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch {
-				ctx.Data["CanEditFile"] = true
-				ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.edit_this_file")
-			} else if !ctx.Repo.IsViewBranch {
-				ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch")
-			} else if !ctx.Repo.IsWriter() {
-				ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.fork_before_edit")
+		isTextFile := base.IsTextFile(buf)
+		ctx.Data["FileIsText"] = isTextFile
+		ctx.Data["FileName"] = readmeFile.Name()
+		// FIXME: what happens when README file is an image?
+		if isTextFile {
+			d, _ := ioutil.ReadAll(dataRc)
+			buf = append(buf, d...)
+			switch {
+			case markdown.IsMarkdownFile(readmeFile.Name()):
+				ctx.Data["IsMarkdown"] = true
+				buf = markdown.Render(buf, treeLink, ctx.Repo.Repository.ComposeMetas())
+			default:
+				buf = bytes.Replace(buf, []byte("\n"), []byte(`<br>`), -1)
 			}
+			ctx.Data["FileContent"] = string(buf)
 		}
+	}
 
-		if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch {
-			ctx.Data["CanDeleteFile"] = true
-			ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.delete_this_file")
-		} else if !ctx.Repo.IsViewBranch {
-			ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch")
-		} else if !ctx.Repo.IsWriter() {
-			ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_have_write_access")
-		}
-
-	} else {
-		// Directory and file list.
-		tree, err := ctx.Repo.Commit.SubTree(treePath)
+	// Show latest commit info of repository in table header,
+	// or of directory if not in root directory.
+	latestCommit := ctx.Repo.Commit
+	if len(ctx.Repo.TreePath) > 0 {
+		latestCommit, err = ctx.Repo.Commit.GetCommitByPath(ctx.Repo.TreePath)
 		if err != nil {
-			ctx.Handle(404, "SubTree", err)
+			ctx.Handle(500, "GetCommitByPath", err)
 			return
 		}
+	}
+	ctx.Data["LatestCommit"] = latestCommit
+	ctx.Data["LatestCommitUser"] = models.ValidateCommitWithEmail(latestCommit)
+
+	// Check permission to add or upload new file.
+	if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch {
+		ctx.Data["CanAddFile"] = true
+		// uploadFileLink := ctx.Repo.RepoLink + "/upload/" + branchName
+		// if setting.Repository.Upload.Enabled {
+		// 	ctx.Data["UploadFileLink"] = uploadFileLink + "/" +  ctx.Repo.TreePath
+		// }
+	}
+}
 
-		entries, err := tree.ListEntries()
-		if err != nil {
-			ctx.Handle(500, "ListEntries", err)
-			return
-		}
-		entries.Sort()
+func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink string) {
+	ctx.Data["IsViewFile"] = true
 
-		ctx.Data["Files"], err = entries.GetCommitsInfo(ctx.Repo.Commit, treePath)
-		if err != nil {
-			ctx.Handle(500, "GetCommitsInfo", err)
-			return
-		}
+	blob := entry.Blob()
+	dataRc, err := blob.Data()
+	if err != nil {
+		ctx.Handle(500, "Data", err)
+		return
+	}
 
-		var readmeFile *git.Blob
-		for _, f := range entries {
-			if f.IsDir() || !markdown.IsReadmeFile(f.Name()) {
-				continue
-			} else {
-				readmeFile = f.Blob()
-				break
-			}
+	ctx.Data["FileSize"] = blob.Size()
+	ctx.Data["FileName"] = blob.Name()
+	ctx.Data["HighlightClass"] = highlight.FileNameToHighlightClass(blob.Name())
+	ctx.Data["RawFileLink"] = rawLink + "/" + ctx.Repo.TreePath
+
+	buf := make([]byte, 1024)
+	n, _ := dataRc.Read(buf)
+	if n > 0 {
+		buf = buf[:n]
+	}
+
+	isTextFile := base.IsTextFile(buf)
+	ctx.Data["IsTextFile"] = isTextFile
+
+	// Assume file is not editable first.
+	if !isTextFile {
+		ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.cannot_edit_non_text_files")
+	}
+
+	switch {
+	case isTextFile:
+		if blob.Size() >= setting.UI.MaxDisplayFileSize {
+			ctx.Data["IsFileTooLarge"] = true
+			break
 		}
 
-		if readmeFile != nil {
-			ctx.Data["ReadmeInList"] = true
-			ctx.Data["ReadmeExist"] = true
-			if dataRc, err := readmeFile.Data(); err != nil {
-				ctx.Handle(404, "repo.SinglereadmeFile.Data", err)
-				return
-			} else {
+		d, _ := ioutil.ReadAll(dataRc)
+		buf = append(buf, d...)
 
-				buf := make([]byte, 1024)
-				n, _ := dataRc.Read(buf)
-				if n > 0 {
-					buf = buf[:n]
-				}
+		isMarkdown := markdown.IsMarkdownFile(blob.Name())
+		ctx.Data["IsMarkdown"] = isMarkdown
 
-				ctx.Data["FileSize"] = readmeFile.Size()
-				ctx.Data["FileLink"] = rawLink + "/" + treePath
-				_, 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 markdown.IsMarkdownFile(readmeFile.Name()):
-						ctx.Data["IsMarkdown"] = true
-						buf = markdown.Render(buf, treeLink, ctx.Repo.Repository.ComposeMetas())
-					default:
-						buf = bytes.Replace(buf, []byte("\n"), []byte(`<br>`), -1)
-					}
-					ctx.Data["FileContent"] = string(buf)
+		readmeExist := isMarkdown || markdown.IsReadmeFile(blob.Name())
+		ctx.Data["ReadmeExist"] = readmeExist
+		if readmeExist {
+			// TODO: don't need to render if it's a README but not Markdown file.
+			ctx.Data["FileContent"] = string(markdown.Render(buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeMetas()))
+		} else {
+			// Building code view blocks with line number on server side.
+			var fileContent string
+			if err, content := template.ToUTF8WithErr(buf); err != nil {
+				if err != nil {
+					log.Error(4, "ToUTF8WithErr: %s", err)
 				}
+				fileContent = string(buf)
+			} else {
+				fileContent = content
 			}
-		}
 
-		lastCommit := ctx.Repo.Commit
-		if len(treePath) > 0 {
-			c, err := ctx.Repo.Commit.GetCommitByPath(treePath)
-			if err != nil {
-				ctx.Handle(500, "GetCommitByPath", err)
-				return
+			var output bytes.Buffer
+			lines := strings.Split(fileContent, "\n")
+			for index, line := range lines {
+				output.WriteString(fmt.Sprintf(`<li class="L%d" rel="L%d">%s</li>`, index+1, index+1, gotemplate.HTMLEscapeString(line)) + "\n")
 			}
-			lastCommit = c
+			ctx.Data["FileContent"] = gotemplate.HTML(output.String())
+
+			output.Reset()
+			for i := 0; i < len(lines); i++ {
+				output.WriteString(fmt.Sprintf(`<span id="L%d">%d</span>`, i+1, i+1))
+			}
+			ctx.Data["LineNums"] = gotemplate.HTML(output.String())
 		}
-		ctx.Data["LastCommit"] = lastCommit
-		ctx.Data["LastCommitUser"] = models.ValidateCommitWithEmail(lastCommit)
-
-		if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch {
-			ctx.Data["CanAddFile"] = true
-			// if setting.Repository.Upload.Enabled {
-			// 	ctx.Data["UploadFileLink"] = uploadFileLink + "/" + treePath
-			// }
+
+		if ctx.Repo.CanEnableEditor() {
+			ctx.Data["CanEditFile"] = true
+			ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.edit_this_file")
+		} else if !ctx.Repo.IsViewBranch {
+			ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch")
+		} else if !ctx.Repo.IsWriter() {
+			ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.fork_before_edit")
 		}
+
+	case base.IsPDFFile(buf):
+		ctx.Data["IsPDFFile"] = true
+	case base.IsImageFile(buf):
+		ctx.Data["IsImageFile"] = true
 	}
 
-	ctx.Data["Username"] = userName
-	ctx.Data["Reponame"] = repoName
+	if ctx.Repo.CanEnableEditor() {
+		ctx.Data["CanDeleteFile"] = true
+		ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.delete_this_file")
+	} else if !ctx.Repo.IsViewBranch {
+		ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch")
+	} else if !ctx.Repo.IsWriter() {
+		ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_have_write_access")
+	}
+}
+
+func Home(ctx *context.Context) {
+	title := ctx.Repo.Repository.Owner.Name + "/" + ctx.Repo.Repository.Name
+	if len(ctx.Repo.Repository.Description) > 0 {
+		title += ": " + ctx.Repo.Repository.Description
+	}
+	ctx.Data["Title"] = title
+	ctx.Data["PageIsViewCode"] = true
+	ctx.Data["RequireHighlightJS"] = true
+
+	branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchName
+	treeLink := branchLink
+	rawLink := ctx.Repo.RepoLink + "/raw/" + ctx.Repo.BranchName
+
+	if len(ctx.Repo.TreePath) > 0 {
+		treeLink += "/" + ctx.Repo.TreePath
+	}
+
+	// Get current entry user currently looking at.
+	entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx.Repo.TreePath)
+	if err != nil {
+		ctx.NotFoundOrServerError("Repo.Commit.GetTreeEntryByPath", git.IsErrNotExist, err)
+		return
+	}
+
+	if entry.IsDir() {
+		renderDirectory(ctx, treeLink)
+	} else {
+		renderFile(ctx, entry, treeLink, rawLink)
+	}
+	if ctx.Written() {
+		return
+	}
 
 	ec, err := ctx.Repo.GetEditorconfig()
 	if err != nil && !git.IsErrNotExist(err) {
@@ -255,13 +257,13 @@ func Home(ctx *context.Context) {
 		return
 	}
 	ctx.Data["Editorconfig"] = ec
-	var treenames []string
-	paths := make([]string, 0)
 
-	if len(treePath) > 0 {
-		treenames = strings.Split(treePath, "/")
-		for i := range treenames {
-			paths = append(paths, strings.Join(treenames[0:i+1], "/"))
+	var treeNames []string
+	paths := make([]string, 0, 5)
+	if len(ctx.Repo.TreePath) > 0 {
+		treeNames = strings.Split(ctx.Repo.TreePath, "/")
+		for i := range treeNames {
+			paths = append(paths, strings.Join(treeNames[:i+1], "/"))
 		}
 
 		ctx.Data["HasParentPath"] = true
@@ -271,9 +273,8 @@ func Home(ctx *context.Context) {
 	}
 
 	ctx.Data["Paths"] = paths
-	ctx.Data["TreePath"] = treePath
 	ctx.Data["TreeLink"] = treeLink
-	ctx.Data["Treenames"] = treenames
+	ctx.Data["TreeNames"] = treeNames
 	ctx.Data["BranchLink"] = branchLink
 	ctx.HTML(200, HOME)
 }