Added async pull directory (no tests)

Author: ACButcher

ppadb/device.py

@@ -81,7 +81,6 @@ def _pull(self, src, dest):
             return sync.pull(src, dest)
 
     def pull(self, src, dest):
-        # Currently will override dest-- desired?
         src = PurePosixPath(src)
         dest = Path(dest)
 
@@ -102,6 +101,10 @@ def pull(self, src, dest):
                 element_dest = dest / element
                 self.pull(element_src, element_dest)
         else:
+            file_string = "IS_FILE"
+            res = self.shell(f"[ -f {src} ] && echo {file_string}")
+            if file_string not in res:
+                raise FileNotFoundError(f"Cannot find {src} on device")
             self._pull(str(src), str(dest))
 
     def install(

ppadb/device_async.py

@@ -58,13 +58,40 @@ async def push(self, src, dest, mode=0o644, progress=None):
                 for item in files:
                     await self._push(root / item, destdir / item, mode, progress)
 
-    async def pull(self, src, dest):
+    async def _pull(self, src, dest):
         sync_conn = await self.sync()
         sync = SyncAsync(sync_conn)
 
         async with sync_conn:
             return await sync.pull(src, dest)
 
+    async def pull(self, src, dest):
+        src = PurePosixPath(src)
+        dest = Path(dest)
+
+        dir_string = "IS_DIR"
+        res = await self.shell(f"[ -d {src} ] && echo {dir_string}")
+        if dir_string in res:
+            # Get all files in the dir
+            # Pull each
+            dest.mkdir(exist_ok=True)
+            cmd = f"ls -1a {src}"
+            res = await self.shell(cmd)
+            contents_list = res.split("\n")
+            contents_list = [
+                x for x in contents_list if x != "." and x != ".." and x != ""
+            ]
+            for element in contents_list:
+                element_src = src / element
+                element_dest = dest / element
+                await self.pull(element_src, element_dest)
+        else:
+            file_string = "IS_FILE"
+            res = await self.shell(f"[ -f {src} ] && echo {file_string}")
+            if file_string not in res:
+                raise FileNotFoundError(f"Cannot find {src} on device")
+            await self._pull(str(src), str(dest))
+
     async def install(
         self,
         path,

test/test_device.py

@@ -247,6 +247,13 @@ def test_pull_recursive_dir(populated_device, working_dir, test_filepaths):
         assert to_check.is_file()
         assert to_check.read_text() == f"{path}\n"
 
+def test_pull_nonexisting(device, working_dir):
+    src = "data/local/tmp/dklsfalkjhvcnsdfalvfds"
+    with pytest.raises(Exception) as excinfo:
+        device.pull(src, working_dir / "non_existent")
+    
+    assert str(excinfo.value) == f"Cannot find {src} on device"
+
 
 def test_forward(device):
     device.killforward_all()