evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UniFi - Additional consolidation for cleanliness sake (#35395)

Browse source 
* Some additional consolidation for cleanliness sake

* Remove unnecessary mac property
This commit is contained in:
Robert Svensson 2020-05-09 00:34:18 +02:00 • committed by GitHub
parent 953adc105e
commit b62c7abc5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

25
homeassistant/components/unifi/device_tracker.py
View file

@ -136,12 +136,12 @@ class UniFiClientTracker(UniFiClient, ScannerEntity):
self.schedule_update = False
self.cancel_scheduled_update = None
self._is_connected = False
if self.client.last_seen:
if client.last_seen:
self._is_connected = (
self.is_wired == self.client.is_wired
self.is_wired == client.is_wired
and dt_util.utcnow()
- dt_util.utc_from_timestamp(float(self.client.last_seen))
< self.controller.option_detection_time
- dt_util.utc_from_timestamp(float(client.last_seen))
< controller.option_detection_time
)
if self._is_connected:
self.schedule_update = True
@ -260,25 +260,18 @@ class UniFiDeviceTracker(UniFiBase, ScannerEntity):
def __init__(self, device, controller):
"""Set up tracked device."""
self.device = device
super().__init__(controller)
super().__init__(device, controller)
self._is_connected = self.device.state == 1
self._is_connected = device.state == 1
self.cancel_scheduled_update = None
@property
def mac(self):
"""Return MAC of device."""
return self.device.mac
async def async_added_to_hass(self):
"""Subscribe to device events."""
await super().async_added_to_hass()
self.device.register_callback(self.async_update_callback)
def device(self):
"""Wrap item."""
return self._item
async def async_will_remove_from_hass(self) -> None:
"""Disconnect device object when removed."""
self.device.remove_callback(self.async_update_callback)
if self.cancel_scheduled_update:
self.cancel_scheduled_update()
await super().async_will_remove_from_hass()