Remove 'adb shell ' prefix for ADB commands

JeffLIrion · Dec 16, 2020 · 5683538 · 5683538
1 parent b759084
commit 5683538
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/androidtv/basetv/basetv.py b/androidtv/basetv/basetv.py
@@ -105,6 +105,23 @@ def available(self):
         """
         return self._adb.available
 
+    @staticmethod
+    def _remove_adb_shell_prefix(cmd):
+        """Remove the 'adb shell ' prefix from ``cmd``, if present.
+
+        Parameters
+        ----------
+        cmd : str
+            The ADB shell command
+
+        Returns
+        -------
+        str
+            ``cmd`` with the 'adb shell ' prefix removed, if it was present
+
+        """
+        return cmd[len("adb shell "):] if cmd.startswith("adb shell ") else cmd
+
     # ======================================================================= #
     #                                                                         #
     #                        Home Assistant device info                       #

diff --git a/androidtv/basetv/basetv_async.py b/androidtv/basetv/basetv_async.py
@@ -100,7 +100,7 @@ async def adb_shell(self, cmd):
             The response from the device, if there is a response
 
         """
-        return await self._adb.shell(cmd)
+        return await self._adb.shell(self._remove_adb_shell_prefix(cmd))
 
     async def adb_pull(self, local_path, device_path):
         """Pull a file from the device.

diff --git a/androidtv/basetv/basetv_sync.py b/androidtv/basetv/basetv_sync.py
@@ -100,7 +100,7 @@ def adb_shell(self, cmd):
             The response from the device, if there is a response
 
         """
-        return self._adb.shell(cmd)
+        return self._adb.shell(self._remove_adb_shell_prefix(cmd))
 
     def adb_pull(self, local_path, device_path):
         """Pull a file from the device.