Skip to content

Commit d6bbcdc

Browse files
authored
fix: improve pagination handling and directory naming in recycle bin (#12535)
1 parent abd1581 commit d6bbcdc

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

agent/app/service/recycle_bin.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,18 @@ func (r RecycleBinService) Page(search dto.PageInfo) (int64, []response.RecycleB
6262
result = append(result, collectTrashEntries(clashRoot)...)
6363
result = append(result, collectLegacyEntries(clashRoot)...)
6464
}
65-
startIndex := (search.Page - 1) * search.PageSize
65+
if search.PageSize <= 0 {
66+
return int64(len(result)), []response.RecycleBinDTO{}, nil
67+
}
68+
page := search.Page
69+
if page < 1 {
70+
page = 1
71+
}
72+
startIndex := (page - 1) * search.PageSize
6673
endIndex := startIndex + search.PageSize
6774

68-
if startIndex > len(result) {
69-
return int64(len(result)), result, nil
75+
if startIndex >= len(result) {
76+
return int64(len(result)), []response.RecycleBinDTO{}, nil
7077
}
7178
if endIndex > len(result) {
7279
endIndex = len(result)
@@ -174,7 +181,7 @@ func (r RecycleBinService) Clear() error {
174181
if !op.Stat(dir) {
175182
continue
176183
}
177-
newDir := path.Join(p.Mountpoint, "1panel_clash")
184+
newDir := path.Join(p.Mountpoint, recycleBinClashDir+"-"+strings.ReplaceAll(common.GetUuid(), "-", ""))
178185
if err := op.Mv(dir, newDir); err != nil {
179186
return err
180187
}

0 commit comments

Comments
 (0)