Use async ADB server code from pure-python-adb

androidtv/adb_manager/adb_manager_async.py

@@ -13,50 +13,14 @@
 from adb_shell.adb_device_async import AdbDeviceTcpAsync
 from adb_shell.auth.sign_pythonrsa import PythonRSASigner
 import aiofiles
-from ppadb.client import Client
+from ppadb.client_async import ClientAsync
 
 from ..constants import DEFAULT_ADB_TIMEOUT_S, DEFAULT_AUTH_TIMEOUT_S, DEFAULT_LOCK_TIMEOUT_S
 from ..exceptions import LockNotAcquiredException
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class DeviceAsync:
-    """A fake ``DeviceAsync`` class."""
-    def __init__(self, device):
-        self._device = device
-
-    async def pull(self, device_path, local_path):
-        """Download a file."""
-        return await asyncio.get_running_loop().run_in_executor(None, self._device.pull, device_path, local_path)
-
-    async def push(self, local_path, device_path):
-        """Upload a file."""
-        return await asyncio.get_running_loop().run_in_executor(None, self._device.push, local_path, device_path)
-
-    async def screencap(self):
-        """Take a screencap."""
-        return await asyncio.get_running_loop().run_in_executor(None, self._device.screencap)
-
-    async def shell(self, cmd):
-        """Send a shell command."""
-        return await asyncio.get_running_loop().run_in_executor(None, self._device.shell, cmd)
-
-
-# pylint: disable=too-few-public-methods
-class ClientAsync:
-    """A fake ``ClientAsync`` class."""
-    def __init__(self, host, port):
-        self._client = Client(host, port)
-
-    async def device(self, serial):
-        """Get a fake ``DeviceAsync`` instance."""
-        dev = await asyncio.get_running_loop().run_in_executor(None, self._client.device, serial)
-        if dev:
-            return DeviceAsync(dev)
-        return None
-
-
 @asynccontextmanager
 async def _acquire(lock, timeout=DEFAULT_LOCK_TIMEOUT_S):
     """Handle acquisition and release of an ``asyncio.Lock`` object with a timeout.
@@ -476,10 +440,7 @@ async def screencap(self):
 
         async with _acquire(self._adb_lock):
             _LOGGER.debug("Taking screencap from %s:%d via ADB server %s:%d", self.host, self.port, self.adb_server_ip, self.adb_server_port)
-            try:
-                return await self._adb_device.screencap()
-            except IndexError:
-                return None
+            return await self._adb_device.screencap()
 
     async def shell(self, cmd):
         """Send an ADB command using an ADB server.

androidtv/adb_manager/adb_manager_sync.py

@@ -439,10 +439,7 @@ def screencap(self):
 
         with _acquire(self._adb_lock):
             _LOGGER.debug("Taking screencap from %s:%d via ADB server %s:%d", self.host, self.port, self.adb_server_ip, self.adb_server_port)
-            try:
-                return self._adb_device.screencap()
-            except IndexError:
-                return None
+            return self._adb_device.screencap()
 
     def shell(self, cmd):
         """Send an ADB command using an ADB server.

setup.py

@@ -14,7 +14,7 @@
     author='Jeff Irion',
     author_email='jefflirion@users.noreply.github.com',
     packages=['androidtv', 'androidtv.adb_manager', 'androidtv.basetv', 'androidtv.androidtv', 'androidtv.firetv'],
-    install_requires=['adb-shell>=0.2.1', 'pure-python-adb>=0.2.2.dev0'],
+    install_requires=['adb-shell>=0.2.1', 'pure-python-adb>=0.3.0.dev0'],
     extras_require={'async': ['aiofiles>=0.4.0']},
     classifiers=[
         'License :: OSI Approved :: MIT License',

tests/async_patchers.py

@@ -146,8 +146,6 @@ async def shell_fail_server(self, cmd):
 
 PATCH_ADB_SERVER_RUNTIME_ERROR = async_patch("{}.{}.device".format(__name__, CLIENT_ASYNC_FAKE_SUCCESS), side_effect=RuntimeError)
 
-PATCH_ADB_SERVER_SCREENCAP_INDEX_ERROR = patch("{}.{}.screencap".format(__name__, DEVICE_ASYNC_FAKE), side_effect=IndexError)
-
 
 class CustomException(Exception):
     """A custom exception type."""

tests/patchers.py

@@ -137,8 +137,6 @@ def shell_fail_server(self, cmd):
 
 PATCH_ADB_SERVER_RUNTIME_ERROR = patch("{}.{}.device".format(__name__, CLIENT_FAKE_SUCCESS), side_effect=RuntimeError)
 
-PATCH_ADB_SERVER_SCREENCAP_INDEX_ERROR = patch("{}.{}.screencap".format(__name__, DEVICE_FAKE), side_effect=IndexError)
-
 
 class CustomException(Exception):
     """A custom exception type."""

tests/test_adb_manager_async.py

@@ -339,17 +339,6 @@ async def test_connect_fail_server(self):
                 self.assertFalse(self.adb.available)
                 self.assertFalse(self.adb._available)
 
-    @awaiter
-    async def test_screencap_index_error(self):
-        """Test when pure-python-adb gets an ``IndexError``.
-
-        """        
-        with async_patchers.patch_connect(True)[self.PATCH_KEY]:
-            self.assertTrue(await self.adb.connect())
-
-            with async_patchers.PATCH_ADB_SERVER_SCREENCAP_INDEX_ERROR:
-                self.assertIsNone(await self.adb.screencap())
-
 
 class TestADBPythonAsyncWithAuthentication(unittest.TestCase):
     """Test the `ADBPythonAsync` class."""

tests/test_adb_manager_sync.py

@@ -310,16 +310,6 @@ def test_connect_fail_server(self):
                 self.assertFalse(self.adb.available)
                 self.assertFalse(self.adb._available)
 
-    def test_screencap_index_error(self):
-        """Test when pure-python-adb gets an ``IndexError``.
-
-        """        
-        with patchers.patch_connect(True)[self.PATCH_KEY]:
-            self.assertTrue(self.adb.connect())
-
-            with patchers.PATCH_ADB_SERVER_SCREENCAP_INDEX_ERROR:
-                self.assertIsNone(self.adb.screencap())
-
 
 class TestADBPythonSyncWithAuthentication(unittest.TestCase):
     """Test the `ADBPythonSync` class."""