ProjectHentai/alist
6
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(recursive-move): Advanced conflict policy for preventing unintentional overwriting (#7906)

Browse Source
This commit is contained in:
Jealous
2025-02-09 18:32:57 +08:00
committed by GitHub
parent 0219c4e15a
commit b9ad18bd0a
3 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/handles/const.go Normal file
View File

@ -0,0 +1,7 @@
package handles
const (
CANCEL = "cancel"
OVERWRITE = "overwrite"
SKIP = "skip"
)

22
server/handles/fsbatch.go
View File

@ -16,9 +16,9 @@ import (
)
type RecursiveMoveReq struct {
SrcDir string `json:"src_dir"`
DstDir string `json:"dst_dir"`
Overwrite bool `json:"overwrite"`
SrcDir string `json:"src_dir"`
DstDir string `json:"dst_dir"`
ConflictPolicy string `json:"conflict_policy"`
}
func FsRecursiveMove(c *gin.Context) {
@ -60,7 +60,7 @@ func FsRecursiveMove(c *gin.Context) {
}
var existingFileNames []string
if !req.Overwrite {
if req.ConflictPolicy != OVERWRITE {
dstFiles, err := fs.List(c, dstDir, &fs.ListArgs{})
if err != nil {
common.ErrorResp(c, err, 500)
@ -99,25 +99,28 @@ func FsRecursiveMove(c *gin.Context) {
filePathMap[subFile] = subFilePath
}
} else {
if movingFilePath == dstDir {
// same directory, don't move
continue
}
if !req.Overwrite {
if slices.Contains(existingFileNames, movingFile.GetName()) {
if slices.Contains(existingFileNames, movingFile.GetName()) {
if req.ConflictPolicy == CANCEL {
common.ErrorStrResp(c, fmt.Sprintf("file [%s] exists", movingFile.GetName()), 403)
return
} else if req.ConflictPolicy == SKIP {
continue
}
} else if req.ConflictPolicy != OVERWRITE {
existingFileNames = append(existingFileNames, movingFile.GetName())
}
movingFileNames = append(movingFileNames, movingFileName)
}
}
var count = 0
for i, fileName := range movingFileNames {
// move
err := fs.Move(c, fileName, dstDir, len(movingFileNames) > i+1)
@ -125,9 +128,10 @@ func FsRecursiveMove(c *gin.Context) {
common.ErrorResp(c, err, 500)
return
}
count++
}
common.SuccessResp(c)
common.SuccessWithMsgResp(c, fmt.Sprintf("Successfully moved %d %s", count, common.Pluralize(count, "file", "files")))
}
type BatchRenameReq struct {