Fix: WebDAV cannot move and rename at the same time (#1056)

pkg/webdav/file.go

@@ -38,21 +38,24 @@ func moveFiles(ctx context.Context, fs *filesystem.FileSystem, src FileInfo, dst
 		fileIDs = []uint{src.(*model.File).ID}
 	}
 
-	// 判断是否为重命名
+        // 判断是否需要移动
-	if src.GetPosition() == path.Dir(dst) {
+        if src.GetPosition() != path.Dir(dst) {
-		err = fs.Rename(
+                err = fs.Move(
                         ctx,
                         folderIDs,
                         fileIDs,
-			path.Base(dst),
+                        src.GetPosition(),
+                        path.Dir(dst),
                 )
-	} else {
+        }
-		err = fs.Move(
+
+        // 判断是否需要重命名
+        if err == nil && src.GetName() != path.Base(dst) {
+                err = fs.Rename(
                         ctx,
                         folderIDs,
                         fileIDs,
-			src.GetPosition(),
+                        path.Base(dst),
-			path.Dir(dst),
                 )
         }