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

Use async_timeout in forked_daapd (#78451)

Browse Source
This commit is contained in:
epenet 2022-09-14 12:24:54 +02:00 committed by GitHub
parent fad0b00fbc
commit 2625189529
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
homeassistant/components/forked_daapd/media_player.py
View File

@ -6,6 +6,7 @@ from collections import defaultdict
import logging import logging
from typing import Any from typing import Any
import async_timeout
from pyforked_daapd import ForkedDaapdAPI from pyforked_daapd import ForkedDaapdAPI
from pylibrespot_java import LibrespotJavaAPI from pylibrespot_java import LibrespotJavaAPI
@ -647,9 +648,8 @@ class ForkedDaapdMaster(MediaPlayerEntity):
self._pause_requested = True self._pause_requested = True
await self.async_media_pause() await self.async_media_pause()
try: try:
await asyncio.wait_for( async with async_timeout.timeout(CALLBACK_TIMEOUT):
self._paused_event.wait(), timeout=CALLBACK_TIMEOUT await self._paused_event.wait() # wait for paused
) # wait for paused
except asyncio.TimeoutError: except asyncio.TimeoutError:
self._pause_requested = False self._pause_requested = False
self._paused_event.clear() self._paused_event.clear()
@ -693,7 +693,8 @@ class ForkedDaapdMaster(MediaPlayerEntity):
await sleep_future await sleep_future
await self._api.add_to_queue(uris=media_id, playback="start", clear=True) await self._api.add_to_queue(uris=media_id, playback="start", clear=True)
try: try:
await asyncio.wait_for(self._tts_playing_event.wait(), timeout=TTS_TIMEOUT) async with async_timeout.timeout(TTS_TIMEOUT):
await self._tts_playing_event.wait()
# we have started TTS, now wait for completion # we have started TTS, now wait for completion
await asyncio.sleep( await asyncio.sleep(
self._queue["items"][0]["length_ms"] self._queue["items"][0]["length_ms"]