Skip to content

UniFi - handle device not having a name #25713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kane610 merged 3 commits into from
Aug 6, 2019
+18 −8
Merged

UniFi - handle device not having a name #25713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cbbfa2
Handle device not having a name
Kane610 Aug 5, 2019
c5cb3c3
Missed a spot
Kane610 Aug 5, 2019
c335a37
Fix device registry
Kane610 Aug 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions homeassistant/components/unifi/device_tracker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,9 @@ def update_items(controller, async_add_entities, tracked):
tracked[client_id] = UniFiClientTracker(client, controller)
new_tracked.append(tracked[client_id])
LOGGER.debug(
"New UniFi client tracker %s (%s)", client.hostname, client.mac
"New UniFi client tracker %s (%s)",
client.name or client.hostname,
client.mac,
)

if not controller.unifi_config.get(CONF_DONT_TRACK_DEVICES, False):
Expand All @@ -208,7 +210,11 @@ def update_items(controller, async_add_entities, tracked):

tracked[device_id] = UniFiDeviceTracker(device, controller)
new_tracked.append(tracked[device_id])
LOGGER.debug("New UniFi device tracker %s (%s)", device.name, device.mac)
LOGGER.debug(
"New UniFi device tracker %s (%s)",
device.name or device.model,
device.mac,
)

if new_tracked:
async_add_entities(new_tracked)
Expand Down Expand Up @@ -311,7 +317,7 @@ def source_type(self):
@property
def name(self) -> str:
"""Return the name of the device."""
return self.device.name
return self.device.name or self.device.model

@property
def unique_id(self) -> str:
Expand All @@ -326,14 +332,18 @@ def available(self) -> bool:
@property
def device_info(self):
"""Return a device description for device registry."""
return {
info = {
"connections": {(CONNECTION_NETWORK_MAC, self.device.mac)},
"manufacturer": ATTR_MANUFACTURER,
"model": self.device.model,
"name": self.device.name,
"sw_version": self.device.version,
}

if self.device.name:
info["name"] = self.device.name

return info

@property
def device_state_attributes(self):
"""Return the device state attributes."""
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/unifi/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"config_flow": true,
"documentation": "https://www.home-assistant.io/components/unifi",
"requirements": [
"aiounifi==9"
"aiounifi==10"
],
"dependencies": [],
"codeowners": [
Expand Down
2 changes: 1 addition & 1 deletion requirements_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ aiopvapi==1.6.14
aioswitcher==2019.4.26

# homeassistant.components.unifi
aiounifi==9
aiounifi==10

# homeassistant.components.wwlln
aiowwlln==1.0.0
Expand Down
2 changes: 1 addition & 1 deletion requirements_test_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ aionotion==1.1.0
aioswitcher==2019.4.26

# homeassistant.components.unifi
aiounifi==9
aiounifi==10

# homeassistant.components.wwlln
aiowwlln==1.0.0
Expand Down