From f6e7252ba2fe4df094ef498b7d8a21cd1b59e9b3 Mon Sep 17 00:00:00 2001
From: James Ross <itzexor@gmail.com>
Date: Thu, 24 Oct 2019 23:47:21 -0700
Subject: [PATCH] rfkillMagic: support device indexes above 9

we can get there quick with a single hotpluggable bluetooth device
---
 usr/lib/blueberry/rfkillMagic.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/usr/lib/blueberry/rfkillMagic.py b/usr/lib/blueberry/rfkillMagic.py
index b1863cd..3d05f6f 100644
--- a/usr/lib/blueberry/rfkillMagic.py
+++ b/usr/lib/blueberry/rfkillMagic.py
@@ -31,6 +31,7 @@ def __init__(self, output_callback, debug):
 
     def adapter_check(self):
         res = subprocess.check_output(RFKILL_CHK).decode('utf-8')
+        match = None
         have_adapter = False
 
         '''
@@ -44,16 +45,14 @@ def adapter_check(self):
             Soft blocked: yes
             Hard blocked: no
         '''
-
         if res:
+            match = re.search(r'^(?P<idx>\d+): .+: Bluetooth\n', res)
+
+        if match:
             self.debug("adapter_check full output:\n%s" % res)
-            reslines = res.split('\n')
-            for line in reslines:
-                if "Bluetooth" in line:
-                    self.adapter_index = int(line[0])
-                    self.debug("adapter_check found adapter at %d" % self.adapter_index)
-                    have_adapter = True
-                    break
+            self.adapter_index = int(match.group('idx'))
+            self.debug("adapter_check found adapter at %d" % self.adapter_index)
+            have_adapter = True
         else:
             self.debug("adapter_check no output (no adapter)")