1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-10 15:36:45 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 解决特殊字符下文件放入回收站失败的问题 (#4480)

Browse source
This commit is contained in:
zhengkunwang 2024-04-11 19:08:11 +08:00 • committed by GitHub
parent 38b0c42555
commit 96e48847d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
backend/utils/files/file_op.go
View file

@ -322,7 +322,7 @@ func (f FileOp) Cut(oldPaths []string, dst, name string, cover bool) error {
coverFlag = "-f" coverFlag = "-f"
} }
cmdStr := fmt.Sprintf(`mv %s "%s" "%s"`, coverFlag, p, dstPath) cmdStr := fmt.Sprintf(`mv %s '%s' '%s'`, coverFlag, p, dstPath)
if err := cmd.ExecCmd(cmdStr); err != nil { if err := cmd.ExecCmd(cmdStr); err != nil {
return err return err
} }
@ -331,7 +331,7 @@ func (f FileOp) Cut(oldPaths []string, dst, name string, cover bool) error {
} }
func (f FileOp) Mv(oldPath, dstPath string) error { func (f FileOp) Mv(oldPath, dstPath string) error {
cmdStr := fmt.Sprintf(`mv "%s" "%s"`, oldPath, dstPath) cmdStr := fmt.Sprintf(`mv '%s' '%s'`, oldPath, dstPath)
if err := cmd.ExecCmd(cmdStr); err != nil { if err := cmd.ExecCmd(cmdStr); err != nil {
return err return err
} }
@ -385,13 +385,13 @@ func (f FileOp) CopyAndReName(src, dst, name string, cover bool) error {
if name != "" && !cover { if name != "" && !cover {
dstPath = filepath.Join(dst, name) dstPath = filepath.Join(dst, name)
} }
return cmd.ExecCmd(fmt.Sprintf(`cp -rf "%s" "%s"`, src, dstPath)) return cmd.ExecCmd(fmt.Sprintf(`cp -rf '%s' '%s'`, src, dstPath))
} else { } else {
dstPath := filepath.Join(dst, name) dstPath := filepath.Join(dst, name)
if cover { if cover {
dstPath = dst dstPath = dst
} }
return cmd.ExecCmd(fmt.Sprintf(`cp -f "%s" "%s"`, src, dstPath)) return cmd.ExecCmd(fmt.Sprintf(`cp -f '%s' '%s'`, src, dstPath))
} }
} }
@ -404,12 +404,12 @@ func (f FileOp) CopyDir(src, dst string) error {
if err = f.Fs.MkdirAll(dstDir, srcInfo.Mode()); err != nil { if err = f.Fs.MkdirAll(dstDir, srcInfo.Mode()); err != nil {
return err return err
} }
return cmd.ExecCmd(fmt.Sprintf(`cp -rf "%s" "%s"`, src, dst+"/")) return cmd.ExecCmd(fmt.Sprintf(`cp -rf '%s' '%s'`, src, dst+"/"))
} }
func (f FileOp) CopyFile(src, dst string) error { func (f FileOp) CopyFile(src, dst string) error {
dst = filepath.Clean(dst) + string(filepath.Separator) dst = filepath.Clean(dst) + string(filepath.Separator)
return cmd.ExecCmd(fmt.Sprintf(`cp -f "%s" "%s"`, src, dst+"/")) return cmd.ExecCmd(fmt.Sprintf(`cp -f '%s' '%s'`, src, dst+"/"))
} }
func (f FileOp) GetDirSize(path string) (float64, error) { func (f FileOp) GetDirSize(path string) (float64, error) {