Commit 439ca60

authored

Fix Shelly Gen2 event get input name method (home-assistant#100733)

1 parent 44fd60b commit 439ca60Copy full SHA for 439ca60

File tree

-31

lines changed

-31

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`from .utils import (`
`23`	`23`	`async_remove_shelly_entity,`
`24`	`24`	`get_device_entry_gen,`
`25`		`- get_rpc_input_name,`
	`25`	`+ get_rpc_entity_name,`
`26`	`26`	`get_rpc_key_instances,`
`27`	`27`	`is_rpc_momentary_input,`
`28`	`28`	`)`
`@@ -90,7 +90,7 @@ def __init__(`
`90`	`90`	`connections={(CONNECTION_NETWORK_MAC, coordinator.mac)}`
`91`	`91`	`)`
`92`	`92`	`self._attr_unique_id = f"{coordinator.mac}-{key}"`
`93`		`- self._attr_name = get_rpc_input_name(coordinator.device, key)`
	`93`	`+ self._attr_name = get_rpc_entity_name(coordinator.device, key)`
`94`	`94`	`self.entity_description = description`
`95`	`95`
`96`	`96`	`async def async_added_to_hass(self) -> None:`

Lines changed: 0 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -285,22 +285,10 @@ def get_model_name(info: dict[str, Any]) -> str:`
`285`	`285`	`return cast(str, MODEL_NAMES.get(info["type"], info["type"]))`
`286`	`286`
`287`	`287`
`288`		`-def get_rpc_input_name(device: RpcDevice, key: str) -> str:`
`289`		`- """Get input name based from the device configuration."""`
`290`		`- input_config = device.config[key]`
`291`		`-`
`292`		`- if input_name := input_config.get("name"):`
`293`		`- return f"{device.name} {input_name}"`
`294`		`-`
`295`		`- return f"{device.name} {key.replace(':', ' ').capitalize()}"`
`296`		`-`
`297`		`-`
`298`	`288`	`def get_rpc_channel_name(device: RpcDevice, key: str) -> str:`
`299`	`289`	`"""Get name based on device and channel name."""`
`300`	`290`	`key = key.replace("emdata", "em")`
`301`	`291`	`key = key.replace("em1data", "em1")`
`302`		`- if device.config.get("switch:0"):`
`303`		`- key = key.replace("input", "switch")`
`304`	`292`	`device_name = device.name`
`305`	`293`	`entity_name: str \| None = None`
`306`	`294`	`if key in device.config:`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ def mock_light_set_state(`
`144`	`144`	`]`
`145`	`145`
`146`	`146`	`MOCK_CONFIG = {`
`147`		`- "input:0": {"id": 0, "type": "button"},`
	`147`	`+ "input:0": {"id": 0, "name": "Test name input 0", "type": "button"},`
`148`	`148`	`"light:0": {"name": "test light_0"},`
`149`	`149`	`"switch:0": {"name": "test switch_0"},`
`150`	`150`	`"cover:0": {"name": "test cover_0"},`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ async def test_humanify_shelly_click_event_rpc_device(`
`108`	`108`	`assert event1["domain"] == DOMAIN`
`109`	`109`	`assert (`
`110`	`110`	`event1["message"]`
`111`		`- == "'single_push' click event for test switch_0 Input was fired"`
	`111`	`+ == "'single_push' click event for Test name input 0 Input was fired"`
`112`	`112`	`)`
`113`	`113`
`114`	`114`	`assert event2["name"] == "Shelly"`

Lines changed: 2 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`get_device_uptime,`
`9`	`9`	`get_number_of_channels,`
`10`	`10`	`get_rpc_channel_name,`
`11`		`- get_rpc_input_name,`
`12`	`11`	`get_rpc_input_triggers,`
`13`	`12`	`is_block_momentary_input,`
`14`	`13`	`)`
`@@ -207,20 +206,8 @@ async def test_get_block_input_triggers(mock_block_device, monkeypatch) -> None:`
`207`	`206`
`208`	`207`	`async def test_get_rpc_channel_name(mock_rpc_device) -> None:`
`209`	`208`	`"""Test get RPC channel name."""`
`210`		`- assert get_rpc_channel_name(mock_rpc_device, "input:0") == "test switch_0"`
`211`		`- assert get_rpc_channel_name(mock_rpc_device, "input:3") == "Test name switch_3"`
`212`		`-`
`213`		`-`
`214`		`-async def test_get_rpc_input_name(mock_rpc_device, monkeypatch) -> None:`
`215`		`- """Test get RPC input name."""`
`216`		`- assert get_rpc_input_name(mock_rpc_device, "input:0") == "Test name Input 0"`
`217`		`-`
`218`		`- monkeypatch.setitem(`
`219`		`- mock_rpc_device.config,`
`220`		`- "input:0",`
`221`		`- {"id": 0, "type": "button", "name": "Input name"},`
`222`		`- )`
`223`		`- assert get_rpc_input_name(mock_rpc_device, "input:0") == "Test name Input name"`
	`209`	`+ assert get_rpc_channel_name(mock_rpc_device, "input:0") == "Test name input 0"`
	`210`	`+ assert get_rpc_channel_name(mock_rpc_device, "input:3") == "Test name input_3"`
`224`	`211`
`225`	`212`
`226`	`213`	`async def test_get_rpc_input_triggers(mock_rpc_device, monkeypatch) -> None:`

Comments

(0)