From cd9e9e25b931d7483f68430ff1901799090e0f51 Mon Sep 17 00:00:00 2001 From: xkeyC <3334969096@qq.com> Date: Tue, 28 Mar 2023 00:06:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=85=E5=9C=A8=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=97=B6=20overwrite?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/webdav/file.go | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/pkg/webdav/file.go b/pkg/webdav/file.go index 9f7735d..d353c9e 100644 --- a/pkg/webdav/file.go +++ b/pkg/webdav/file.go @@ -40,22 +40,11 @@ func moveFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst // 判断是否需要移动 if src.GetPosition() != path.Dir(dst) { - err = fs.Move( - ctx, - folderIDs, - fileIDs, - src.GetPosition(), - path.Dir(dst), - ) - } - if overwrite { - if err := _checkOverwriteFile(ctx, fs, src, dst); err != nil { - return http.StatusNoContent, err + if overwrite { + if err := _checkOverwriteFile(ctx, fs, src, dst); err != nil { + return http.StatusNoContent, err + } } - } - - // 判断是否需要移动 - if src.GetPosition() != path.Dir(dst) { err = fs.Move( ctx, folderIDs, @@ -65,15 +54,6 @@ func moveFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst ) } - // 判断是否需要重命名 - if err == nil && src.GetName() != path.Base(dst) { - err = fs.Rename( - ctx, - folderIDs, - fileIDs, - path.Base(dst), - ) - } // 判断是否需要重命名 if err == nil && src.GetName() != path.Base(dst) { err = fs.Rename(