Commit ba4307c

authored

fix: Optimize backup file upload display (1Panel-dev#9797)

1 parent b8b2041 commit ba4307cCopy full SHA for ba4307c

File tree

+17

-11

lines changed

+17

-11

lines changed

Lines changed: 17 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -98,19 +98,25 @@ func (f *FileService) SearchUploadWithPage(req request.SearchUploadWithPage) (in`
`98`	`98`	`files []response.UploadInfo`
`99`	`99`	`backData []response.UploadInfo`
`100`	`100`	`)`
`101`		`- _ = filepath.Walk(req.Path, func(path string, info os.FileInfo, err error) error {`
`102`		`- if err != nil {`
`103`		`- return nil`
	`101`	`+ fileList, err := os.ReadDir(req.Path)`
	`102`	`+ if err != nil {`
	`103`	`+ return 0, files, nil`
	`104`	`+ }`
	`105`	`+ for _, item := range fileList {`
	`106`	`+ if item.IsDir() {`
	`107`	`+ continue`
`104`	`108`	`}`
`105`		`- if !info.IsDir() {`
`106`		`- files = append(files, response.UploadInfo{`
`107`		`- CreatedAt: info.ModTime().Format(constant.DateTimeLayout),`
`108`		`- Size: int(info.Size()),`
`109`		`- Name: info.Name(),`
`110`		`- })`
	`109`	`+ fileItem, err := item.Info()`
	`110`	`+ if err != nil {`
	`111`	`+ continue`
`111`	`112`	`}`
`112`		`- return nil`
`113`		`- })`
	`113`	`+ files = append(files, response.UploadInfo{`
	`114`	`+ CreatedAt: fileItem.ModTime().Format(constant.DateTimeLayout),`
	`115`	`+ Size: int(fileItem.Size()),`
	`116`	`+ Name: item.Name(),`
	`117`	`+ })`
	`118`	`+ }`
	`119`	`+`
`114`	`120`	`total, start, end := len(files), (req.Page-1)req.PageSize, req.Pagereq.PageSize`
`115`	`121`	`if start > total {`
`116`	`122`	`backData = make([]response.UploadInfo, 0)`

Comments

(0)