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

DDWRT - match multiple output variants

Browse Source 
Fixes #481
This commit is contained in:
Paulus Schoutsen 2015-10-08 22:15:12 -07:00
parent 0624725e21
commit 9f33b8f541
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
homeassistant/components/device_tracker/ddwrt.py
View File

@ -46,6 +46,7 @@ MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
_DDWRT_DATA_REGEX = re.compile(r'\{(\w+)::([^\}]*)\}') _DDWRT_DATA_REGEX = re.compile(r'\{(\w+)::([^\}]*)\}')
_MAC_REGEX = re.compile(r'(([0-9A-Fa-f]{1,2}\:){5}[0-9A-Fa-f]{1,2})')
# pylint: disable=unused-argument # pylint: disable=unused-argument
@ -77,7 +78,7 @@ class DdWrtDeviceScanner(object):
self.last_results = {} self.last_results = {}
self.mac2name = None self.mac2name = {}
# Test the router is accessible # Test the router is accessible
url = 'http://{}/Status_Wireless.live.asp'.format(self.host) url = 'http://{}/Status_Wireless.live.asp'.format(self.host)
@ -98,15 +99,18 @@ class DdWrtDeviceScanner(object):
with self.lock: with self.lock:
# if not initialised and not already scanned and not found # if not initialised and not already scanned and not found
if self.mac2name is None or device not in self.mac2name: if device not in self.mac2name:
url = 'http://{}/Status_Lan.live.asp'.format(self.host) url = 'http://{}/Status_Lan.live.asp'.format(self.host)
data = self.get_ddwrt_data(url) data = self.get_ddwrt_data(url)
if not data: if not data:
return return None
dhcp_leases = data.get('dhcp_leases', None) dhcp_leases = data.get('dhcp_leases', None)
if dhcp_leases:
if not dhcp_leases:
return None
# remove leading and trailing single quotes # remove leading and trailing single quotes
cleaned_str = dhcp_leases.strip().strip('"') cleaned_str = dhcp_leases.strip().strip('"')
elements = cleaned_str.split('","') elements = cleaned_str.split('","')
@ -121,7 +125,7 @@ class DdWrtDeviceScanner(object):
mac = elements[mac_index] mac = elements[mac_index]
self.mac2name[mac] = elements[idx * 5] self.mac2name[mac] = elements[idx * 5]
return self.mac2name.get(device, None) return self.mac2name.get(device)
@Throttle(MIN_TIME_BETWEEN_SCANS) @Throttle(MIN_TIME_BETWEEN_SCANS)
def _update_info(self): def _update_info(self):
@ -141,10 +145,12 @@ class DdWrtDeviceScanner(object):
if not data: if not data:
return False return False
if data:
self.last_results = [] self.last_results = []
active_clients = data.get('active_wireless', None) active_clients = data.get('active_wireless', None)
if active_clients: if not active_clients:
return False
# This is really lame, instead of using JSON the DD-WRT UI # This is really lame, instead of using JSON the DD-WRT UI
# uses its own data format for some reason and then # uses its own data format for some reason and then
# regex's out values so I guess I have to do the same, # regex's out values so I guess I have to do the same,
@ -154,17 +160,11 @@ class DdWrtDeviceScanner(object):
clean_str = active_clients.strip().strip("'") clean_str = active_clients.strip().strip("'")
elements = clean_str.split("','") elements = clean_str.split("','")
num_clients = int(len(elements)/9) self.last_results.extend(item for item in elements
for idx in range(0, num_clients): if _MAC_REGEX.match(item))
# get every 9th element which is the MAC address
index = idx * 9
if index < len(elements):
self.last_results.append(elements[index])
return True return True
return False
def get_ddwrt_data(self, url): def get_ddwrt_data(self, url):
""" Retrieve data from DD-WRT and return parsed result. """ """ Retrieve data from DD-WRT and return parsed result. """
try: try: