jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-11-09 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge requires_code and code_format properties

Browse Source
This commit is contained in:
sfam
2015-09-22 21:40:45 +00:00
parent e29deb0202
commit cdc371c3ee
3 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
homeassistant/components/alarm_control_panel/mqtt.py
View File

@@ -138,19 +138,14 @@ class MqttAlarm(alarm.AlarmControlPanel):
""" Returns the state of the device. """
return self._state
@property
def requires_code(self):
""" code is required if it's defined in configuration file """
return self._code is not None
@property
def code_format(self):
""" One or more characters """
return '.+'
""" One or more characters if code is defined """
return None if self._code is None else '.+'
def alarm_disarm(self, code=None):
""" Send disarm command. """
if code == str(self._code) or not self.requires_code:
if code == str(self._code) or self.code_format is None:
mqtt.publish(self.hass, self._command_topic,
self._payload_disarm, self._qos)
else:
@@ -158,7 +153,7 @@ class MqttAlarm(alarm.AlarmControlPanel):
def alarm_arm_home(self, code=None):
""" Send arm home command. """
if code == str(self._code) or not self.requires_code:
if code == str(self._code) or self.code_format is None:
mqtt.publish(self.hass, self._command_topic,
self._payload_arm_home, self._qos)
else:
@@ -166,7 +161,7 @@ class MqttAlarm(alarm.AlarmControlPanel):
def alarm_arm_away(self, code=None):
""" Send arm away command. """
if code == str(self._code) or not self.requires_code:
if code == str(self._code) or self.code_format is None:
mqtt.publish(self.hass, self._command_topic,
self._payload_arm_away, self._qos)
else: