feat(Webdav):Add overwrite support for moveFiles and copyFiles

pull/1679/head
xkeyC 1 year ago
parent f172220825
commit ca7b21dc3e

@ -38,26 +38,51 @@ func moveFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst
fileIDs = []uint{src.(*model.File).ID} fileIDs = []uint{src.(*model.File).ID}
} }
// 判断是否需要移动 // 判断是否需要移动
if src.GetPosition() != path.Dir(dst) { if src.GetPosition() != path.Dir(dst) {
err = fs.Move( err = fs.Move(
ctx, ctx,
folderIDs, folderIDs,
fileIDs, fileIDs,
src.GetPosition(), src.GetPosition(),
path.Dir(dst), path.Dir(dst),
) )
} }
if overwrite {
// 判断是否需要重命名 if err := _checkOverwriteFile(ctx, fs, src, dst); err != nil {
if err == nil && src.GetName() != path.Base(dst) { return http.StatusNoContent, err
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 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 { if err != nil {
return http.StatusInternalServerError, err return http.StatusInternalServerError, err
@ -74,6 +99,12 @@ func copyFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst
} }
recursion++ recursion++
if overwrite {
if err := _checkOverwriteFile(ctx, fs, src, dst); err != nil {
return http.StatusNoContent, err
}
}
if src.IsDir() { if src.IsDir() {
err := fs.Copy( err := fs.Copy(
ctx, ctx,
@ -94,6 +125,22 @@ func copyFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst
return http.StatusNoContent, nil 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. // walkFS traverses filesystem fs starting at name up to depth levels.
// //
// Allowed values for depth are 0, 1 or infiniteDepth. For each visited node, // Allowed values for depth are 0, 1 or infiniteDepth. For each visited node,

Loading…
Cancel
Save