From 9bc26e93a4340b4a4e2eb35f4732a6b60d435f43 Mon Sep 17 00:00:00 2001
From: Robert Accettura <robert@accettura.com>
Date: Tue, 29 May 2018 01:50:27 -0400
Subject: [PATCH] Add pin pad to alarm panel (#14178)
* Add pin pad to alarm panel
* Add pin pad to alarm panel
* Update regex
* Update regex
* Update regex
* Add pin pad to alarm panel
* Add pin pad to alarm panel
* Add pin pad to alarm panel
* Add pin pad to alarm panel
* Fix typos
* Fix typos
* Fix typos
* Add pin pad to alarm panel
* Fix errors
---
.../components/alarm_control_panel/alarmdecoder.py | 4 ++--
.../components/alarm_control_panel/alarmdotcom.py | 9 +++++++--
.../components/alarm_control_panel/concord232.py | 2 +-
.../components/alarm_control_panel/envisalink.py | 2 +-
homeassistant/components/alarm_control_panel/ifttt.py | 9 +++++++--
homeassistant/components/alarm_control_panel/manual.py | 9 +++++++--
.../components/alarm_control_panel/manual_mqtt.py | 9 +++++++--
homeassistant/components/alarm_control_panel/mqtt.py | 9 +++++++--
homeassistant/components/alarm_control_panel/nx584.py | 4 ++--
.../components/alarm_control_panel/simplisafe.py | 9 +++++++--
homeassistant/components/alarm_control_panel/verisure.py | 4 ++--
11 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/homeassistant/components/alarm_control_panel/alarmdecoder.py b/homeassistant/components/alarm_control_panel/alarmdecoder.py
index 49df9f2cefa..13b51aea701 100644
--- a/homeassistant/components/alarm_control_panel/alarmdecoder.py
+++ b/homeassistant/components/alarm_control_panel/alarmdecoder.py
@@ -100,8 +100,8 @@ class AlarmDecoderAlarmPanel(alarm.AlarmControlPanel):
@property
def code_format(self):
- """Return the regex for code format or None if no code is required."""
- return '^\\d{4,6}$'
+ """Return one or more digits/characters."""
+ return '^\\d+$'
@property
def state(self):
diff --git a/homeassistant/components/alarm_control_panel/alarmdotcom.py b/homeassistant/components/alarm_control_panel/alarmdotcom.py
index 31d93373286..6b523e8b606 100644
--- a/homeassistant/components/alarm_control_panel/alarmdotcom.py
+++ b/homeassistant/components/alarm_control_panel/alarmdotcom.py
@@ -6,6 +6,7 @@ https://home-assistant.io/components/alarm_control_panel.alarmdotcom/
"""
import asyncio
import logging
+import re
import voluptuous as vol
@@ -79,8 +80,12 @@ class AlarmDotCom(alarm.AlarmControlPanel):
@property
def code_format(self):
- """Return one or more characters if code is defined."""
- return None if self._code is None else '.+'
+ """Return one or more digits/characters."""
+ if self._code is None:
+ return None
+ elif isinstance(self._code, str) and re.search('^\\d+$', self._code):
+ return '^\\d+$'
+ return '.+'
@property
def state(self):
diff --git a/homeassistant/components/alarm_control_panel/concord232.py b/homeassistant/components/alarm_control_panel/concord232.py
index d48a107f33d..bd3ee762ccb 100644
--- a/homeassistant/components/alarm_control_panel/concord232.py
+++ b/homeassistant/components/alarm_control_panel/concord232.py
@@ -80,7 +80,7 @@ class Concord232Alarm(alarm.AlarmControlPanel):
@property
def code_format(self):
"""Return the characters if code is defined."""
- return '[0-9]{4}([0-9]{2})?'
+ return '^\\d+$'
@property
def state(self):
diff --git a/homeassistant/components/alarm_control_panel/envisalink.py b/homeassistant/components/alarm_control_panel/envisalink.py
index e5003f1ba1d..19bbfa611f2 100644
--- a/homeassistant/components/alarm_control_panel/envisalink.py
+++ b/homeassistant/components/alarm_control_panel/envisalink.py
@@ -106,7 +106,7 @@ class EnvisalinkAlarm(EnvisalinkDevice, alarm.AlarmControlPanel):
"""Regex for code format or None if no code is required."""
if self._code:
return None
- return '^\\d{4,6}$'
+ return '^\\d+$'
@property
def state(self):
diff --git a/homeassistant/components/alarm_control_panel/ifttt.py b/homeassistant/components/alarm_control_panel/ifttt.py
index 7bdc1ccd9d9..203044f3915 100644
--- a/homeassistant/components/alarm_control_panel/ifttt.py
+++ b/homeassistant/components/alarm_control_panel/ifttt.py
@@ -5,6 +5,7 @@ For more details about this platform, please refer to the documentation at
https://home-assistant.io/components/alarm_control_panel.ifttt/
"""
import logging
+import re
import voluptuous as vol
@@ -124,8 +125,12 @@ class IFTTTAlarmPanel(alarm.AlarmControlPanel):
@property
def code_format(self):
- """Return one or more characters."""
- return None if self._code is None else '.+'
+ """Return one or more digits/characters."""
+ if self._code is None:
+ return None
+ elif isinstance(self._code, str) and re.search('^\\d+$', self._code):
+ return '^\\d+$'
+ return '.+'
def alarm_disarm(self, code=None):
"""Send disarm command."""
diff --git a/homeassistant/components/alarm_control_panel/manual.py b/homeassistant/components/alarm_control_panel/manual.py
index 5beb5261607..e66251143da 100644
--- a/homeassistant/components/alarm_control_panel/manual.py
+++ b/homeassistant/components/alarm_control_panel/manual.py
@@ -7,6 +7,7 @@ https://home-assistant.io/components/alarm_control_panel.manual/
import copy
import datetime
import logging
+import re
import voluptuous as vol
@@ -201,8 +202,12 @@ class ManualAlarm(alarm.AlarmControlPanel):
@property
def code_format(self):
- """Return one or more characters."""
- return None if self._code is None else '.+'
+ """Return one or more digits/characters."""
+ if self._code is None:
+ return None
+ elif isinstance(self._code, str) and re.search('^\\d+$', self._code):
+ return '^\\d+$'
+ return '.+'
def alarm_disarm(self, code=None):
"""Send disarm command."""
diff --git a/homeassistant/components/alarm_control_panel/manual_mqtt.py b/homeassistant/components/alarm_control_panel/manual_mqtt.py
index 4b08ad67292..c09105c91e0 100644
--- a/homeassistant/components/alarm_control_panel/manual_mqtt.py
+++ b/homeassistant/components/alarm_control_panel/manual_mqtt.py
@@ -8,6 +8,7 @@ import asyncio
import copy
import datetime
import logging
+import re
import voluptuous as vol
@@ -237,8 +238,12 @@ class ManualMQTTAlarm(alarm.AlarmControlPanel):
@property
def code_format(self):
- """Return one or more characters."""
- return None if self._code is None else '.+'
+ """Return one or more digits/characters."""
+ if self._code is None:
+ return None
+ elif isinstance(self._code, str) and re.search('^\\d+$', self._code):
+ return '^\\d+$'
+ return '.+'
def alarm_disarm(self, code=None):
"""Send disarm command."""
diff --git a/homeassistant/components/alarm_control_panel/mqtt.py b/homeassistant/components/alarm_control_panel/mqtt.py
index 1422136c405..0298c7384a2 100644
--- a/homeassistant/components/alarm_control_panel/mqtt.py
+++ b/homeassistant/components/alarm_control_panel/mqtt.py
@@ -6,6 +6,7 @@ https://home-assistant.io/components/alarm_control_panel.mqtt/
"""
import asyncio
import logging
+import re
import voluptuous as vol
@@ -117,8 +118,12 @@ class MqttAlarm(MqttAvailability, alarm.AlarmControlPanel):
@property
def code_format(self):
- """One or more characters if code is defined."""
- return None if self._code is None else '.+'
+ """Return one or more digits/characters."""
+ if self._code is None:
+ return None
+ elif isinstance(self._code, str) and re.search('^\\d+$', self._code):
+ return '^\\d+$'
+ return '.+'
@asyncio.coroutine
def async_alarm_disarm(self, code=None):
diff --git a/homeassistant/components/alarm_control_panel/nx584.py b/homeassistant/components/alarm_control_panel/nx584.py
index ceb79c1dc7b..67d3725fc38 100644
--- a/homeassistant/components/alarm_control_panel/nx584.py
+++ b/homeassistant/components/alarm_control_panel/nx584.py
@@ -69,8 +69,8 @@ class NX584Alarm(alarm.AlarmControlPanel):
@property
def code_format(self):
- """Return che characters if code is defined."""
- return '[0-9]{4}([0-9]{2})?'
+ """Return one or more digits/characters."""
+ return '^\\d+$'
@property
def state(self):
diff --git a/homeassistant/components/alarm_control_panel/simplisafe.py b/homeassistant/components/alarm_control_panel/simplisafe.py
index 3b991c5b236..c08ac3c0ea0 100644
--- a/homeassistant/components/alarm_control_panel/simplisafe.py
+++ b/homeassistant/components/alarm_control_panel/simplisafe.py
@@ -5,6 +5,7 @@ For more details about this platform, please refer to the documentation at
https://home-assistant.io/components/alarm_control_panel.simplisafe/
"""
import logging
+import re
import voluptuous as vol
@@ -83,8 +84,12 @@ class SimpliSafeAlarm(alarm.AlarmControlPanel):
@property
def code_format(self):
- """Return one or more characters if code is defined."""
- return None if self._code is None else '.+'
+ """Return one or more digits/characters."""
+ if self._code is None:
+ return None
+ elif isinstance(self._code, str) and re.search('^\\d+$', self._code):
+ return '^\\d+$'
+ return '.+'
@property
def state(self):
diff --git a/homeassistant/components/alarm_control_panel/verisure.py b/homeassistant/components/alarm_control_panel/verisure.py
index 74d63b1fb9c..6651334400f 100644
--- a/homeassistant/components/alarm_control_panel/verisure.py
+++ b/homeassistant/components/alarm_control_panel/verisure.py
@@ -60,8 +60,8 @@ class VerisureAlarm(alarm.AlarmControlPanel):
@property
def code_format(self):
- """Return the code format as regex."""
- return '^\\d{%s}$' % self._digits
+ """Return one or more digits/characters."""
+ return '^\\d+$'
@property
def changed_by(self):
--
GitLab