raise DestinationExists if overwrite is not set

Author: tfeldmann

fs/base.py

@@ -425,10 +425,10 @@ def copy(
         with self._lock:
             _src_path = self.validatepath(src_path)
             _dst_path = self.validatepath(dst_path)
-            if _src_path == _dst_path:
-                raise errors.IllegalDestination(dst_path)
             if not overwrite and self.exists(_dst_path):
                 raise errors.DestinationExists(dst_path)
+            if _src_path == _dst_path:
+                raise errors.IllegalDestination(dst_path)
             with closing(self.open(_src_path, "rb")) as read_file:
                 # FIXME(@althonos): typing complains because open return IO
                 self.upload(_dst_path, read_file)  # type: ignore

fs/copy.py

@@ -257,9 +257,13 @@ def copy_file_internal(
         lock (bool): Lock both filesystems before copying.
 
     """
+    _src_path = src_fs.validatepath(src_path)
+    _dst_path = dst_fs.validatepath(dst_path)
     if src_fs is dst_fs:
-        # Same filesystem, so we can do a potentially optimized
-        # copy
+        # It's not allowed to copy a file onto itself
+        if _src_path == _dst_path:
+            raise IllegalDestination(dst_path)
+        # Same filesystem, so we can do a potentially optimized copy
         src_fs.copy(src_path, dst_path, overwrite=True, preserve_time=preserve_time)
         return
 
@@ -438,8 +442,6 @@ def copy_dir_if(
         dst_fs, create=True
     ) as _dst_fs:
         with _src_fs.lock(), _dst_fs.lock():
-            if src_fs == dst_fs and isbase(_src_path, _dst_path):
-                raise IllegalDestination(dst_path)
             _thread_safe = is_thread_safe(_src_fs, _dst_fs)
             with Copier(
                 num_workers=workers if _thread_safe else 0, preserve_time=preserve_time

fs/osfs.py

@@ -408,12 +408,12 @@ def _check_copy(self, src_path, dst_path, overwrite=False):
         # check src_path exists and is a file
         if self.gettype(src_path) is not ResourceType.file:
             raise errors.FileExpected(src_path)
-        # it's not allowed to copy a file onto itself
-        if _src_path == _dst_path:
-            raise errors.IllegalDestination(dst_path)
         # check dst_path does not exist if we are not overwriting
         if not overwrite and self.exists(_dst_path):
             raise errors.DestinationExists(dst_path)
+        # it's not allowed to copy a file onto itself
+        if _src_path == _dst_path:
+            raise errors.IllegalDestination(dst_path)
         # check parent dir of _dst_path exists and is a directory
         if self.gettype(dirname(dst_path)) is not ResourceType.directory:
             raise errors.DirectoryExpected(dirname(dst_path))

fs/test.py

@@ -1832,7 +1832,7 @@ def test_copy_file_onto_itself(self):
         self.fs.writetext("file.txt", "Hello")
         with self.assertRaises(errors.IllegalDestination):
             self.fs.copy("file.txt", "file.txt", overwrite=True)
-        with self.assertRaises(errors.IllegalDestination):
+        with self.assertRaises(errors.DestinationExists):
             self.fs.copy("file.txt", "file.txt", overwrite=False)
         self.assert_text("file.txt", "Hello")
 
@@ -1841,7 +1841,7 @@ def test_copy_file_onto_itself_relpath(self):
         subdir.writetext("file.txt", "Hello")
         with self.assertRaises(errors.IllegalDestination):
             self.fs.copy("sub/file.txt", "sub/../sub/file.txt", overwrite=True)
-        with self.assertRaises(errors.IllegalDestination):
+        with self.assertRaises(errors.DestinationExists):
             self.fs.copy("sub/file.txt", "sub/../sub/file.txt", overwrite=False)
         self.assert_text("sub/file.txt", "Hello")
 

fs/wrapfs.py

@@ -270,8 +270,6 @@ def copy(self, src_path, dst_path, overwrite=False, preserve_time=False):
         _val_src_path = self.validatepath(_src_path)
         _val_dst_path = self.validatepath(_dst_path)
         with unwrap_errors({_src_path: src_path, _dst_path: dst_path}):
-            if src_fs == dst_fs and _val_src_path == _val_dst_path:
-                raise errors.IllegalDestination(_dst_path)
             if not overwrite and dst_fs.exists(_dst_path):
                 raise errors.DestinationExists(_dst_path)
             copy_file(src_fs, _src_path, dst_fs, _dst_path, preserve_time=preserve_time)