gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-31 14:08:06 +08:00
Code

fix: 解决回收站文件放置错误问题 (#4203)

Browse Source 
Refs https://github.com/1Panel-dev/1Panel/issues/4199
This commit is contained in:
zhengkunwang 2024-03-15 16:40:07 +08:00 committed by GitHub
parent 341f45b4ef
commit 46f01032b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
backend/app/service/recycle_bin.go
View File

@ -153,22 +153,20 @@ func (r RecycleBinService) Clear() error {
} }
func getClashDir(realPath string) (string, error) { func getClashDir(realPath string) (string, error) {
trimmedPath := strings.Trim(realPath, "/") partitions, err := disk.Partitions(false)
parts := strings.Split(trimmedPath, "/") if err != nil {
dir := "" return "", err
if len(parts) > 0 { }
dir = parts[0] for _, p := range partitions {
partitions, err := disk.Partitions(false) if p.Mountpoint == "/" {
if err != nil { continue
return "", err
} }
for _, p := range partitions { if strings.HasPrefix(realPath, p.Mountpoint) {
if p.Mountpoint == dir { clashDir := path.Join(p.Mountpoint, ".1panel_clash")
if err = createClashDir(path.Join(p.Mountpoint, ".1panel_clash")); err != nil { if err = createClashDir(path.Join(p.Mountpoint, ".1panel_clash")); err != nil {
return "", err return "", err
}
return dir, nil
} }
return clashDir, nil
} }
} }
return constant.RecycleBinDir, createClashDir(constant.RecycleBinDir) return constant.RecycleBinDir, createClashDir(constant.RecycleBinDir)