feat(recursive-move): add overwrite option to preventing unintentional overwriting

server/handles/fsbatch.go

@@ -3,6 +3,7 @@ package handles
 import (
 	"fmt"
 	"regexp"
+	"slices"
 
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/fs"
@@ -14,56 +15,10 @@ import (
 	"github.com/pkg/errors"
 )
 
-type BatchRenameReq struct {
-	SrcDir        string `json:"src_dir"`
-	RenameObjects []struct {
-		SrcName string `json:"src_name"`
-		NewName string `json:"new_name"`
-	} `json:"rename_objects"`
-}
-
-func FsBatchRename(c *gin.Context) {
-	var req BatchRenameReq
-	if err := c.ShouldBind(&req); err != nil {
-		common.ErrorResp(c, err, 400)
-		return
-	}
-	user := c.MustGet("user").(*model.User)
-	if !user.CanRename() {
-		common.ErrorResp(c, errs.PermissionDenied, 403)
-		return
-	}
-
-	reqPath, err := user.JoinPath(req.SrcDir)
-	if err != nil {
-		common.ErrorResp(c, err, 403)
-		return
-	}
-
-	meta, err := op.GetNearestMeta(reqPath)
-	if err != nil {
-		if !errors.Is(errors.Cause(err), errs.MetaNotFound) {
-			common.ErrorResp(c, err, 500, true)
-			return
-		}
-	}
-	c.Set("meta", meta)
-	for _, renameObject := range req.RenameObjects {
-		if renameObject.SrcName == "" || renameObject.NewName == "" {
-			continue
-		}
-		filePath := fmt.Sprintf("%s/%s", reqPath, renameObject.SrcName)
-		if err := fs.Rename(c, filePath, renameObject.NewName); err != nil {
-			common.ErrorResp(c, err, 500)
-			return
-		}
-	}
-	common.SuccessResp(c)
-}
-
 type RecursiveMoveReq struct {
-	SrcDir string `json:"src_dir"`
-	DstDir string `json:"dst_dir"`
+	SrcDir    string `json:"src_dir"`
+	DstDir    string `json:"dst_dir"`
+	Overwrite bool   `json:"overwrite"`
 }
 
 func FsRecursiveMove(c *gin.Context) {
@@ -104,9 +59,23 @@ func FsRecursiveMove(c *gin.Context) {
 		return
 	}
 
+	var existingFileNames []string
+	if !req.Overwrite {
+		dstFiles, err := fs.List(c, dstDir, &fs.ListArgs{})
+		if err != nil {
+			common.ErrorResp(c, err, 500)
+			return
+		}
+		existingFileNames = make([]string, 0, len(dstFiles))
+		for _, dstFile := range dstFiles {
+			existingFileNames = append(existingFileNames, dstFile.GetName())
+		}
+	}
+
 	// record the file path
 	filePathMap := make(map[model.Obj]string)
 	movingFiles := generic.NewQueue[model.Obj]()
+	movingFileNames := make([]string, 0, len(rootFiles))
 	for _, file := range rootFiles {
 		movingFiles.Push(file)
 		filePathMap[file] = srcDir
@@ -136,16 +105,75 @@ func FsRecursiveMove(c *gin.Context) {
 				continue
 			}
 
-			// move
-			err := fs.Move(c, movingFileName, dstDir, movingFiles.IsEmpty())
-			if err != nil {
-				common.ErrorResp(c, err, 500)
-				return
+			if !req.Overwrite {
+				if slices.Contains(existingFileNames, movingFile.GetName()) {
+					common.ErrorStrResp(c, fmt.Sprintf("file [%s] exists", movingFile.GetName()), 403)
+					return
+				}
+				existingFileNames = append(existingFileNames, movingFile.GetName())
 			}
+
+			movingFileNames = append(movingFileNames, movingFileName)
+		}
+
+	}
+
+	for i, fileName := range movingFileNames {
+		// move
+		err := fs.Move(c, fileName, dstDir, len(movingFileNames) > i+1)
+		if err != nil {
+			common.ErrorResp(c, err, 500)
+			return
 		}
+	}
+
+	common.SuccessResp(c)
+}
+
+type BatchRenameReq struct {
+	SrcDir        string `json:"src_dir"`
+	RenameObjects []struct {
+		SrcName string `json:"src_name"`
+		NewName string `json:"new_name"`
+	} `json:"rename_objects"`
+}
+
+func FsBatchRename(c *gin.Context) {
+	var req BatchRenameReq
+	if err := c.ShouldBind(&req); err != nil {
+		common.ErrorResp(c, err, 400)
+		return
+	}
+	user := c.MustGet("user").(*model.User)
+	if !user.CanRename() {
+		common.ErrorResp(c, errs.PermissionDenied, 403)
+		return
+	}
 
+	reqPath, err := user.JoinPath(req.SrcDir)
+	if err != nil {
+		common.ErrorResp(c, err, 403)
+		return
 	}
 
+	meta, err := op.GetNearestMeta(reqPath)
+	if err != nil {
+		if !errors.Is(errors.Cause(err), errs.MetaNotFound) {
+			common.ErrorResp(c, err, 500, true)
+			return
+		}
+	}
+	c.Set("meta", meta)
+	for _, renameObject := range req.RenameObjects {
+		if renameObject.SrcName == "" || renameObject.NewName == "" {
+			continue
+		}
+		filePath := fmt.Sprintf("%s/%s", reqPath, renameObject.SrcName)
+		if err := fs.Rename(c, filePath, renameObject.NewName); err != nil {
+			common.ErrorResp(c, err, 500)
+			return
+		}
+	}
 	common.SuccessResp(c)
 }