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

Clean up concord232 (#20353)

Browse Source 
* Clean up concord232

* concord cleanup

* clean up

* fix import
This commit is contained in:
Daniel Høyer Iversen 2019-01-24 02:05:56 +01:00 committed by Paulus Schoutsen
parent 971d933140
commit 697c331903
1 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
homeassistant/components/alarm_control_panel/concord232.py
View File

@ -5,18 +5,18 @@ For more details about this platform, please refer to the documentation at
https://home-assistant.io/components/alarm_control_panel.concord232/ https://home-assistant.io/components/alarm_control_panel.concord232/
""" """
import datetime import datetime
from datetime import timedelta
import logging import logging
import requests import requests
import voluptuous as vol import voluptuous as vol
import homeassistant.components.alarm_control_panel as alarm import homeassistant.components.alarm_control_panel as alarm
import homeassistant.helpers.config_validation as cv
from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
from homeassistant.const import ( from homeassistant.const import (
CONF_HOST, CONF_NAME, CONF_PORT, STATE_ALARM_ARMED_AWAY, CONF_HOST, CONF_NAME, CONF_PORT, STATE_ALARM_ARMED_AWAY,
STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_UNKNOWN) STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED)
import homeassistant.helpers.config_validation as cv
REQUIREMENTS = ['concord232==0.15'] REQUIREMENTS = ['concord232==0.15']
@ -26,7 +26,7 @@ DEFAULT_HOST = 'localhost'
DEFAULT_NAME = 'CONCORD232' DEFAULT_NAME = 'CONCORD232'
DEFAULT_PORT = 5007 DEFAULT_PORT = 5007
SCAN_INTERVAL = timedelta(seconds=10) SCAN_INTERVAL = datetime.timedelta(seconds=10)
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string, vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
@ -44,33 +44,24 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
url = 'http://{}:{}'.format(host, port) url = 'http://{}:{}'.format(host, port)
try: try:
add_entities([Concord232Alarm(hass, url, name)]) add_entities([Concord232Alarm(url, name)], True)
except requests.exceptions.ConnectionError as ex: except requests.exceptions.ConnectionError as ex:
_LOGGER.error("Unable to connect to Concord232: %s", str(ex)) _LOGGER.error("Unable to connect to Concord232: %s", str(ex))
return
class Concord232Alarm(alarm.AlarmControlPanel): class Concord232Alarm(alarm.AlarmControlPanel):
"""Representation of the Concord232-based alarm panel.""" """Representation of the Concord232-based alarm panel."""
def __init__(self, hass, url, name): def __init__(self, url, name):
"""Initialize the Concord232 alarm panel.""" """Initialize the Concord232 alarm panel."""
from concord232 import client as concord232_client from concord232 import client as concord232_client
self._state = STATE_UNKNOWN self._state = None
self._hass = hass
self._name = name self._name = name
self._url = url self._url = url
self._alarm = concord232_client.Client(self._url)
try:
client = concord232_client.Client(self._url)
except requests.exceptions.ConnectionError as ex:
_LOGGER.error("Unable to connect to Concord232: %s", str(ex))
self._alarm = client
self._alarm.partitions = self._alarm.list_partitions() self._alarm.partitions = self._alarm.list_partitions()
self._alarm.last_partition_update = datetime.datetime.now() self._alarm.last_partition_update = datetime.datetime.now()
self.update()
@property @property
def name(self): def name(self):
@ -94,22 +85,17 @@ class Concord232Alarm(alarm.AlarmControlPanel):
except requests.exceptions.ConnectionError as ex: except requests.exceptions.ConnectionError as ex:
_LOGGER.error("Unable to connect to %(host)s: %(reason)s", _LOGGER.error("Unable to connect to %(host)s: %(reason)s",
dict(host=self._url, reason=ex)) dict(host=self._url, reason=ex))
newstate = STATE_UNKNOWN return
except IndexError: except IndexError:
_LOGGER.error("Concord232 reports no partitions") _LOGGER.error("Concord232 reports no partitions")
newstate = STATE_UNKNOWN return
if part['arming_level'] == 'Off': if part['arming_level'] == 'Off':
newstate = STATE_ALARM_DISARMED self._state = STATE_ALARM_DISARMED
elif 'Home' in part['arming_level']: elif 'Home' in part['arming_level']:
newstate = STATE_ALARM_ARMED_HOME self._state = STATE_ALARM_ARMED_HOME
else: else:
newstate = STATE_ALARM_ARMED_AWAY self._state = STATE_ALARM_ARMED_AWAY
if not newstate == self._state:
_LOGGER.info("State change from %s to %s", self._state, newstate)
self._state = newstate
return self._state
def alarm_disarm(self, code=None): def alarm_disarm(self, code=None):
"""Send disarm command.""" """Send disarm command."""