jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle HomeKit configuration failure more cleanly (#14041)

Browse Source 
* Handle HomeKit configuration failure more cleanly

Add support for handling cases where HomeKit configuration fails, and give
the user more information about what to do.

* Don't consume the exception for a homekit.UnknownError

If we get an UnknownError then we should alert the user but also still
generate the backtrace so there's actually something for them to file in
a bug report.
This commit is contained in:
Matthew Garrett 2018-04-22 13:38:01 -07:00 committed by Paulus Schoutsen
parent 7f634c6ed0
commit e4cb3af76d
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
homeassistant/components/homekit_controller/__init__.py
View File

@ -14,7 +14,7 @@ from homeassistant.components.discovery import SERVICE_HOMEKIT
from homeassistant.helpers import discovery from homeassistant.helpers import discovery
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
REQUIREMENTS = ['homekit==0.5'] REQUIREMENTS = ['homekit==0.6']
DOMAIN = 'homekit_controller' DOMAIN = 'homekit_controller'
HOMEKIT_DIR = '.homekit' HOMEKIT_DIR = '.homekit'
@ -133,10 +133,31 @@ class HKDevice():
import homekit import homekit
pairing_id = str(uuid.uuid4()) pairing_id = str(uuid.uuid4())
code = callback_data.get('code').strip() code = callback_data.get('code').strip()
self.pairing_data = homekit.perform_pair_setup( try:
self.conn, code, pairing_id) self.pairing_data = homekit.perform_pair_setup(self.conn, code,
pairing_id)
except homekit.exception.UnavailableError:
error_msg = "This accessory is already paired to another device. \
Please reset the accessory and try again."
_configurator = self.hass.data[DOMAIN+self.hkid]
self.configurator.notify_errors(_configurator, error_msg)
return
except homekit.exception.AuthenticationError:
error_msg = "Incorrect HomeKit code for {}. Please check it and \
try again.".format(self.model)
_configurator = self.hass.data[DOMAIN+self.hkid]
self.configurator.notify_errors(_configurator, error_msg)
return
except homekit.exception.UnknownError:
error_msg = "Received an unknown error. Please file a bug."
_configurator = self.hass.data[DOMAIN+self.hkid]
self.configurator.notify_errors(_configurator, error_msg)
raise
if self.pairing_data is not None: if self.pairing_data is not None:
homekit.save_pairing(self.pairing_file, self.pairing_data) homekit.save_pairing(self.pairing_file, self.pairing_data)
_configurator = self.hass.data[DOMAIN+self.hkid]
self.configurator.request_done(_configurator)
self.accessory_setup() self.accessory_setup()
else: else:
error_msg = "Unable to pair, please try again" error_msg = "Unable to pair, please try again"

2
requirements_all.txt
View File

@ -389,7 +389,7 @@ holidays==0.9.4
home-assistant-frontend==20180420.0 home-assistant-frontend==20180420.0
# homeassistant.components.homekit_controller # homeassistant.components.homekit_controller
# homekit==0.5 # homekit==0.6
# homeassistant.components.homematicip_cloud # homeassistant.components.homematicip_cloud
homematicip==0.8 homematicip==0.8