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

Migrate Axis to new entity naming style (#74735)

Browse source
This commit is contained in:
Robert Svensson 2022-07-14 21:01:57 +02:00 • committed by GitHub
parent 124bfe1629
commit 874043f596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
homeassistant/components/axis/axis_base.py
View file

@ -10,6 +10,8 @@ from .const import DOMAIN as AXIS_DOMAIN
class AxisEntityBase(Entity):
"""Base common to all Axis entities."""
_attr_has_entity_name = True
def __init__(self, device):
"""Initialize the Axis event."""
self.device = device
@ -47,7 +49,7 @@ class AxisEventBase(AxisEntityBase):
super().__init__(device)
self.event = event
self._attr_name = f"{device.name} {event.TYPE} {event.id}"
self._attr_name = f"{event.TYPE} {event.id}"
self._attr_unique_id = f"{device.unique_id}-{event.topic}-{event.id}"
self._attr_device_class = event.CLASS

6
homeassistant/components/axis/binary_sensor.py
View file

@ -110,9 +110,7 @@ class AxisBinarySensor(AxisEventBase, BinarySensorEntity):
and self.event.id in self.device.api.vapix.ports
and self.device.api.vapix.ports[self.event.id].name
):
return (
f"{self.device.name} {self.device.api.vapix.ports[self.event.id].name}"
)
return self.device.api.vapix.ports[self.event.id].name
if self.event.CLASS == CLASS_MOTION:
@ -128,6 +126,6 @@ class AxisBinarySensor(AxisEventBase, BinarySensorEntity):
and event_data
and self.event.id in event_data
):
return f"{self.device.name} {self.event.TYPE} {event_data[self.event.id].name}"
return f"{self.event.TYPE} {event_data[self.event.id].name}"
return self._attr_name

1
homeassistant/components/axis/camera.py
View file

@ -40,7 +40,6 @@ class AxisCamera(AxisEntityBase, MjpegCamera):
MjpegCamera.__init__(
self,
name=device.name,
username=device.username,
password=device.password,
mjpeg_url=self.mjpeg_source,

2
homeassistant/components/axis/light.py
View file

@ -53,7 +53,7 @@ class AxisLight(AxisEventBase, LightEntity):
self.max_intensity = 0
light_type = device.api.vapix.light_control[self.light_id].light_type
self._attr_name = f"{device.name} {light_type} {event.TYPE} {event.id}"
self._attr_name = f"{light_type} {event.TYPE} {event.id}"
self._attr_supported_color_modes = {ColorMode.BRIGHTNESS}
self._attr_color_mode = ColorMode.BRIGHTNESS

2
homeassistant/components/axis/switch.py
View file

@ -40,7 +40,7 @@ class AxisSwitch(AxisEventBase, SwitchEntity):
super().__init__(event, device)
if event.id and device.api.vapix.ports[event.id].name:
self._attr_name = f"{device.name} {device.api.vapix.ports[event.id].name}"
self._attr_name = device.api.vapix.ports[event.id].name
@property
def is_on(self):