starred/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-09-22 16:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve pagination handling and directory naming in recycle bin (#12535)

Browse Source
This commit is contained in:
蘭
2026-04-20 06:44:56 +00:00
committed by GitHub
parent abd1581c1d
commit d6bbcdc32f
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agent/app/service/recycle_bin.go
+11 -4
View File
@@ -62,11 +62,18 @@ func (r RecycleBinService) Page(search dto.PageInfo) (int64, []response.RecycleB
result = append(result, collectTrashEntries(clashRoot)...)
result = append(result, collectLegacyEntries(clashRoot)...)
}
startIndex := (search.Page - 1) * search.PageSize
if search.PageSize <= 0 {
return int64(len(result)), []response.RecycleBinDTO{}, nil
}
page := search.Page
if page < 1 {
page = 1
}
startIndex := (page - 1) * search.PageSize
endIndex := startIndex + search.PageSize
if startIndex > len(result) {
return int64(len(result)), result, nil
if startIndex >= len(result) {
return int64(len(result)), []response.RecycleBinDTO{}, nil
}
if endIndex > len(result) {
endIndex = len(result)
@@ -174,7 +181,7 @@ func (r RecycleBinService) Clear() error {
if !op.Stat(dir) {
continue
}
newDir := path.Join(p.Mountpoint, "1panel_clash")
newDir := path.Join(p.Mountpoint, recycleBinClashDir+"-"+strings.ReplaceAll(common.GetUuid(), "-", ""))
if err := op.Mv(dir, newDir); err != nil {
return err
}