perf(serverHandler): separate subItems info

- separate subItems and subItemsHtml
- subItem's `bytesNames` only exists in sort function

BREAK CHANGE:

Getting HTML formatted sub items in template changed.

Before:

```
{{range .SubItems}}{{with .Html}}
{{end}}{{end}}
```

After:

```
{{range .SubItemsHtml}}
{{end}}
```

Author: marjune163

src/serverHandler/json.go

@@ -37,8 +37,8 @@ func getJsonData(data *responseData) *jsonResponseData {
 
 		if data.Item.IsDir() {
 			subItems = make([]*jsonItem, len(data.SubItems))
-			for i, dataItem := range data.SubItems {
-				subItems[i] = getJsonItem(dataItem.Info)
+			for i := range data.SubItems {
+				subItems[i] = getJsonItem(data.SubItems[i])
 			}
 		}
 	}

src/serverHandler/page.go

@@ -5,11 +5,16 @@ import (
 	"net/http"
 )
 
-func updateSubItemsForPage(subItems []*subItem) {
-	for _, item := range subItems {
-		info := item.Info
+func updateSubItemsHtml(data *responseData) {
+	length := len(data.SubItems)
+
+	data.SubItemsHtml = make([]*itemHtml, length)
+
+	for i := 0; i < length; i++ {
+		info := data.SubItems[i]
 		name := info.Name()
-		item.Html = &itemHtml{
+
+		data.SubItemsHtml[i] = &itemHtml{
 			IsDir:   info.IsDir(),
 			Link:    name,
 			Name:    tplutil.FormatFilename(name),
@@ -27,7 +32,7 @@ func (h *handler) page(w http.ResponseWriter, r *http.Request, data *responseDat
 	w.WriteHeader(data.Status)
 
 	if needResponseBody(r.Method) {
-		updateSubItemsForPage(data.SubItems)
+		updateSubItemsHtml(data)
 		err := h.template.Execute(w, data)
 		h.errHandler.LogError(err)
 	}

src/serverHandler/responseData.go

@@ -16,10 +16,6 @@ type pathEntry struct {
 	Path string `json:"path"`
 }
 
-type itemSort struct {
-	Name []byte
-}
-
 type itemHtml struct {
 	IsDir   bool
 	Link    string
@@ -28,13 +24,6 @@ type itemHtml struct {
 	ModTime template.HTML
 }
 
-type subItem struct {
-	sort itemSort
-
-	Info os.FileInfo
-	Html *itemHtml
-}
-
 type responseData struct {
 	rawReqPath     string
 	handlerReqPath string
@@ -49,7 +38,8 @@ type responseData struct {
 	File          *os.File
 	Item          os.FileInfo
 	ItemName      string
-	SubItems      []*subItem
+	SubItems      []os.FileInfo
+	SubItemsHtml  []*itemHtml
 	SubItemPrefix string
 
 	CanUpload  bool
@@ -212,37 +202,26 @@ func getItemName(info os.FileInfo, r *http.Request) (itemName string) {
 	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{
-			sort: itemSort{
-				Name: []byte(info.Name()),
-			},
-			Info: info,
-		}
+func sortSubItems(subInfos []os.FileInfo) {
+	names := make([][]byte, len(subInfos))
+	for i := range subInfos {
+		names[i] = []byte(subInfos[i].Name())
 	}
 
-	return subItems
-}
-
-func sortSubItems(subItems []*subItem) {
 	sort.Slice(
-		subItems,
+		subInfos,
 		func(prevIndex, nextIndex int) bool {
-			prevItem := subItems[prevIndex]
-			nextItem := subItems[nextIndex]
+			prevInfo := subInfos[prevIndex]
+			nextInfo := subInfos[nextIndex]
 
-			prevIsDir := prevItem.Info.IsDir()
-			nextIsDir := nextItem.Info.IsDir()
+			prevIsDir := prevInfo.IsDir()
+			nextIsDir := nextInfo.IsDir()
 
 			if prevIsDir != nextIsDir {
 				return prevIsDir
 			}
 
-			return util.CompareNumInStr(prevItem.sort.Name, nextItem.sort.Name)
+			return util.CompareNumInStr(names[prevIndex], names[nextIndex])
 		},
 	)
 }
@@ -342,13 +321,13 @@ func (h *handler) getResponseData(r *http.Request) (data *responseData) {
 
 	itemName := getItemName(item, r)
 
-	subInfos, _readdirErr := readdir(file, item, needResponseBody(r.Method))
+	subItems, _readdirErr := readdir(file, item, needResponseBody(r.Method))
 	if _readdirErr != nil {
 		errs = append(errs, _readdirErr)
 		status = http.StatusInternalServerError
 	}
 
-	subInfos, _mergeErrs := h.mergeAlias(rawReqPath, item, subInfos)
+	subItems, _mergeErrs := h.mergeAlias(rawReqPath, item, subItems)
 	if len(_mergeErrs) > 0 {
 		errs = append(errs, _mergeErrs...)
 		status = http.StatusInternalServerError
@@ -358,15 +337,13 @@ func (h *handler) getResponseData(r *http.Request) (data *responseData) {
 		status = http.StatusNotFound
 	}
 
-	subInfos = h.FilterItems(subInfos)
-
-	subItems := getSubItems(subInfos)
+	subItems = h.FilterItems(subItems)
 	sortSubItems(subItems)
 
 	subItemPrefix := getSubItemPrefix(reqPath, tailSlash)
 
 	canUpload := h.getCanUpload(item, rawReqPath, reqFsPath)
-	canArchive := h.getCanArchive(subInfos, rawReqPath, reqFsPath)
+	canArchive := h.getCanArchive(subItems, rawReqPath, reqFsPath)
 	canCors := h.getCanCors(rawReqPath, reqFsPath)
 	needAuth := h.getNeedAuth(rawReqPath, reqFsPath)
 
@@ -385,6 +362,7 @@ func (h *handler) getResponseData(r *http.Request) (data *responseData) {
 		Item:          item,
 		ItemName:      itemName,
 		SubItems:      subItems,
+		SubItemsHtml:  nil,
 		SubItemPrefix: subItemPrefix,
 
 		CanUpload:  canUpload,

src/tpl/page.html

@@ -45,15 +45,15 @@
 			<span class="time"></span>
 		</a>
 	</li>
-	{{range .SubItems}}{{with .Html}}
+	{{range .SubItemsHtml}}
 		<li class="{{if .IsDir}}dir{{else}}file{{end}}">
 			<a href="{{$subItemPrefix}}{{.Link}}{{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>
 
 {{if eq .Status 403}}

src/tpl/page.html.go

@@ -50,15 +50,15 @@ const pageTplStr = `
 <span class="time"></span>
 </a>
 </li>
-{{range .SubItems}}{{with .Html}}
+{{range .SubItemsHtml}}
 <li class="{{if .IsDir}}dir{{else}}file{{end}}">
 <a href="{{$subItemPrefix}}{{.Link}}{{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>
 {{if eq .Status 403}}
 <div class="error">403 resource is forbidden</div>