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

Upgrade arcam_fmj to entity naming (#82586)

Browse Source
This commit is contained in:
Joakim Plate 2022-11-23 20:36:17 +01:00 committed by GitHub
parent f1ffb25d99
commit 25c7754edb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
homeassistant/components/arcam_fmj/media_player.py
View File

@ -61,6 +61,7 @@ class ArcamFmj(MediaPlayerEntity):
"""Representation of a media device.""" """Representation of a media device."""
_attr_should_poll = False _attr_should_poll = False
_attr_has_entity_name = True
def __init__( def __init__(
self, self,
@ -70,9 +71,7 @@ class ArcamFmj(MediaPlayerEntity):
) -> None: ) -> None:
"""Initialize device.""" """Initialize device."""
self._state = state self._state = state
self._device_name = device_name self._attr_name = f"Zone {state.zn}"
self._attr_name = f"{device_name} - Zone: {state.zn}"
self._uuid = uuid
self._attr_supported_features = ( self._attr_supported_features = (
MediaPlayerEntityFeature.SELECT_SOURCE MediaPlayerEntityFeature.SELECT_SOURCE
| MediaPlayerEntityFeature.PLAY_MEDIA | MediaPlayerEntityFeature.PLAY_MEDIA
@ -87,6 +86,14 @@ class ArcamFmj(MediaPlayerEntity):
self._attr_supported_features |= MediaPlayerEntityFeature.SELECT_SOUND_MODE self._attr_supported_features |= MediaPlayerEntityFeature.SELECT_SOUND_MODE
self._attr_unique_id = f"{uuid}-{state.zn}" self._attr_unique_id = f"{uuid}-{state.zn}"
self._attr_entity_registry_enabled_default = state.zn == 1 self._attr_entity_registry_enabled_default = state.zn == 1
self._attr_device_info = DeviceInfo(
identifiers={
(DOMAIN, uuid),
},
manufacturer="Arcam",
model="Arcam FMJ AVR",
name=device_name,
)
@property @property
def state(self) -> MediaPlayerState: def state(self) -> MediaPlayerState:
@ -95,19 +102,6 @@ class ArcamFmj(MediaPlayerEntity):
return MediaPlayerState.ON return MediaPlayerState.ON
return MediaPlayerState.OFF return MediaPlayerState.OFF
@property
def device_info(self) -> DeviceInfo:
"""Return a device description for device registry."""
return DeviceInfo(
identifiers={
(DOMAIN, self._uuid),
(DOMAIN, self._state.client.host, self._state.client.port), # type: ignore[arg-type]
},
manufacturer="Arcam",
model="Arcam FMJ AVR",
name=self._device_name,
)
async def async_added_to_hass(self) -> None: async def async_added_to_hass(self) -> None:
"""Once registered, add listener for events.""" """Once registered, add listener for events."""
await self._state.start() await self._state.start()

6
tests/components/arcam_fmj/test_media_player.py
View File

@ -20,7 +20,7 @@ from homeassistant.const import (
ATTR_NAME, ATTR_NAME,
) )
from .conftest import MOCK_HOST, MOCK_NAME, MOCK_PORT, MOCK_UUID from .conftest import MOCK_HOST, MOCK_UUID
MOCK_TURN_ON = { MOCK_TURN_ON = {
"service": "switch.turn_on", "service": "switch.turn_on",
@ -41,7 +41,6 @@ async def test_properties(player, state):
ATTR_NAME: f"Arcam FMJ ({MOCK_HOST})", ATTR_NAME: f"Arcam FMJ ({MOCK_HOST})",
ATTR_IDENTIFIERS: { ATTR_IDENTIFIERS: {
("arcam_fmj", MOCK_UUID), ("arcam_fmj", MOCK_UUID),
("arcam_fmj", MOCK_HOST, MOCK_PORT),
}, },
ATTR_MODEL: "Arcam FMJ AVR", ATTR_MODEL: "Arcam FMJ AVR",
ATTR_MANUFACTURER: "Arcam", ATTR_MANUFACTURER: "Arcam",
@ -102,7 +101,8 @@ async def test_mute_volume(player, state, mute):
async def test_name(player): async def test_name(player):
"""Test name.""" """Test name."""
assert player.name == f"{MOCK_NAME} - Zone: 1" data = await update(player)
assert data.attributes["friendly_name"] == "Zone 1"
async def test_update(player, state): async def test_update(player, state):