github
/
Cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Fork 0
Code Issues Releases Wiki Activity

moveFiles 修改回无条件 overwrite （Move 或 Rename 都会处罚冲突问题）

pull/1679/head
xkeyC 2023-03-29 20:16:09 +08:00
parent e8e38029ca
commit 42f7613bfa
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/webdav/file.go
View File

@ -38,13 +38,14 @@ func moveFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst
fileIDs = []uint{src.(*model.File).ID} 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 src.GetPosition() != path.Dir(dst) {
if overwrite {
if err := _checkOverwriteFile(ctx, fs, src, dst); err != nil {
return http.StatusInternalServerError, err
}
}
err = fs.Move( err = fs.Move(
ctx, ctx,
folderIDs, folderIDs,