use shutil to move folder

Author: tfeldmann

fs/move.py

@@ -5,6 +5,8 @@
 
 import typing
 
+import shutil
+
 from ._pathcompat import commonpath
 from .copy import copy_dir, copy_file
 from .errors import FSError
@@ -137,6 +139,16 @@ def move_dir(
     """
     with manage_fs(src_fs, writeable=True) as _src_fs:
         with manage_fs(dst_fs, writeable=True, create=True) as _dst_fs:
+
+            # if both filesystems have a syspath we can use shutil to move the folder
+            if _src_fs.hassyspath(src_path) and _dst_fs.hassyspath(dst_path):
+                src_syspath = _src_fs.getsyspath(src_path)
+                dst_syspath = _dst_fs.getsyspath(dst_path)
+                with _src_fs.lock(), _dst_fs.lock():
+                    shutil.move(src=src_syspath, dst=dst_syspath)
+                    return  # optimization worked, exit early
+
+            # standard copy then delete
             with _src_fs.lock(), _dst_fs.lock():
                 _dst_fs.makedir(dst_path, recreate=True)
                 copy_dir(

tests/test_move.py

@@ -7,6 +7,7 @@
 except ImportError:
     import mock
 
+import shutil
 from parameterized import parameterized, parameterized_class
 
 import fs.move
@@ -206,3 +207,16 @@ def test_move_file_cleanup_on_error(self, cleanup):
                     )
             self.assertTrue(src.exists("file.txt"))
             self.assertEqual(not dst.exists("target.txt"), cleanup)
+
+    @parameterized.expand([("temp", "temp://", True), ("mem", "mem://", False)])
+    def test_move_dir_optimized(self, _, fs_url, mv_called):
+        with open_fs(fs_url) as tmp:
+            with mock.patch.object(shutil, "move", wraps=shutil.move) as mv:
+                new_dir = tmp.makedir("dir")
+                new_dir.writetext("file.txt", "content")
+                sub = new_dir.makedir("sub")
+                sub.writetext("file.txt", "sub content")
+                fs.move.move_dir(tmp, "dir", tmp, "newdir")
+                self.assertEqual(tmp.readtext("newdir/file.txt"), "content")
+                self.assertEqual(tmp.readtext("newdir/sub/file.txt"), "sub content")
+                self.assertEqual(mv.called, mv_called)