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

Add 'adb_response' attribute to Android TV / Fire TV (#23960)

Browse Source 
* Add 'adb_response' attribute to Android TV / Fire TV

* Use None instead of empty string for empty ADB responses

* Initialize self._adb_response as None, not empty string

* Update the state after sending an ADB command

This ensures that the `'adb_response'` attribute contains the response to the latest command
This commit is contained in:
Jeff Irion 2019-05-24 15:43:35 -07:00 committed by Teemu R
parent ca2a68217d
commit 14d169558f
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
homeassistant/components/androidtv/media_player.py
View File

@ -157,10 +157,10 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
for target_device in target_devices: for target_device in target_devices:
output = target_device.adb_command(cmd) output = target_device.adb_command(cmd)
# log the output if there is any # log the output, if there is any
if output and (not isinstance(output, str) or output.strip()): if output:
_LOGGER.info("Output of command '%s' from '%s': %s", _LOGGER.info("Output of command '%s' from '%s': %s",
cmd, target_device.entity_id, repr(output)) cmd, target_device.entity_id, output)
hass.services.register(ANDROIDTV_DOMAIN, SERVICE_ADB_COMMAND, hass.services.register(ANDROIDTV_DOMAIN, SERVICE_ADB_COMMAND,
service_adb_command, service_adb_command,
@ -225,6 +225,7 @@ class ADBDevice(MediaPlayerDevice):
self.exceptions = (ConnectionResetError, RuntimeError) self.exceptions = (ConnectionResetError, RuntimeError)
# Property attributes # Property attributes
self._adb_response = None
self._available = self.aftv.available self._available = self.aftv.available
self._current_app = None self._current_app = None
self._state = None self._state = None
@ -244,6 +245,11 @@ class ADBDevice(MediaPlayerDevice):
"""Return whether or not the ADB connection is valid.""" """Return whether or not the ADB connection is valid."""
return self._available return self._available
@property
def device_state_attributes(self):
"""Provide the last ADB command's response as an attribute."""
return {'adb_response': self._adb_response}
@property @property
def name(self): def name(self):
"""Return the device name.""" """Return the device name."""
@ -305,12 +311,24 @@ class ADBDevice(MediaPlayerDevice):
"""Send an ADB command to an Android TV / Fire TV device.""" """Send an ADB command to an Android TV / Fire TV device."""
key = self._keys.get(cmd) key = self._keys.get(cmd)
if key: if key:
return self.aftv.adb_shell('input keyevent {}'.format(key)) self.aftv.adb_shell('input keyevent {}'.format(key))
self._adb_response = None
self.schedule_update_ha_state()
return
if cmd == 'GET_PROPERTIES': if cmd == 'GET_PROPERTIES':
return self.aftv.get_properties_dict() self._adb_response = str(self.aftv.get_properties_dict())
self.schedule_update_ha_state()
return self._adb_response
return self.aftv.adb_shell(cmd) response = self.aftv.adb_shell(cmd)
if isinstance(response, str) and response.strip():
self._adb_response = response.strip()
else:
self._adb_response = None
self.schedule_update_ha_state()
return self._adb_response
class AndroidTVDevice(ADBDevice): class AndroidTVDevice(ADBDevice):