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

Updating ping binary sensor with Windows support (#7253)

Browse Source 
Fixed ping command syntax and updated regex match
This commit is contained in:
Patrick Easters 2017-04-24 17:32:12 -04:00 committed by Fabian Affolter
parent f58d200ecb
commit 9738bffc3f
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
homeassistant/components/binary_sensor/ping.py
View File

@ -35,6 +35,9 @@ SCAN_INTERVAL = timedelta(minutes=5)
PING_MATCHER = re.compile( PING_MATCHER = re.compile(
r'(?P<min>\d+.\d+)\/(?P<avg>\d+.\d+)\/(?P<max>\d+.\d+)\/(?P<mdev>\d+.\d+)') r'(?P<min>\d+.\d+)\/(?P<avg>\d+.\d+)\/(?P<max>\d+.\d+)\/(?P<mdev>\d+.\d+)')
WIN32_PING_MATCHER = re.compile(
r'(?P<min>\d+)ms.+(?P<max>\d+)ms.+(?P<avg>\d+)ms')
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Required(CONF_HOST): cv.string, vol.Required(CONF_HOST): cv.string,
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
@ -102,7 +105,7 @@ class PingData(object):
if sys.platform == 'win32': if sys.platform == 'win32':
self._ping_cmd = [ self._ping_cmd = [
'ping', '-n', str(self._count), '-w 1000', self._ip_address] 'ping', '-n', str(self._count), '-w', '1000', self._ip_address]
else: else:
self._ping_cmd = [ self._ping_cmd = [
'ping', '-n', '-q', '-c', str(self._count), '-W1', 'ping', '-n', '-q', '-c', str(self._count), '-W1',
@ -114,13 +117,23 @@ class PingData(object):
self._ping_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) self._ping_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
try: try:
out = pinger.communicate() out = pinger.communicate()
match = PING_MATCHER.search(str(out).split('\n')[-1]) _LOGGER.debug("Output is %s", str(out))
rtt_min, rtt_avg, rtt_max, rtt_mdev = match.groups() if sys.platform == 'win32':
return { match = WIN32_PING_MATCHER.search(str(out).split('\n')[-1])
'min': rtt_min, rtt_min, rtt_avg, rtt_max = match.groups()
'avg': rtt_avg, return {
'max': rtt_max, 'min': rtt_min,
'mdev': rtt_mdev} 'avg': rtt_avg,
'max': rtt_max,
'mdev': ''}
else:
match = PING_MATCHER.search(str(out).split('\n')[-1])
rtt_min, rtt_avg, rtt_max, rtt_mdev = match.groups()
return {
'min': rtt_min,
'avg': rtt_avg,
'max': rtt_max,
'mdev': rtt_mdev}
except (subprocess.CalledProcessError, AttributeError): except (subprocess.CalledProcessError, AttributeError):
return False return False