feat: feedback verbetering

2026-03-15 13:28:11 +01:00
parent a52493459a
commit 66abf991d8
15 changed files with 585 additions and 180 deletions
@@ -1,5 +1,6 @@
 from __future__ import annotations

+import os
 from pathlib import Path

 import uuid
@@ -45,11 +46,7 @@ class MoveTaskService:
            )

            if item["kind"] == "directory":
-                self._runner.enqueue_move_directory(
-                    task_id=task["id"],
-                    source=item["source_absolute"],
-                    destination=item["destination_absolute"],
-                )
+                self._runner.enqueue_move_directory(task_id=task["id"], item=item)
            else:
                self._runner.enqueue_move_file(
                    task_id=task["id"],
@@ -57,6 +54,7 @@ class MoveTaskService:
                    destination=item["destination_absolute"],
                    total_bytes=item["total_bytes"],
                    same_root=item["same_root"],
+                    current_item=item["files"][0]["label"],
                )

            return TaskCreateResponse(task_id=task["id"], status=task["status"])
@@ -113,6 +111,7 @@ class MoveTaskService:
                destination=destination,
                resolved_destination=resolved_destination_base,
                destination_base=destination_base,
+                include_root_prefix=True,
            )
            items.append(item)

@@ -137,6 +136,8 @@ class MoveTaskService:
                    "source": item["source_absolute"],
                    "destination": item["destination_absolute"],
                    "kind": item["kind"],
+                    "files": item["files"],
+                    "directories": item["directories"],
                }
                for item in items
            ],
@@ -149,6 +150,7 @@ class MoveTaskService:
        destination: str,
        resolved_destination: ResolvedPath | None = None,
        destination_base: str | None = None,
+        include_root_prefix: bool = False,
    ) -> dict:
        resolved_source = self._path_guard.resolve_existing_path(source)
        _, _, lexical_source, _ = self._path_guard.resolve_lexical_path(source)
@@ -224,6 +226,22 @@ class MoveTaskService:
                    details={"path": source, "destination": destination_relative},
                )

+        if source_is_directory:
+            directories, files = self._build_directory_plan(
+                resolved_source=resolved_source,
+                destination_root=destination_absolute,
+                include_root_prefix=include_root_prefix,
+            )
+        else:
+            files = [
+                {
+                    "source": str(resolved_source.absolute),
+                    "destination": str(destination_absolute),
+                    "label": resolved_source.absolute.name,
+                }
+            ]
+            directories = []
+
        return {
            "source_relative": resolved_source.relative,
            "destination_relative": destination_relative,
@@ -232,6 +250,8 @@ class MoveTaskService:
            "kind": "directory" if source_is_directory else "file",
            "same_root": same_root,
            "total_bytes": int(resolved_source.absolute.stat().st_size) if source_is_file else None,
+            "files": files,
+            "directories": directories,
        }

    def _map_directory_validation(self, relative_path: str) -> None:
@@ -251,6 +271,70 @@ class MoveTaskService:
    def _join_destination_base(destination_base: str, name: str) -> str:
        return f"{destination_base.rstrip('/')}/{name}" if destination_base.rstrip("/") else f"/{name}"

+    def _build_directory_plan(
+        self,
+        *,
+        resolved_source: ResolvedPath,
+        destination_root: Path,
+        include_root_prefix: bool,
+    ) -> tuple[list[dict[str, str]], list[dict[str, str]]]:
+        directories: list[dict[str, str]] = [
+            {
+                "source": str(resolved_source.absolute),
+                "destination": str(destination_root),
+            }
+        ]
+        files: list[dict[str, str]] = []
+        for root, dirnames, filenames in os.walk(resolved_source.absolute, followlinks=False):
+            root_path = Path(root)
+            dirnames.sort(key=str.lower)
+            filenames.sort(key=str.lower)
+            for name in dirnames:
+                entry = root_path / name
+                if entry.is_symlink():
+                    raise AppError(
+                        code="type_conflict",
+                        message="Source directory must not contain symlinks",
+                        status_code=409,
+                        details={"path": resolved_source.relative},
+                    )
+                relative = entry.relative_to(resolved_source.absolute)
+                directories.append(
+                    {
+                        "source": str(entry),
+                        "destination": str(destination_root / relative),
+                    }
+                )
+            for name in filenames:
+                entry = root_path / name
+                if entry.is_symlink():
+                    raise AppError(
+                        code="type_conflict",
+                        message="Source directory must not contain symlinks",
+                        status_code=409,
+                        details={"path": resolved_source.relative},
+                    )
+                relative = entry.relative_to(resolved_source.absolute)
+                files.append(
+                    {
+                        "source": str(entry),
+                        "destination": str(destination_root / relative),
+                        "label": self._progress_label(
+                            top_level_name=resolved_source.absolute.name,
+                            relative_path=relative,
+                            include_root_prefix=include_root_prefix,
+                        ),
+                    }
+                )
+        return directories, files
+
+    @staticmethod
+    def _progress_label(*, top_level_name: str, relative_path: Path, include_root_prefix: bool) -> str:
+        relative_value = relative_path.as_posix()
+        if not relative_value:
+            return top_level_name
+        return f"{top_level_name}/{relative_value}" if include_root_prefix else relative_value
+
    @staticmethod
    def _is_nested_destination(source: Path, destination: Path) -> bool:
        try: