Refactor netatmo to use hass.data (#23429)
* Refactor NETATMO_AUTH to use hass.data * Minor cleanup * Rename conf to auth and other suggestions by Martin * Revert webhook name change * Rename constant * Move auth * Don't use hass.data.get() * Fix auth string
This commit is contained in:
1 parent
5dbf58d67f
commit
b84ba93c42
6 files changed
+44
-22
No files matched your search
@@ -12,6 +12,8 @@ from homeassistant.helpers import discovery
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.util import Throttle
|
||||
|
||||
from .const import DOMAIN, DATA_NETATMO_AUTH
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
DATA_PERSONS = 'netatmo_persons'
|
||||
@@ -20,8 +22,6 @@ DATA_WEBHOOK_URL = 'netatmo_webhook_url'
|
||||
CONF_SECRET_KEY = 'secret_key'
|
||||
CONF_WEBHOOKS = 'webhooks'
|
||||
|
||||
DOMAIN = 'netatmo'
|
||||
|
||||
SERVICE_ADDWEBHOOK = 'addwebhook'
|
||||
SERVICE_DROPWEBHOOK = 'dropwebhook'
|
||||
|
||||
@@ -83,10 +83,9 @@ def setup(hass, config):
|
||||
"""Set up the Netatmo devices."""
|
||||
import pyatmo
|
||||
|
||||
global NETATMO_AUTH
|
||||
hass.data[DATA_PERSONS] = {}
|
||||
try:
|
||||
NETATMO_AUTH = pyatmo.ClientAuth(
|
||||
auth = pyatmo.ClientAuth(
|
||||
config[DOMAIN][CONF_API_KEY], config[DOMAIN][CONF_SECRET_KEY],
|
||||
config[DOMAIN][CONF_USERNAME], config[DOMAIN][CONF_PASSWORD],
|
||||
'read_station read_camera access_camera '
|
||||
@@ -96,6 +95,9 @@ def setup(hass, config):
|
||||
_LOGGER.error("Unable to connect to Netatmo API")
|
||||
return False
|
||||
|
||||
# Store config to be used during entry setup
|
||||
hass.data[DATA_NETATMO_AUTH] = auth
|
||||
|
||||
if config[DOMAIN][CONF_DISCOVERY]:
|
||||
for component in 'camera', 'sensor', 'binary_sensor', 'climate':
|
||||
discovery.load_platform(hass, component, DOMAIN, {}, config)
|
||||
@@ -107,7 +109,7 @@ def setup(hass, config):
|
||||
webhook_id)
|
||||
hass.components.webhook.async_register(
|
||||
DOMAIN, 'Netatmo', webhook_id, handle_webhook)
|
||||
NETATMO_AUTH.addwebhook(hass.data[DATA_WEBHOOK_URL])
|
||||
auth.addwebhook(hass.data[DATA_WEBHOOK_URL])
|
||||
hass.bus.listen_once(
|
||||
EVENT_HOMEASSISTANT_STOP, dropwebhook)
|
||||
|
||||
@@ -117,7 +119,7 @@ def setup(hass, config):
|
||||
if url is None:
|
||||
url = hass.data[DATA_WEBHOOK_URL]
|
||||
_LOGGER.info("Adding webhook for URL: %s", url)
|
||||
NETATMO_AUTH.addwebhook(url)
|
||||
auth.addwebhook(url)
|
||||
|
||||
hass.services.register(
|
||||
DOMAIN, SERVICE_ADDWEBHOOK, _service_addwebhook,
|
||||
@@ -126,7 +128,7 @@ def setup(hass, config):
|
||||
def _service_dropwebhook(service):
|
||||
"""Service to drop webhooks during runtime."""
|
||||
_LOGGER.info("Dropping webhook")
|
||||
NETATMO_AUTH.dropwebhook()
|
||||
auth.dropwebhook()
|
||||
|
||||
hass.services.register(
|
||||
DOMAIN, SERVICE_DROPWEBHOOK, _service_dropwebhook,
|
||||
@@ -137,7 +139,8 @@ def setup(hass, config):
|
||||
|
||||
def dropwebhook(hass):
|
||||
"""Drop the webhook subscription."""
|
||||
NETATMO_AUTH.dropwebhook()
|
||||
auth = hass.data[DATA_NETATMO_AUTH]
|
||||
auth.dropwebhook()
|
||||
|
||||
|
||||
async def handle_webhook(hass, webhook_id, request):
|
||||
|
||||
Reference in new issue
Block a user