Folder move added

webui/backend/app/services/move_task_service.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from pathlib import Path
+
 from backend.app.api.errors import AppError
 from backend.app.api.schemas import TaskCreateResponse
 from backend.app.db.task_repository import TaskRepository
@@ -20,14 +22,16 @@ class MoveTaskService:
         if lexical_source.is_symlink():
             raise AppError(
                 code="type_conflict",
-                message="Source must be a regular file",
+                message="Source must not be a symlink",
                 status_code=409,
                 details={"path": source},
             )
-        if not resolved_source.absolute.is_file():
+        source_is_file = resolved_source.absolute.is_file()
+        source_is_directory = resolved_source.absolute.is_dir()
+        if not source_is_file and not source_is_directory:
             raise AppError(
                 code="type_conflict",
-                message="Source must be a file",
+                message="Unsupported source path type",
                 status_code=409,
                 details={"path": source},
             )
@@ -41,6 +45,14 @@ class MoveTaskService:
         )
         self._map_directory_validation(parent_relative)
 
+        if source_is_directory and resolved_destination.absolute == resolved_source.absolute:
+            raise AppError(
+                code="invalid_request",
+                message="Destination must differ from source",
+                status_code=400,
+                details={"path": source, "destination": destination},
+            )
+
         if resolved_destination.absolute.exists():
             raise AppError(
                 code="already_exists",
@@ -49,6 +61,36 @@ class MoveTaskService:
                 details={"path": resolved_destination.relative},
             )
 
+        same_root = resolved_source.alias == resolved_destination.alias
+
+        if source_is_directory:
+            if not same_root:
+                raise AppError(
+                    code="invalid_request",
+                    message="Cross-root directory move is not supported in v1",
+                    status_code=400,
+                    details={"path": source, "destination": destination},
+                )
+            if self._is_nested_destination(resolved_source.absolute, resolved_destination.absolute):
+                raise AppError(
+                    code="invalid_request",
+                    message="Destination cannot be inside source",
+                    status_code=400,
+                    details={"path": source, "destination": destination},
+                )
+
+            task = self._repository.create_task(
+                operation="move",
+                source=resolved_source.relative,
+                destination=resolved_destination.relative,
+            )
+            self._runner.enqueue_move_directory(
+                task_id=task["id"],
+                source=str(resolved_source.absolute),
+                destination=str(resolved_destination.absolute),
+            )
+            return TaskCreateResponse(task_id=task["id"], status=task["status"])
+
         total_bytes = int(resolved_source.absolute.stat().st_size)
         task = self._repository.create_task(
             operation="move",
@@ -56,7 +98,6 @@ class MoveTaskService:
             destination=resolved_destination.relative,
         )
 
-        same_root = resolved_source.alias == resolved_destination.alias
         self._runner.enqueue_move_file(
             task_id=task["id"],
             source=str(resolved_source.absolute),
@@ -79,3 +120,11 @@ class MoveTaskService:
                     details=exc.details,
                 )
             raise
+
+    @staticmethod
+    def _is_nested_destination(source: Path, destination: Path) -> bool:
+        try:
+            destination.relative_to(source)
+            return True
+        except ValueError:
+            return False