Little code refactoring

Makefile

@@ -17,7 +17,6 @@ GOVET = go tool vet -composites=false -methods=false -structtags=false
 
 .IGNORE: public/css/gogs.css
 
-# FIXME: find a way to ignore /vendor/ and /data/ directories.
 govet:
 	$(GOVET) gogs.go 
 	$(GOVET) models modules routers

README.md

@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
 
-##### Current tip version: 0.9.68 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
+##### Current tip version: 0.9.69 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|

gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.9.68.0808"
+const APP_VER = "0.9.69.0808"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

modules/template/template.go

@@ -96,7 +96,6 @@ func NewFuncMap() []template.FuncMap {
 		"ShortSha":          base.ShortSha,
 		"MD5":               base.EncodeMD5,
 		"ActionContent2Commits": ActionContent2Commits,
-		"ToUtf8":                ToUtf8,
 		"EscapePound": func(str string) string {
 			return strings.NewReplacer("%", "%25", "#", "%23", " ", "%20").Replace(str)
 		},
@@ -115,10 +114,6 @@ func Str2html(raw string) template.HTML {
 	return template.HTML(markdown.Sanitizer.Sanitize(raw))
 }
 
-func Range(l int) []int {
-	return make([]int, l)
-}
-
 func List(l *list.List) chan interface{} {
 	e := l.Front()
 	c := make(chan interface{})
@@ -136,7 +131,7 @@ func Sha1(str string) string {
 	return base.EncodeSha1(str)
 }
 
-func ToUtf8WithErr(content []byte) (error, string) {
+func ToUTF8WithErr(content []byte) (error, string) {
 	charsetLabel, err := base.DetectEncoding(content)
 	if err != nil {
 		return err, ""
@@ -159,8 +154,8 @@ func ToUtf8WithErr(content []byte) (error, string) {
 	return err, result
 }
 
-func ToUtf8(content string) string {
-	_, res := ToUtf8WithErr([]byte(content))
+func ToUTF8(content string) string {
+	_, res := ToUTF8WithErr([]byte(content))
 	return res
 }
 

routers/repo/view.go

@@ -5,14 +5,13 @@
 package repo
 
 import (
-	"fmt"
 	"bytes"
+	"fmt"
+	gotemplate "html/template"
 	"io/ioutil"
 	"path"
 	"strings"
 
-	htmltemplate "html/template"
-
 	"github.com/Unknwon/paginater"
 
 	"github.com/gogits/git-module"
@@ -119,27 +118,29 @@ func Home(ctx *context.Context) {
 					if readmeExist {
 						ctx.Data["FileContent"] = string(markdown.Render(buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeMetas()))
 					} else {
-						filecontent := ""
-						if err, content := template.ToUtf8WithErr(buf); err != nil {
+						// 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, "Convert content encoding: %s", err)
+								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, htmltemplate.HTMLEscapeString(line)) + "\n")
+							output.WriteString(fmt.Sprintf(`<li class="L%d" rel="L%d">%s</li>`, index+1, index+1, gotemplate.HTMLEscapeString(line)) + "\n")
 						}
-						ctx.Data["FileContent"] = htmltemplate.HTML(output.String())
+						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"] = htmltemplate.HTML(output.String())
+						ctx.Data["LineNums"] = gotemplate.HTML(output.String())
 					}
 				}
 			}
@@ -225,21 +226,21 @@ func Home(ctx *context.Context) {
 	ctx.Data["Reponame"] = repoName
 
 	var treenames []string
-	Paths := make([]string, 0)
+	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], "/"))
+		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]
+		if len(paths)-2 >= 0 {
+			ctx.Data["ParentPath"] = "/" + paths[len(paths)-2]
 		}
 	}
 
-	ctx.Data["Paths"] = Paths
+	ctx.Data["Paths"] = paths
 	ctx.Data["TreeName"] = treename
 	ctx.Data["Treenames"] = treenames
 	ctx.Data["TreePath"] = treePath

templates/.VERSION

@@ -1 +1 @@
-0.9.68.0808
+0.9.69.0808