WIPsftp

Author: douglas-raillard-arm

devlib/utils/ssh.py

@@ -421,19 +421,44 @@ def _get_sftp(self, timeout):
 
     @classmethod
     def _push_file(cls, sftp, src, dst):
-        sftp.put(src, dst)
+        try:
+            sftp.put(src, dst)
+        # Maybe the dst was a folder
+        except OSError:
+            # This might fail if the folder already exists
+            with contextlib.suppress(IOError):
+                sftp.mkdir(dst)
+
+            new_dst = os.path.join(
+                dst,
+                os.path.basename(src),
+            )
+
+            return cls._push_file(sftp, src, new_dst)
+
 
     @classmethod
     def _push_folder(cls, sftp, src, dst):
+        # Behave like the "mv" command or adb push: a new folder is created
+        # inside the destination folder, rather than merging the trees.
+        dst = os.path.join(
+            dst,
+            os.path.basename(src),
+        )
+        return cls._push_folder_internal(sftp, src, dst)
+
+    @classmethod
+    def _push_folder_internal(cls, sftp, src, dst):
         # This might fail if the folder already exists
         with contextlib.suppress(IOError):
             sftp.mkdir(dst)
+
         for entry in os.scandir(src):
             name = entry.name
             src_path = os.path.join(src, name)
             dst_path = os.path.join(dst, name)
             if entry.is_dir():
-                push = cls._push_folder
+                push = cls._push_folder_internal
             else:
                 push = cls._push_file
 
@@ -446,8 +471,16 @@ def _push_path(cls, sftp, src, dst):
 
     @classmethod
     def _pull_file(cls, sftp, src, dst):
+        # Pulling a file into a folder will use the source basename
+        if os.path.isdir(dst):
+            dst = os.path.join(
+                dst,
+                os.path.basename(src),
+            )
+
         with contextlib.suppress(FileNotFoundError):
             os.remove(dst)
+
         sftp.get(src, dst)
 
     @classmethod