Skip to content

Commit 7dd04c6

Browse files
committed
refactor(serverHandler): simplify getting response data
1 parent 5b92875 commit 7dd04c6

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

src/serverHandler/responseData.go

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -114,19 +114,12 @@ func stat(reqFsPath string, visitFs bool) (file *os.File, item os.FileInfo, err
114114
return
115115
}
116116

117-
func readdir(file *os.File, item os.FileInfo, visitFs bool) (subItems []os.FileInfo, errs []error) {
117+
func readdir(file *os.File, item os.FileInfo, visitFs bool) (subItems []os.FileInfo, err error) {
118118
if !visitFs || file == nil || item == nil || !item.IsDir() {
119119
return
120120
}
121121

122-
var err error
123-
subItems, err = file.Readdir(0)
124-
if err != nil {
125-
errs = append(errs, err)
126-
return
127-
}
128-
129-
return
122+
return file.Readdir(0)
130123
}
131124

132125
func (h *handler) mergeAlias(rawRequestPath string, subItems *[]os.FileInfo) []error {
@@ -295,18 +288,22 @@ func (h *handler) getResponseData(r *http.Request) (data *responseData) {
295288
if _statErr != nil {
296289
errs = append(errs, _statErr)
297290
notFound = os.IsNotExist(_statErr)
298-
internalError = internalError || !notFound
291+
internalError = !notFound
299292
}
300293

301294
itemName := getItemName(item, r)
302295

303-
subInfos, _readdirErrs := readdir(file, item, needResponseBody(r.Method))
304-
errs = append(errs, _readdirErrs...)
305-
internalError = internalError || len(_readdirErrs) > 0
296+
subInfos, _readdirErr := readdir(file, item, needResponseBody(r.Method))
297+
if _readdirErr != nil {
298+
errs = append(errs, _readdirErr)
299+
internalError = true
300+
}
306301

307302
_mergeErrs := h.mergeAlias(rawReqPath, &subInfos)
308-
errs = append(errs, _mergeErrs...)
309-
internalError = internalError || len(_mergeErrs) > 0
303+
if len(_mergeErrs) > 0 {
304+
errs = append(errs, _mergeErrs...)
305+
internalError = true
306+
}
310307

311308
subInfos = h.FilterItems(subInfos)
312309

0 commit comments

Comments
 (0)