Remove superfluous underscore from lutron_caseta entity and device names (#72337)

This commit is contained in:
J. Nick Koston 2022-05-23 05:03:49 -05:00 committed by GitHub
parent c770a81160
commit 31b53e7fc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 15 deletions

View File

@ -197,15 +197,15 @@ def _async_register_button_devices(
if "serial" not in device or device["serial"] in seen: if "serial" not in device or device["serial"] in seen:
continue continue
seen.add(device["serial"]) seen.add(device["serial"])
area, name = _area_and_name_from_name(device["name"])
device_args = { device_args = {
"name": device["name"], "name": f"{area} {name}",
"manufacturer": MANUFACTURER, "manufacturer": MANUFACTURER,
"config_entry_id": config_entry_id, "config_entry_id": config_entry_id,
"identifiers": {(DOMAIN, device["serial"])}, "identifiers": {(DOMAIN, device["serial"])},
"model": f"{device['model']} ({device['type']})", "model": f"{device['model']} ({device['type']})",
"via_device": (DOMAIN, bridge_device["serial"]), "via_device": (DOMAIN, bridge_device["serial"]),
} }
area, _ = _area_and_name_from_name(device["name"])
if area != UNASSIGNED_AREA: if area != UNASSIGNED_AREA:
device_args["suggested_area"] = area device_args["suggested_area"] = area
@ -312,15 +312,16 @@ class LutronCasetaDevice(Entity):
self._bridge_device = bridge_device self._bridge_device = bridge_device
if "serial" not in self._device: if "serial" not in self._device:
return return
area, name = _area_and_name_from_name(device["name"])
self._attr_name = full_name = f"{area} {name}"
info = DeviceInfo( info = DeviceInfo(
identifiers={(DOMAIN, self.serial)}, identifiers={(DOMAIN, self.serial)},
manufacturer=MANUFACTURER, manufacturer=MANUFACTURER,
model=f"{device['model']} ({device['type']})", model=f"{device['model']} ({device['type']})",
name=self.name, name=full_name,
via_device=(DOMAIN, self._bridge_device["serial"]), via_device=(DOMAIN, self._bridge_device["serial"]),
configuration_url=CONFIG_URL, configuration_url=CONFIG_URL,
) )
area, _ = _area_and_name_from_name(device["name"])
if area != UNASSIGNED_AREA: if area != UNASSIGNED_AREA:
info[ATTR_SUGGESTED_AREA] = area info[ATTR_SUGGESTED_AREA] = area
self._attr_device_info = info self._attr_device_info = info
@ -334,11 +335,6 @@ class LutronCasetaDevice(Entity):
"""Return the device ID used for calling pylutron_caseta.""" """Return the device ID used for calling pylutron_caseta."""
return self._device["device_id"] return self._device["device_id"]
@property
def name(self):
"""Return the name of the device."""
return self._device["name"]
@property @property
def serial(self): def serial(self):
"""Return the serial number of the device.""" """Return the serial number of the device."""

View File

@ -30,15 +30,10 @@ class LutronCasetaScene(Scene):
def __init__(self, scene, bridge): def __init__(self, scene, bridge):
"""Initialize the Lutron Caseta scene.""" """Initialize the Lutron Caseta scene."""
self._scene_name = scene["name"] self._attr_name = scene["name"]
self._scene_id = scene["scene_id"] self._scene_id = scene["scene_id"]
self._bridge = bridge self._bridge = bridge
@property
def name(self):
"""Return the name of the scene."""
return self._scene_name
async def async_activate(self, **kwargs: Any) -> None: async def async_activate(self, **kwargs: Any) -> None:
"""Activate the scene.""" """Activate the scene."""
await self._bridge.activate_scene(self._scene_id) await self._bridge.activate_scene(self._scene_id)