Skip to content

Commit

Permalink
fix: check for hass existence and fallback call
Browse files Browse the repository at this point in the history 
The use of async_create_task requires entity has been added to hass. If this
has not occured use the old direct call.
closes #1221
  • Loading branch information
@alandtse
alandtse committed Apr 10, 2021
1 parent dd3869e commit f2d8362
Showing 1 changed file with 159 additions and 49 deletions.
208 changes: 159 additions & 49 deletions custom_components/alexa_media/media_player.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -725,14 +725,20 @@ def source_list(self):
async def async_select_source(self, source):
"""Select input source."""
if source == "Local Speaker":
self.hass.async_create_task(self.alexa_api.disconnect_bluetooth())
if self.hass:
self.hass.async_create_task(self.alexa_api.disconnect_bluetooth())
else:
await self.alexa_api.disconnect_bluetooth()
self._source = "Local Speaker"
elif self._bluetooth_state.get("pairedDeviceList"):
for devices in self._bluetooth_state["pairedDeviceList"]:
if devices["friendlyName"] == source:
self.hass.async_create_task(
self.alexa_api.set_bluetooth(devices["address"])
)
if self.hass:
self.hass.async_create_task(
self.alexa_api.set_bluetooth(devices["address"])
)
else:
await self.alexa_api.set_bluetooth(devices["address"])
self._source = source
if not (
self.hass.data[DATA_ALEXAMEDIA]["accounts"][self._login.email]["websocket"]
Expand Down Expand Up @@ -1028,7 +1034,10 @@ def dnd_state(self, state):
@_catch_login_errors
async def async_set_shuffle(self, shuffle):
"""Enable/disable shuffle mode."""
self.hass.async_create_task(self.alexa_api.shuffle(shuffle))
if self.hass:
self.hass.async_create_task(self.alexa_api.shuffle(shuffle))
else:
await self.alexa_api.shuffle(shuffle)
self._shuffle = shuffle

@property
Expand Down Expand Up @@ -1063,7 +1072,10 @@ async def async_set_volume_level(self, volume):
"""Set volume level, range 0..1."""
if not self.available:
return
self.hass.async_create_task(self.alexa_api.set_volume(volume))
if self.hass:
self.hass.async_create_task(self.alexa_api.set_volume(volume))
else:
await self.alexa_api.set_volume(volume)
self._media_vol_level = volume
if not (
self.hass.data[DATA_ALEXAMEDIA]["accounts"][self._login.email]["websocket"]
Expand Down Expand Up @@ -1096,14 +1108,23 @@ async def async_mute_volume(self, mute):
self._media_is_muted = mute
if mute:
self._previous_volume = self.volume_level
self.hass.async_create_task(self.alexa_api.set_volume(0))
if self.hass:
self.hass.async_create_task(self.alexa_api.set_volume(0))
else:
await self.alexa_api.set_volume(0)
else:
if self._previous_volume is not None:
self.hass.async_create_task(
self.alexa_api.set_volume(self._previous_volume)
)
if self.hass:
self.hass.async_create_task(
self.alexa_api.set_volume(self._previous_volume)
)
else:
await self.alexa_api.set_volume(self._previous_volume)
else:
self.hass.async_create_task(self.alexa_api.set_volume(50))
if self.hass:
self.hass.async_create_task(self.alexa_api.set_volume(50))
else:
await self.alexa_api.set_volume(50)
if not (
self.hass.data[DATA_ALEXAMEDIA]["accounts"][self._login.email]["websocket"]
):
Expand All @@ -1117,7 +1138,10 @@ async def async_media_play(self):
if self._playing_parent:
await self._playing_parent.async_media_play()
else:
self.hass.async_create_task(self.alexa_api.play())
if self.hass:
self.hass.async_create_task(self.alexa_api.play())
else:
await self.alexa_api.play()
if not (
self.hass.data[DATA_ALEXAMEDIA]["accounts"][self._login.email]["websocket"]
):
Expand All @@ -1131,7 +1155,10 @@ async def async_media_pause(self):
if self._playing_parent:
await self._playing_parent.async_media_pause()
else:
self.hass.async_create_task(self.alexa_api.pause())
if self.hass:
self.hass.async_create_task(self.alexa_api.pause())
else:
await self.alexa_api.pause()
if not (
self.hass.data[DATA_ALEXAMEDIA]["accounts"][self._login.email]["websocket"]
):
Expand All @@ -1145,14 +1172,22 @@ async def async_media_stop(self):
if self._playing_parent:
await self._playing_parent.async_media_stop()
else:
self.hass.async_create_task(
self.alexa_api.stop(
if self.hass:
self.hass.async_create_task(
self.alexa_api.stop(
customer_id=self._customer_id,
queue_delay=self.hass.data[DATA_ALEXAMEDIA]["accounts"][
self.email
]["options"][CONF_QUEUE_DELAY],
)
)
else:
await self.alexa_api.stop(
customer_id=self._customer_id,
queue_delay=self.hass.data[DATA_ALEXAMEDIA]["accounts"][self.email][
"options"
][CONF_QUEUE_DELAY],
)
)
if not (
self.hass.data[DATA_ALEXAMEDIA]["accounts"][self._login.email]["websocket"]
):
Expand Down Expand Up @@ -1187,7 +1222,10 @@ async def async_media_next_track(self):
if self._playing_parent:
await self._playing_parent.async_media_next_track()
else:
self.hass.async_create_task(self.alexa_api.next())
if self.hass:
self.hass.async_create_task(self.alexa_api.next())
else:
await self.alexa_api.next()
if not (
self.hass.data[DATA_ALEXAMEDIA]["accounts"][self._login.email]["websocket"]
):
Expand All @@ -1201,7 +1239,10 @@ async def async_media_previous_track(self):
if self._playing_parent:
await self._playing_parent.async_media_previous_track()
else:
self.hass.async_create_task(self.alexa_api.previous())
if self.hass:
self.hass.async_create_task(self.alexa_api.previous())
else:
await self.alexa_api.previous()
if not (
self.hass.data[DATA_ALEXAMEDIA]["accounts"][self._login.email]["websocket"]
):
Expand All @@ -1213,36 +1254,56 @@ async def async_send_tts(self, message, **kwargs):
NOTE: Does not work on WHA Groups.
"""
self.hass.async_create_task(
self.alexa_api.send_tts(message, customer_id=self._customer_id, **kwargs)
)
if self.hass:
self.hass.async_create_task(
self.alexa_api.send_tts(
message, customer_id=self._customer_id, **kwargs
)
)
else:
await self.alexa_api.send_tts(message, customer_id=self._customer_id, **kwargs)

@_catch_login_errors
async def async_send_announcement(self, message, **kwargs):
"""Send announcement to the media player."""
self.hass.async_create_task(
self.alexa_api.send_announcement(
if self.hass:
self.hass.async_create_task(
self.alexa_api.send_announcement(
message, customer_id=self._customer_id, **kwargs
)
)
else:
await self.alexa_api.send_announcement(
message, customer_id=self._customer_id, **kwargs
)
)

@_catch_login_errors
async def async_send_mobilepush(self, message, **kwargs):
"""Send push to the media player's associated mobile devices."""
self.hass.async_create_task(
self.alexa_api.send_mobilepush(
if self.hass:
self.hass.async_create_task(
self.alexa_api.send_mobilepush(
message, customer_id=self._customer_id, **kwargs
)
)
else:
await self.alexa_api.send_mobilepush(
message, customer_id=self._customer_id, **kwargs
)
)

@_catch_login_errors
async def async_send_dropin_notification(self, message, **kwargs):
"""Send notification dropin to the media player's associated mobile devices."""
self.hass.async_create_task(
self.alexa_api.send_dropin_notification(
if self.hass:
self.hass.async_create_task(
self.alexa_api.send_dropin_notification(
message, customer_id=self._customer_id, **kwargs
)
)
else:
await self.alexa_api.send_dropin_notification(
message, customer_id=self._customer_id, **kwargs
)
)

@_catch_login_errors
async def async_play_media(self, media_type, media_id, enqueue=None, **kwargs):
Expand Down Expand Up @@ -1271,14 +1332,22 @@ async def async_play_media(self, media_type, media_id, enqueue=None, **kwargs):
media_id,
queue_delay,
)
self.hass.async_create_task(
self.alexa_api.send_sequence(
if self.hass:
self.hass.async_create_task(
self.alexa_api.send_sequence(
media_id,
customer_id=self._customer_id,
queue_delay=queue_delay,
**kwargs,
)
)
else:
await self.alexa_api.send_sequence(
media_id,
customer_id=self._customer_id,
queue_delay=queue_delay,
**kwargs,
)
)
elif media_type == "routine":
_LOGGER.debug(
"%s: %s:Running routine %s with queue_delay %s",
Expand All @@ -1287,12 +1356,18 @@ async def async_play_media(self, media_type, media_id, enqueue=None, **kwargs):
media_id,
queue_delay,
)
self.hass.async_create_task(
self.alexa_api.run_routine(
if self.hass:
self.hass.async_create_task(
self.alexa_api.run_routine(
media_id,
queue_delay=queue_delay,
)
)
else:
await self.alexa_api.run_routine(
media_id,
queue_delay=queue_delay,
)
)
elif media_type == "sound":
_LOGGER.debug(
"%s: %s:Playing sound %s with queue_delay %s",
Expand All @@ -1301,14 +1376,22 @@ async def async_play_media(self, media_type, media_id, enqueue=None, **kwargs):
media_id,
queue_delay,
)
self.hass.async_create_task(
self.alexa_api.play_sound(
if self.hass:
self.hass.async_create_task(
self.alexa_api.play_sound(
media_id,
customer_id=self._customer_id,
queue_delay=queue_delay,
**kwargs,
)
)
else:
await self.alexa_api.play_sound(
media_id,
customer_id=self._customer_id,
queue_delay=queue_delay,
**kwargs,
)
)
elif media_type == "skill":
_LOGGER.debug(
"%s: %s:Running skill %s with queue_delay %s",
Expand All @@ -1317,20 +1400,29 @@ async def async_play_media(self, media_type, media_id, enqueue=None, **kwargs):
media_id,
queue_delay,
)
self.hass.async_create_task(
self.alexa_api.run_skill(
if self.hass:
self.hass.async_create_task(
self.alexa_api.run_skill(
media_id,
queue_delay=queue_delay,
)
)
else:
await self.alexa_api.run_skill(
media_id,
queue_delay=queue_delay,
)
)
elif media_type == "image":
_LOGGER.debug(
"%s: %s:Setting background to %s",
hide_email(self._login.email),
self,
media_id,
)
self.hass.async_create_task(self.alexa_api.set_background(media_id))
if self.hass:
self.hass.async_create_task(self.alexa_api.set_background(media_id))
else:
await self.alexa_api.set_background(media_id)
elif media_type == "custom":
_LOGGER.debug(
'%s: %s:Running custom command: "%s" with queue_delay %s',
Expand All @@ -1339,14 +1431,22 @@ async def async_play_media(self, media_type, media_id, enqueue=None, **kwargs):
media_id,
queue_delay,
)
self.hass.async_create_task(
self.alexa_api.run_custom(
if self.hass:
self.hass.async_create_task(
self.alexa_api.run_custom(
media_id,
customer_id=self._customer_id,
queue_delay=queue_delay,
**kwargs,
)
)
else:
await self.alexa_api.run_custom(
media_id,
customer_id=self._customer_id,
queue_delay=queue_delay,
**kwargs,
)
)
else:
_LOGGER.debug(
"%s: %s:Playing music %s on %s with queue_delay %s",
Expand All @@ -1356,16 +1456,26 @@ async def async_play_media(self, media_type, media_id, enqueue=None, **kwargs):
media_type,
queue_delay,
)
self.hass.async_create_task(
self.alexa_api.play_music(
if self.hass:
self.hass.async_create_task(
self.alexa_api.play_music(
media_type,
media_id,
customer_id=self._customer_id,
queue_delay=queue_delay,
timer=kwargs.get("extra", {}).get("timer", None),
**kwargs,
)
)
else:
await self.alexa_api.play_music(
media_type,
media_id,
customer_id=self._customer_id,
queue_delay=queue_delay,
timer=kwargs.get("extra", {}).get("timer", None),
**kwargs,
)
)
if not (
self.hass.data[DATA_ALEXAMEDIA]["accounts"][self._login.email]["websocket"]
):
Expand Down

0 comments on commit f2d8362

Please sign in to comment.