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

FIX: Simplify move handler and fix API call

Browse Source
This commit is contained in:
Leon Bösche
2026-01-11 23:39:15 +01:00
parent 60df1a38ff
commit 1680914017
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
b0esche_cloud/lib/services/file_service.dart
View File

@@ -161,13 +161,11 @@ class FileService {
String sourcePath, String sourcePath,
String targetPath, String targetPath,
) async { ) async {
final response = await apiClient.post( await _apiClient.post(
'/orgs/$orgId/files/move', '/orgs/$orgId/files/move',
data: {'sourcePath': sourcePath, 'targetPath': targetPath}, data: {'sourcePath': sourcePath, 'targetPath': targetPath},
fromJson: (d) => null,
); );
if (response.statusCode != 200) {
throw Exception('Failed to move file: ${response.statusCode}');
}
} }
Future<void> renameFile(String orgId, String path, String newName) async { Future<void> renameFile(String orgId, String path, String newName) async {

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

@@ -1297,18 +1297,18 @@ func moveOrgFileHandler(w http.ResponseWriter, r *http.Request, db *database.DB,
// Get or create user's WebDAV client and move in Nextcloud // Get or create user's WebDAV client and move in Nextcloud
storageClient, err := getUserWebDAVClient(r.Context(), db, userID, cfg.NextcloudURL, cfg.NextcloudUser, cfg.NextcloudPass) storageClient, err := getUserWebDAVClient(r.Context(), db, userID, cfg.NextcloudURL, cfg.NextcloudUser, cfg.NextcloudPass)
if err != nil { if err != nil {
errors.LogError(r, err, "Failed to get user WebDAV client (continuing with database move)") errors.LogError(r, err, "Failed to get user WebDAV client (continuing with database operation)")
} else { } else {
sourceRel := strings.TrimPrefix(req.SourcePath, "/") sourceRel := strings.TrimPrefix(req.SourcePath, "/")
sourcePath := path.Join("/orgs", orgID.String(), sourceRel) sourcePath := path.Join("/orgs", orgID.String(), sourceRel)
targetRel := strings.TrimPrefix(req.TargetPath, "/") targetRel := strings.TrimPrefix(req.TargetPath, "/")
targetPath := path.Join("/orgs", orgID.String(), targetRel) targetPath := path.Join("/orgs", orgID.String(), targetRel)
if err := storageClient.Move(r.Context(), sourcePath, targetPath); err != nil { if err := storageClient.Move(r.Context(), sourcePath, targetPath); err != nil {
errors.LogError(r, err, "Failed to move in Nextcloud (continuing with database move)") errors.LogError(r, err, "Failed to move in Nextcloud (continuing with database operation)")
} }
} }
// Delete old file record from database - next sync will recreate with new path // Delete old file record from database - file will be synced with new path from storage
if err := db.DeleteFileByPath(r.Context(), &orgID, nil, req.SourcePath); err != nil { if err := db.DeleteFileByPath(r.Context(), &orgID, nil, req.SourcePath); err != nil {
errors.LogError(r, err, "Failed to delete old file record") errors.LogError(r, err, "Failed to delete old file record")
} }