Folder move added

webui/backend/app/db/task_repository.py

@@ -125,39 +125,62 @@ class TaskRepository:
             ).fetchall()
         return [self._to_dict(row) for row in rows]
 
-    def mark_running(self, task_id: str, done_bytes: int, total_bytes: int | None, current_item: str | None) -> None:
+    def mark_running(
+        self,
+        task_id: str,
+        done_bytes: int | None = None,
+        total_bytes: int | None = None,
+        done_items: int | None = None,
+        total_items: int | None = None,
+        current_item: str | None = None,
+    ) -> None:
         started_at = self._now_iso()
         with self._connection() as conn:
             conn.execute(
                 """
                 UPDATE tasks
-                SET status = ?, started_at = ?, done_bytes = ?, total_bytes = ?, current_item = ?
+                SET status = ?, started_at = ?, done_bytes = ?, total_bytes = ?, done_items = ?, total_items = ?, current_item = ?
                 WHERE id = ?
                 """,
-                ("running", started_at, done_bytes, total_bytes, current_item, task_id),
+                ("running", started_at, done_bytes, total_bytes, done_items, total_items, current_item, task_id),
             )
 
-    def update_progress(self, task_id: str, done_bytes: int, total_bytes: int | None, current_item: str | None) -> None:
+    def update_progress(
+        self,
+        task_id: str,
+        done_bytes: int | None = None,
+        total_bytes: int | None = None,
+        done_items: int | None = None,
+        total_items: int | None = None,
+        current_item: str | None = None,
+    ) -> None:
         with self._connection() as conn:
             conn.execute(
                 """
                 UPDATE tasks
-                SET done_bytes = ?, total_bytes = ?, current_item = ?
+                SET done_bytes = ?, total_bytes = ?, done_items = ?, total_items = ?, current_item = ?
                 WHERE id = ?
                 """,
-                (done_bytes, total_bytes, current_item, task_id),
+                (done_bytes, total_bytes, done_items, total_items, current_item, task_id),
             )
 
-    def mark_completed(self, task_id: str, done_bytes: int | None, total_bytes: int | None) -> None:
+    def mark_completed(
+        self,
+        task_id: str,
+        done_bytes: int | None = None,
+        total_bytes: int | None = None,
+        done_items: int | None = None,
+        total_items: int | None = None,
+    ) -> None:
         finished_at = self._now_iso()
         with self._connection() as conn:
             conn.execute(
                 """
                 UPDATE tasks
-                SET status = ?, finished_at = ?, done_bytes = ?, total_bytes = ?
+                SET status = ?, finished_at = ?, done_bytes = ?, total_bytes = ?, done_items = ?, total_items = ?
                 WHERE id = ?
                 """,
-                ("completed", finished_at, done_bytes, total_bytes, task_id),
+                ("completed", finished_at, done_bytes, total_bytes, done_items, total_items, task_id),
             )
 
     def mark_failed(
@@ -168,16 +191,29 @@ class TaskRepository:
         failed_item: str | None,
         done_bytes: int | None,
         total_bytes: int | None,
+        done_items: int | None = None,
+        total_items: int | None = None,
     ) -> None:
         finished_at = self._now_iso()
         with self._connection() as conn:
             conn.execute(
                 """
                 UPDATE tasks
-                SET status = ?, finished_at = ?, error_code = ?, error_message = ?, failed_item = ?, done_bytes = ?, total_bytes = ?
+                SET status = ?, finished_at = ?, error_code = ?, error_message = ?, failed_item = ?, done_bytes = ?, total_bytes = ?, done_items = ?, total_items = ?
                 WHERE id = ?
                 """,
-                ("failed", finished_at, error_code, error_message, failed_item, done_bytes, total_bytes, task_id),
+                (
+                    "failed",
+                    finished_at,
+                    error_code,
+                    error_message,
+                    failed_item,
+                    done_bytes,
+                    total_bytes,
+                    done_items,
+                    total_items,
+                    task_id,
+                ),
             )
 
     def _ensure_schema(self) -> None:

webui/backend/app/fs/filesystem_adapter.py

@@ -38,6 +38,9 @@ class FilesystemAdapter:
     def move_file(self, source: str, destination: str) -> None:
         Path(source).rename(Path(destination))
 
+    def move_directory(self, source: str, destination: str) -> None:
+        Path(source).rename(Path(destination))
+
     def is_directory_empty(self, path: Path) -> bool:
         return not any(path.iterdir())
 

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

webui/backend/app/tasks_runner.py

@@ -35,6 +35,14 @@ class TaskRunner:
         )
         thread.start()
 
+    def enqueue_move_directory(self, task_id: str, source: str, destination: str) -> None:
+        thread = threading.Thread(
+            target=self._run_move_directory,
+            args=(task_id, source, destination),
+            daemon=True,
+        )
+        thread.start()
+
     def _run_copy_file(self, task_id: str, source: str, destination: str, total_bytes: int) -> None:
         self._repository.mark_running(
             task_id=task_id,
@@ -123,3 +131,28 @@ class TaskRunner:
                 done_bytes=progress["done"],
                 total_bytes=total_bytes,
             )
+
+    def _run_move_directory(self, task_id: str, source: str, destination: str) -> None:
+        self._repository.mark_running(
+            task_id=task_id,
+            done_items=0,
+            total_items=1,
+            current_item=source,
+        )
+
+        try:
+            self._filesystem.move_directory(source=source, destination=destination)
+            self._repository.mark_completed(
+                task_id=task_id,
+                done_items=1,
+                total_items=1,
+            )
+        except OSError as exc:
+            self._repository.mark_failed(
+                task_id=task_id,
+                error_code="io_error",
+                error_message=str(exc),
+                failed_item=source,
+                done_items=0,
+                total_items=1,
+            )