Merge branch 'fix_100_humanreadable_pairing_status' into add_bluetooth

homekit/model/status_flags.py

@@ -15,22 +15,29 @@
 #
 
 
-class _StatusFlags(object):
+class _IpStatusFlags(object):
     """
     Data taken form table 5-9 page 70
     """
 
-    def __init__(self):
-        self._data = {
-            0: 'paired',
-            1: 'unpaired'
-        }
-
     def __getitem__(self, item):
-        if item in self._data:
-            return self._data[item]
-        print(type(item))
-        raise KeyError('Item {item} not found'.format(item=item))
+        i = int(item)
+        result = []
+        if i & 0x01:
+            result.append('Accessory has not been paired with any controllers.')
+            i = i - 0x01
+        else:
+            result.append('Accessory has been paired.')
+        if i & 0x02:
+            result.append('Accessory has not been configured to join a Wi-Fi network.')
+            i = i - 0x02
+        if i & 0x04:
+            result.append('A problem has been detected on the accessory.')
+            i = i - 0x04
+        if i == 0:
+            return ' '.join(result)
+        else:
+            raise KeyError('Item {item} not found'.format(item=item))
 
 
-StatusFlags = _StatusFlags()
+IpStatusFlags = _IpStatusFlags()

homekit/zeroconf_impl/__init__.py

@@ -21,7 +21,7 @@
 
 from homekit.model import Categories
 from homekit.model.feature_flags import FeatureFlags
-from homekit.model.status_flags import StatusFlags
+from homekit.model.status_flags import IpStatusFlags
 
 
 class CollectingListener(object):
@@ -133,7 +133,7 @@ def discover_homekit_devices(max_seconds=10):
         sf = get_from_properties(props, b'sf', case_sensitive=False)
         if sf:
             d['sf'] = sf
-        d['statusflags'] = StatusFlags[int(sf)]
+        d['statusflags'] = IpStatusFlags[int(sf)]
 
         ci = get_from_properties(props, b'ci', case_sensitive=False)
         if ci: