Update guiscrcpy.check.adb to detect multiple instances

srevinsaju · Apr 6, 2020 · 9e3b56a · 9e3b56a
1 parent 8ab6d14
commit 9e3b56a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/guiscrcpy/launcher.py b/guiscrcpy/launcher.py
@@ -337,7 +337,7 @@ def start_act(self):
         self.progressBar.setValue(5)
 
         devices_list = adb.devices(adb.path)
-
+        import pdb; pdb.set_trace()
         if devices_list[0] == "\n":
             self.runningNot.setText("DEVICE IS NOT CONNECTED")
             self.progressBar.setValue(0)

diff --git a/guiscrcpy/lib/check.py b/guiscrcpy/lib/check.py
@@ -124,6 +124,7 @@ def devices(increment=''):
             raise FileNotFoundError(
                 "guiscrcpy couldn't find adb. Please specify path to adb in configuration file")
         proc = Popen(_(increment + " devices"), stdout=PIPE)
-        output = decode_process(proc)[1].split('\t')
+        output = [[y.strip() for y in x.split('\t')] for x in decode_process(proc)[1:]][:-1]
+
         logging.debug("ADB: {}".format(output))
         return output