refactor(tpl): use formatted data for page rendering

Add `.Html` to sub item info.

Function invoking in template is slow. Generate formatted data before
rendering.

BREAKING CHANGE

before:

Iterate item's FileInfo in template
```
{{range .SubItems}}
...
{{end}}
```

after:

Iterate item's FileInfo in template
```
{{range .SubItems}}{{with .Info}}
...
{{end}}{{end}}
```

Author: marjune163

src/serverHandler/perm.go

@@ -21,8 +21,8 @@ func hasUrlOrDirPrefix(urls []string, reqUrl string, dirs []string, reqDir strin
 	return false
 }
 
-func (h *handler) getCanUpload(item os.FileInfo, rawReqPath, reqFsPath string) bool {
-	if item == nil || !item.IsDir() {
+func (h *handler) getCanUpload(info os.FileInfo, rawReqPath, reqFsPath string) bool {
+	if info == nil || !info.IsDir() {
 		return false
 	}
 
@@ -33,8 +33,8 @@ func (h *handler) getCanUpload(item os.FileInfo, rawReqPath, reqFsPath string) b
 	return hasUrlOrDirPrefix(h.uploadUrls, rawReqPath, h.uploadDirs, reqFsPath)
 }
 
-func (h *handler) getCanArchive(subItems []os.FileInfo, rawReqPath, reqFsPath string) bool {
-	if len(subItems) == 0 {
+func (h *handler) getCanArchive(subInfos []os.FileInfo, rawReqPath, reqFsPath string) bool {
+	if len(subInfos) == 0 {
 		return false
 	}
 

src/serverHandler/responseData.go

@@ -1,7 +1,9 @@
 package serverHandler
 
 import (
+	tplutil "../tpl/util"
 	"../util"
+	"html/template"
 	"net/http"
 	"os"
 	"path"
@@ -15,6 +17,18 @@ type pathEntry struct {
 	Path string
 }
 
+type subItemHtml struct {
+	IsDir   bool
+	Name    template.HTML
+	Size    template.HTML
+	ModTime template.HTML
+}
+
+type subItem struct {
+	Info os.FileInfo
+	Html subItemHtml
+}
+
 type responseData struct {
 	rawReqPath     string
 	handlerReqPath string
@@ -29,13 +43,14 @@ type responseData struct {
 	File          *os.File
 	Item          os.FileInfo
 	ItemName      string
-	SubItems      []os.FileInfo
+	SubItems      []*subItem
 	SubItemPrefix string
-	CanUpload     bool
-	CanArchive    bool
-	CanCors       bool
-	NeedAuth      bool
-	Errors        []error
+
+	CanUpload  bool
+	CanArchive bool
+	CanCors    bool
+	NeedAuth   bool
+	Errors     []error
 }
 
 func isSlash(c rune) bool {
@@ -185,12 +200,12 @@ func getSubItemPrefix(requestPath string, tailSlash bool) (subItemPrefix string)
 	return
 }
 
-func sortSubItems(subItems []os.FileInfo) {
+func sortSubInfos(subInfos []os.FileInfo) {
 	sort.Slice(
-		subItems,
+		subInfos,
 		func(prevIndex, nextIndex int) bool {
-			prevItem := subItems[prevIndex]
-			nextItem := subItems[nextIndex]
+			prevItem := subInfos[prevIndex]
+			nextItem := subInfos[nextIndex]
 
 			prevIsDir := prevItem.IsDir()
 			nextIsDir := nextItem.IsDir()
@@ -204,16 +219,35 @@ func sortSubItems(subItems []os.FileInfo) {
 	)
 }
 
-func getItemName(item os.FileInfo, r *http.Request) (itemName string) {
-	if item != nil {
-		itemName = item.Name()
+func getItemName(info os.FileInfo, r *http.Request) (itemName string) {
+	if info != nil {
+		itemName = info.Name()
 	}
 	if len(itemName) == 0 || itemName == "." {
 		itemName = strings.Replace(r.Host, ":", "_", -1)
 	}
 	return
 }
 
+func getSubItems(subInfos []os.FileInfo) []*subItem {
+	subItems := make([]*subItem, len(subInfos))
+
+	for i := 0; i < len(subInfos); i++ {
+		info := subInfos[i]
+		subItems[i] = &subItem{
+			Info: info,
+			Html: subItemHtml{
+				IsDir:   info.IsDir(),
+				Name:    tplutil.FormatFilename(info.Name()),
+				Size:    tplutil.FormatSize(info.Size()),
+				ModTime: tplutil.FormatTime(info.ModTime()),
+			},
+		}
+	}
+
+	return subItems
+}
+
 func (h *handler) getResponseData(r *http.Request) (data *responseData) {
 	requestUri := r.URL.Path
 	tailSlash := requestUri[len(requestUri)-1] == '/'
@@ -248,21 +282,23 @@ func (h *handler) getResponseData(r *http.Request) (data *responseData) {
 
 	itemName := getItemName(item, r)
 
-	subItems, _readdirErrs := readdir(file, item)
+	subInfos, _readdirErrs := readdir(file, item)
 	errs = append(errs, _readdirErrs...)
 	internalError = internalError || len(_readdirErrs) > 0
 
-	_mergeErrs := h.mergeAlias(rawReqPath, &subItems)
+	_mergeErrs := h.mergeAlias(rawReqPath, &subInfos)
 	errs = append(errs, _mergeErrs...)
 	internalError = internalError || len(_mergeErrs) > 0
 
-	subItems = h.FilterItems(subItems)
-	sortSubItems(subItems)
+	subInfos = h.FilterItems(subInfos)
+	sortSubInfos(subInfos)
+
+	subItems := getSubItems(subInfos)
 
 	subItemPrefix := getSubItemPrefix(reqPath, tailSlash)
 
 	canUpload := h.getCanUpload(item, rawReqPath, reqFsPath)
-	canArchive := h.getCanArchive(subItems, rawReqPath, reqFsPath)
+	canArchive := h.getCanArchive(subInfos, rawReqPath, reqFsPath)
 	canCors := h.getCanCors(rawReqPath, reqFsPath)
 	needAuth := h.getNeedAuth(rawReqPath, reqFsPath)
 

src/tpl/page.html

@@ -45,16 +45,15 @@
 			<span class="time"></span>
 		</a>
 	</li>
-	{{range .SubItems}}
-		{{$isDir := .IsDir}}{{$subItemName := .Name}}
-		<li class="{{if $isDir}}dir{{else}}file{{end}}">
-			<a href="{{$subItemPrefix}}{{$subItemName}}{{if $isDir}}/{{end}}">
-				<span class="name">{{fmtFilename $subItemName}}{{if $isDir}}/{{end}}</span>
-				<span class="size">{{if not $isDir}}{{fmtSize .Size}}{{end}}</span>
-				<span class="time">{{fmtTime .ModTime}}</span>
+	{{range .SubItems}}{{with .Html}}
+		<li class="{{if .IsDir}}dir{{else}}file{{end}}">
+			<a href="{{$subItemPrefix}}{{.Name}}{{if .IsDir}}/{{end}}">
+				<span class="name">{{.Name}}{{if .IsDir}}/{{end}}</span>
+				<span class="size">{{if not .IsDir}}{{.Size}}{{end}}</span>
+				<span class="time">{{.ModTime}}</span>
 			</a>
 		</li>
-	{{end}}
+	{{end}}{{end}}
 </ul>
 
 {{range .Errors}}

src/tpl/page.html.go

@@ -2,7 +2,7 @@ package tpl
 
 import (
 	"../serverErrHandler"
-	"../util"
+	"./util"
 	"html/template"
 	"path"
 )
@@ -50,16 +50,15 @@ const pageTplStr = `
 <span class="time"></span>
 </a>
 </li>
-{{range .SubItems}}
-{{$isDir := .IsDir}}{{$subItemName := .Name}}
-<li class="{{if $isDir}}dir{{else}}file{{end}}">
-<a href="{{$subItemPrefix}}{{$subItemName}}{{if $isDir}}/{{end}}">
-<span class="name">{{fmtFilename $subItemName}}{{if $isDir}}/{{end}}</span>
-<span class="size">{{if not $isDir}}{{fmtSize .Size}}{{end}}</span>
-<span class="time">{{fmtTime .ModTime}}</span>
+{{range .SubItems}}{{with .Html}}
+<li class="{{if .IsDir}}dir{{else}}file{{end}}">
+<a href="{{$subItemPrefix}}{{.Name}}{{if .IsDir}}/{{end}}">
+<span class="name">{{.Name}}{{if .IsDir}}/{{end}}</span>
+<span class="size">{{if not .IsDir}}{{.Size}}{{end}}</span>
+<span class="time">{{.ModTime}}</span>
 </a>
 </li>
-{{end}}
+{{end}}{{end}}
 </ul>
 {{range .Errors}}
 <div class="error">{{.}}</div>
@@ -102,6 +101,6 @@ func addFuncMap(tpl *template.Template) *template.Template {
 	return tpl.Funcs(template.FuncMap{
 		"fmtFilename": util.FormatFilename,
 		"fmtSize":     util.FormatSize,
-		"fmtTime":     util.FormatTimeMinute,
+		"fmtTime":     util.FormatTime,
 	})
 }

src/util/formatFilename.go src/tpl/util/formatFilename.gosrc/util/formatFilename.go renamed to src/tpl/util/formatFilename.go

@@ -1,6 +1,7 @@
 package util
 
 import (
+	"html/template"
 	"strconv"
 )
 
@@ -13,18 +14,18 @@ const (
 	PB
 )
 
-func fmtUnit(unitName string, unitValue int64, srcValue int64) string {
+func fmtUnit(unitName string, unitValue int64, srcValue int64) template.HTML {
 	prefix := int(srcValue / unitValue)
 	suffix := int(srcValue % unitValue * 100 / unitValue)
 
 	if suffix >= 55 {
 		prefix++
 	}
 
-	return strconv.Itoa(prefix) + unitName
+	return template.HTML(strconv.Itoa(prefix) + unitName)
 }
 
-func FormatSize(size int64) string {
+func FormatSize(size int64) template.HTML {
 	switch {
 	case size > PB:
 		return fmtUnit("P", PB, size)

src/util/formatFilename_test.go src/tpl/util/formatFilename_test.gosrc/util/formatFilename_test.go renamed to src/tpl/util/formatFilename_test.go

@@ -0,0 +1,10 @@
+package util
+
+import (
+	"html/template"
+	"time"
+)
+
+func FormatTime(t time.Time) template.HTML {
+	return template.HTML(t.Format("2006-01-02 15:04"))
+}

src/util/formatSize.go src/tpl/util/formatSize.gosrc/util/formatSize.go renamed to src/tpl/util/formatSize.go

@@ -8,6 +8,5 @@ import (
 
 func TestFormatTimeMinute(t *testing.T) {
 	time := time.Now()
-	fmt.Println(FormatTimeMinute(time))
-	fmt.Println(FormatTimeSecond(time))
+	fmt.Println(FormatTime(time))
 }