Skip to content

Commit 4d7a76a

Browse files
committed
refactor(serverHandler): move page render related function to "page.go"
1 parent 42f459a commit 4d7a76a

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

src/serverHandler/page.go

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
package serverHandler
22

3-
import "net/http"
3+
import (
4+
tplutil "../tpl/util"
5+
"net/http"
6+
)
7+
8+
func updateSubItemsForPage(subItems []*subItem) {
9+
for _, item := range subItems {
10+
info := item.Info
11+
name := info.Name()
12+
item.Html = &itemHtml{
13+
IsDir: info.IsDir(),
14+
Link: name,
15+
Name: tplutil.FormatFilename(name),
16+
Size: tplutil.FormatSize(info.Size()),
17+
ModTime: tplutil.FormatTime(info.ModTime()),
18+
}
19+
}
20+
}
421

522
func (h *handler) page(w http.ResponseWriter, r *http.Request, data *responseData) {
623
header := w.Header()
@@ -10,7 +27,7 @@ func (h *handler) page(w http.ResponseWriter, r *http.Request, data *responseDat
1027
w.WriteHeader(data.Status)
1128

1229
if needResponseBody(r.Method) {
13-
updateSubsItemHtml(data.SubItems)
30+
updateSubItemsForPage(data.SubItems)
1431
err := h.template.Execute(w, data)
1532
h.errHandler.LogError(err)
1633
}

src/serverHandler/responseData.go

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package serverHandler
22

33
import (
4-
tplutil "../tpl/util"
54
"../util"
65
"html/template"
76
"net/http"
@@ -229,20 +228,6 @@ func getSubItems(subInfos []os.FileInfo) []*subItem {
229228
return subItems
230229
}
231230

232-
func updateSubsItemHtml(subItems []*subItem) {
233-
for _, item := range subItems {
234-
info := item.Info
235-
name := info.Name()
236-
item.Html = &itemHtml{
237-
IsDir: info.IsDir(),
238-
Link: name,
239-
Name: tplutil.FormatFilename(name),
240-
Size: tplutil.FormatSize(info.Size()),
241-
ModTime: tplutil.FormatTime(info.ModTime()),
242-
}
243-
}
244-
}
245-
246231
func sortSubItems(subItems []*subItem) {
247232
sort.Slice(
248233
subItems,
@@ -261,6 +246,7 @@ func sortSubItems(subItems []*subItem) {
261246
},
262247
)
263248
}
249+
264250
func getStatusByErr(err error) int {
265251
switch {
266252
case os.IsPermission(err):

0 commit comments

Comments
 (0)