From ca7b21dc3e8acac02e6d3a8b6dab418ad6a16d82 Mon Sep 17 00:00:00 2001 From: xkeyC <3334969096@qq.com> Date: Mon, 27 Mar 2023 22:55:20 +0800 Subject: [PATCH 1/4] feat(Webdav):Add overwrite support for moveFiles and copyFiles --- pkg/webdav/file.go | 87 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 67 insertions(+), 20 deletions(-) diff --git a/pkg/webdav/file.go b/pkg/webdav/file.go index 9957f65..9f7735d 100644 --- a/pkg/webdav/file.go +++ b/pkg/webdav/file.go @@ -38,26 +38,51 @@ func moveFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst fileIDs = []uint{src.(*model.File).ID} } - // 判断是否需要移动 - if src.GetPosition() != path.Dir(dst) { - err = fs.Move( - ctx, - folderIDs, - fileIDs, - src.GetPosition(), - path.Dir(dst), - ) - } - - // 判断是否需要重命名 - if err == nil && src.GetName() != path.Base(dst) { - err = fs.Rename( - ctx, - folderIDs, - fileIDs, - path.Base(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 src.GetPosition() != path.Dir(dst) { + err = fs.Move( + ctx, + folderIDs, + fileIDs, + src.GetPosition(), + path.Dir(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( + ctx, + folderIDs, + fileIDs, + path.Base(dst), + ) + } if err != nil { return http.StatusInternalServerError, err @@ -74,6 +99,12 @@ func copyFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst } recursion++ + if overwrite { + if err := _checkOverwriteFile(ctx, fs, src, dst); err != nil { + return http.StatusNoContent, err + } + } + if src.IsDir() { err := fs.Copy( ctx, @@ -94,6 +125,22 @@ func copyFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst return http.StatusNoContent, nil } +// 判断目标 文件/夹 是否已经存在，存在则先删除目标文件/夹 +func _checkOverwriteFile(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst string) error { + if src.IsDir() { + ok, folder := fs.IsPathExist(dst) + if ok { + return fs.Delete(ctx, []uint{folder.ID}, []uint{}, false, false) + } + } else { + ok, file := fs.IsFileExist(dst) + if ok { + return fs.Delete(ctx, []uint{}, []uint{file.ID}, false, false) + } + } + return nil +} + // walkFS traverses filesystem fs starting at name up to depth levels. // // Allowed values for depth are 0, 1 or infiniteDepth. For each visited node, 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 2/4] =?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( From e8e38029ca2f55329d9f49d48730322e88516894 Mon Sep 17 00:00:00 2001 From: xkeyC <3334969096@qq.com> Date: Tue, 28 Mar 2023 00:18:37 +0800 Subject: [PATCH 3/4] fix:error code --- pkg/webdav/file.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/webdav/file.go b/pkg/webdav/file.go index d353c9e..c9e17ed 100644 --- a/pkg/webdav/file.go +++ b/pkg/webdav/file.go @@ -42,7 +42,7 @@ func moveFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst if src.GetPosition() != path.Dir(dst) { if overwrite { if err := _checkOverwriteFile(ctx, fs, src, dst); err != nil { - return http.StatusNoContent, err + return http.StatusInternalServerError, err } } err = fs.Move( @@ -81,7 +81,7 @@ func copyFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst if overwrite { if err := _checkOverwriteFile(ctx, fs, src, dst); err != nil { - return http.StatusNoContent, err + return http.StatusInternalServerError, err } } From 42f7613bfae381e643eb7c19d2eccb1ba57fee7a Mon Sep 17 00:00:00 2001 From: xkeyC <3334969096@qq.com> Date: Wed, 29 Mar 2023 20:16:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?moveFiles=20=E4=BF=AE=E6=94=B9=E5=9B=9E?= =?UTF-8?q?=E6=97=A0=E6=9D=A1=E4=BB=B6=20overwrite=20=EF=BC=88Move=20?= =?UTF-8?q?=E6=88=96=20Rename=20=E9=83=BD=E4=BC=9A=E5=A4=84=E7=BD=9A?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/webdav/file.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/webdav/file.go b/pkg/webdav/file.go index c9e17ed..b36c1ed 100644 --- a/pkg/webdav/file.go +++ b/pkg/webdav/file.go @@ -38,13 +38,14 @@ func moveFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst fileIDs = []uint{src.(*model.File).ID} } + if overwrite { + if err := _checkOverwriteFile(ctx, fs, src, dst); err != nil { + return http.StatusInternalServerError, err + } + } + // 判断是否需要移动 if src.GetPosition() != path.Dir(dst) { - if overwrite { - if err := _checkOverwriteFile(ctx, fs, src, dst); err != nil { - return http.StatusInternalServerError, err - } - } err = fs.Move( ctx, folderIDs,