b0esche/b0esche_cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Properly detect if target path is a folder when moving files

Browse Source
This commit is contained in:
Leon Bösche
2026-01-12 00:09:39 +01:00
parent 675c2bf95d
commit 80411d9231
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
go_cloud/internal/http/routes.go
View File

@@ -1319,10 +1319,21 @@ func moveOrgFileHandler(w http.ResponseWriter, r *http.Request, db *database.DB,
return return
} }
// Determine new file name // Determine new file name - check if target is a folder
var newPath string var newPath string
if strings.HasSuffix(req.TargetPath, "/") { var targetFile *database.File
// Moving into a folder for i := range sourceFiles {
if sourceFiles[i].Path == req.TargetPath {
targetFile = &sourceFiles[i]
break
}
}
if targetFile != nil && targetFile.Type == "folder" {
// Target is a folder, move file into it
newPath = path.Join(req.TargetPath, sourceFile.Name)
} else if targetFile == nil && strings.HasSuffix(req.TargetPath, "/") {
// Target path doesn't exist but ends with /, treat as folder
newPath = path.Join(req.TargetPath, sourceFile.Name) newPath = path.Join(req.TargetPath, sourceFile.Name)
} else { } else {
// Moving/renaming to a specific path // Moving/renaming to a specific path
@@ -1514,10 +1525,21 @@ func moveUserFileHandler(w http.ResponseWriter, r *http.Request, db *database.DB
return return
} }
// Determine new file name // Determine new file name - check if target is a folder
var newPath string var newPath string
if strings.HasSuffix(req.TargetPath, "/") { var targetFile *database.File
// Moving into a folder for i := range sourceFiles {
if sourceFiles[i].Path == req.TargetPath {
targetFile = &sourceFiles[i]
break
}
}
if targetFile != nil && targetFile.Type == "folder" {
// Target is a folder, move file into it
newPath = path.Join(req.TargetPath, sourceFile.Name)
} else if targetFile == nil && strings.HasSuffix(req.TargetPath, "/") {
// Target path doesn't exist but ends with /, treat as folder
newPath = path.Join(req.TargetPath, sourceFile.Name) newPath = path.Join(req.TargetPath, sourceFile.Name)
} else { } else {
// Moving/renaming to a specific path // Moving/renaming to a specific path