shutil.move entire folder

Author: brokkoli71

src/zarr/storage/_local.py

@@ -259,14 +259,10 @@ async def move(self, dest_root: Path | str) -> None:
         """
         if isinstance(dest_root, str):
             dest_root = Path(dest_root)
-        os.makedirs(dest_root, exist_ok=True)
-        for src_file in self.root.rglob("*"):
-            if src_file.is_file():
-                relative_path = src_file.relative_to(self.root)
-                dest_file_path = dest_root / relative_path
-                dest_file_path.parent.mkdir(parents=True, exist_ok=True)
-                shutil.move(str(src_file), str(dest_file_path))
-        shutil.rmtree(self.root)
+        os.makedirs(dest_root.parent, exist_ok=True)
+        if os.path.exists(dest_root):
+            raise FileExistsError(f"Destination root {dest_root} already exists.")
+        shutil.move(self.root, dest_root)
         self.root = dest_root
 
     async def getsize(self, key: str) -> int:

tests/test_store/test_local.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import pathlib
 
 import numpy as np
 import pytest
@@ -12,9 +12,6 @@
 from zarr.testing.store import StoreTests
 from zarr.testing.utils import assert_bytes_equal
 
-if TYPE_CHECKING:
-    import pathlib
-
 
 class TestLocalStore(StoreTests[LocalStore, cpu.Buffer]):
     store_cls = LocalStore
@@ -77,11 +74,20 @@ async def test_get_with_prototype_default(self, store: LocalStore) -> None:
         observed = await store.get(key, prototype=None)
         assert_bytes_equal(observed, data_buf)
 
-    @pytest.mark.parametrize("ndim", [0, 1, 2, 3])
-    async def test_move(self, tmp_path: pathlib.Path, ndim):
+    @pytest.mark.parametrize("ndim", [0, 1, 3])
+    @pytest.mark.parametrize(
+        "destination", ["destination", "foo/bar/destintion", pathlib.Path("foo/bar/destintion")]
+    )
+    async def test_move(
+        self, tmp_path: pathlib.Path, ndim: int, destination: pathlib.Path | str
+    ) -> None:
         origin = tmp_path / "origin"
-        destination = tmp_path / "destintion"
+        if isinstance(destination, str):
+            destination = str(tmp_path / destination)
+        else:
+            destination = tmp_path / destination
 
+        print(type(destination))
         store = await LocalStore.open(root=origin)
         shape = (4,) * ndim
         chunks = (2,) * ndim
@@ -90,9 +96,13 @@ async def test_move(self, tmp_path: pathlib.Path, ndim):
             data = data.reshape(*shape)
         array = create_array(store, data=data, chunks=chunks or "auto")
 
-        await store.move(str(destination))
+        await store.move(destination)
 
-        assert store.root == destination
-        assert destination.exists()
+        assert store.root == pathlib.Path(destination)
+        assert pathlib.Path(destination).exists()
         assert not origin.exists()
         assert np.array_equal(array[...], data)
+
+        store2 = await LocalStore.open(root=origin)
+        with pytest.raises(FileExistsError, match=f"Destination root {destination} already exists"):
+            await store2.move(destination)

tests/test_store/test_zip.py

@@ -142,7 +142,7 @@ def test_externally_zipped_store(self, tmp_path: Path) -> None:
         assert isinstance(group := zipped["foo"], Group)
         assert list(group.keys()) == list(group.keys())
 
-    async def test_move(self, tmp_path: Path):
+    async def test_move(self, tmp_path: Path) -> None:
         origin = tmp_path / "origin.zip"
         destination = tmp_path / "some_folder" / "destination.zip"