Merge pull request #101 from quarcko/master

Fix for Xiaomi Aqara gateway
jlusiardi · Jan 31, 2019 · 9604d76 · 9604d76
2 parents 54c99e3 + 61e792e
commit 9604d76
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/homekit/model/characteristics/characteristic_types.py b/homekit/model/characteristics/characteristic_types.py
@@ -265,6 +265,7 @@ def get_short(self, uuid: str):
         :param uuid: the UUID in long form or the shortened version as defined in chapter 5.6.1 page 72.
         :return: the textual representation
         """
+        uuid = uuid.upper()
         orig_item = uuid
         if uuid.endswith(self.baseUUID):
             uuid = uuid.split('-', 1)[0]

diff --git a/homekit/model/services/service_types.py b/homekit/model/services/service_types.py
@@ -73,6 +73,7 @@ def __getitem__(self, item):
         return 'Unknown Service: {i}'.format(i=item)
 
     def get_short(self, item):
+        item = item.upper()
         orig_item = item
         if item.endswith(self.baseUUID):
             item = item.split('-', 1)[0]

diff --git a/tests/characteristicsTypes_test.py b/tests/characteristicsTypes_test.py
@@ -48,4 +48,5 @@ def test_get_short(self):
         self.assertEqual(CharacteristicsTypes.get_short(CharacteristicsTypes.DOOR_STATE_TARGET), 'door-state.target')
         self.assertEqual(CharacteristicsTypes.get_short(CharacteristicsTypes.AIR_PURIFIER_STATE_CURRENT),
                          'air-purifier.state.current')
-        self.assertEqual(CharacteristicsTypes.get_short('1a'), 'Unknown Characteristic 1a')
+        #self.assertEqual(CharacteristicsTypes.get_short('1a'), 'Unknown Characteristic 1a')
+        self.assertEqual(CharacteristicsTypes.get_short('1a'), 'lock-management.auto-secure-timeout')