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

Revert "Allow Google Assistant relative volume control (#26585)" (#27416)

Browse Source 
This reverts commit 95c537bee88fd2db7507024a1e32eb52364facbb.
This commit is contained in:
Paulus Schoutsen 2019-10-10 12:46:40 -07:00 committed by GitHub
parent 9e3005133a
commit 2ab6eb4fa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
homeassistant/components/google_assistant/trait.py
View File

@ -1427,33 +1427,18 @@ class VolumeTrait(_Trait):
async def _execute_volume_relative(self, data, params): async def _execute_volume_relative(self, data, params):
# This could also support up/down commands using relativeSteps # This could also support up/down commands using relativeSteps
relative = params["volumeRelativeLevel"] relative = params["volumeRelativeLevel"]
current = self.state.attributes.get(media_player.ATTR_MEDIA_VOLUME_LEVEL)
# if we have access to current volume level, do a single 'set' call await self.hass.services.async_call(
if media_player.ATTR_MEDIA_VOLUME_LEVEL in self.state.attributes: media_player.DOMAIN,
current = self.state.attributes.get(media_player.ATTR_MEDIA_VOLUME_LEVEL) media_player.SERVICE_VOLUME_SET,
{
await self.hass.services.async_call( ATTR_ENTITY_ID: self.state.entity_id,
media_player.DOMAIN, media_player.ATTR_MEDIA_VOLUME_LEVEL: current + relative / 100,
media_player.SERVICE_VOLUME_SET, },
{ blocking=True,
ATTR_ENTITY_ID: self.state.entity_id, context=data.context,
media_player.ATTR_MEDIA_VOLUME_LEVEL: current + relative / 100, )
},
blocking=True,
context=data.context,
)
# otherwise do multiple 'up' or 'down' calls
else:
for _ in range(abs(relative)):
await self.hass.services.async_call(
media_player.DOMAIN,
media_player.SERVICE_VOLUME_UP
if relative > 0
else media_player.SERVICE_VOLUME_DOWN,
{ATTR_ENTITY_ID: self.state.entity_id},
blocking=True,
context=data.context,
)
async def execute(self, command, data, params, challenge): async def execute(self, command, data, params, challenge):
"""Execute a brightness command.""" """Execute a brightness command."""

29
tests/components/google_assistant/test_trait.py
View File

@ -1599,35 +1599,6 @@ async def test_volume_media_player_relative(hass):
} }
async def test_volume_media_player_relative_no_vol_lvl(hass):
"""Test volume trait support for media player domain."""
trt = trait.VolumeTrait(
hass, State("media_player.bla", media_player.STATE_PLAYING, {}), BASIC_CONFIG
)
assert trt.sync_attributes() == {}
assert trt.query_attributes() == {}
up_calls = async_mock_service(
hass, media_player.DOMAIN, media_player.SERVICE_VOLUME_UP
)
await trt.execute(
trait.COMMAND_VOLUME_RELATIVE, BASIC_DATA, {"volumeRelativeLevel": 2}, {}
)
assert len(up_calls) == 2
down_calls = async_mock_service(
hass, media_player.DOMAIN, media_player.SERVICE_VOLUME_DOWN
)
await trt.execute(
trait.COMMAND_VOLUME_RELATIVE, BASIC_DATA, {"volumeRelativeLevel": -2}, {}
)
assert len(down_calls) == 2
async def test_temperature_setting_sensor(hass): async def test_temperature_setting_sensor(hass):
"""Test TemperatureSetting trait support for temperature sensor.""" """Test TemperatureSetting trait support for temperature sensor."""
assert ( assert (