wsy182/Cloudreve
1
0
Fork 0
mirror of https://github.com/halejohn/Cloudreve.git synced 2026-01-26 17:41:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix:仅在需要移动时 overwrite

Browse Source
This commit is contained in:
xkeyC
2023-03-28 00:06:10 +08:00
parent ca7b21dc3e
commit cd9e9e25b9
1 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/webdav/file.go
View File

@@ -40,22 +40,11 @@ func moveFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst
// 判断是否需要移动 // 判断是否需要移动
if src.GetPosition() != path.Dir(dst) { if src.GetPosition() != path.Dir(dst) {
err = fs.Move( if overwrite {
ctx, if err := _checkOverwriteFile(ctx, fs, src, dst); err != nil {
folderIDs, return http.StatusNoContent, err
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( err = fs.Move(
ctx, ctx,
folderIDs, 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) { if err == nil && src.GetName() != path.Base(dst) {
err = fs.Rename( err = fs.Rename(