evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix resetting access token on streams with keepalive (#22148)

Browse source
This commit is contained in:
Jason Hunter 2019-03-18 09:27:34 -04:00 • committed by Charles Garwood
parent e14b243336
commit ce5cf5803c
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
homeassistant/components/stream/__init__.py
View file

@ -120,10 +120,16 @@ class Stream:
"""Remove provider output stream.""" """Remove provider output stream."""
if provider.format in self._outputs: if provider.format in self._outputs:
del self._outputs[provider.format] del self._outputs[provider.format]
self.check_idle()
if not self._outputs: if not self._outputs:
self.stop() self.stop()
def check_idle(self):
"""Reset access token if all providers are idle."""
if all([p.idle for p in self._outputs.values()]):
self.access_token = None
def start(self): def start(self):
"""Start a stream.""" """Start a stream."""
if self._thread is None or not self._thread.isAlive(): if self._thread is None or not self._thread.isAlive():

16
homeassistant/components/stream/core.py
View file

@ -43,6 +43,7 @@ class StreamOutput:
def __init__(self, stream) -> None: def __init__(self, stream) -> None:
"""Initialize a stream output.""" """Initialize a stream output."""
self.idle = False
self._stream = stream self._stream = stream
self._cursor = None self._cursor = None
self._event = asyncio.Event() self._event = asyncio.Event()
@ -77,10 +78,11 @@ class StreamOutput:
def get_segment(self, sequence: int = None) -> Any: def get_segment(self, sequence: int = None) -> Any:
"""Retrieve a specific segment, or the whole list.""" """Retrieve a specific segment, or the whole list."""
self.idle = False
# Reset idle timeout # Reset idle timeout
if self._unsub is not None: if self._unsub is not None:
self._unsub() self._unsub()
self._unsub = async_call_later(self._stream.hass, 300, self._cleanup) self._unsub = async_call_later(self._stream.hass, 300, self._timeout)
if not sequence: if not sequence:
return self._segments return self._segments
@ -109,7 +111,7 @@ class StreamOutput:
# Start idle timeout when we start recieving data # Start idle timeout when we start recieving data
if self._unsub is None: if self._unsub is None:
self._unsub = async_call_later( self._unsub = async_call_later(
self._stream.hass, 300, self._cleanup) self._stream.hass, 300, self._timeout)
if segment is None: if segment is None:
self._event.set() self._event.set()
@ -124,7 +126,15 @@ class StreamOutput:
self._event.clear() self._event.clear()
@callback @callback
def _cleanup(self, _now=None): def _timeout(self, _now=None):
"""Handle stream timeout."""
if self._stream.keepalive:
self.idle = True
self._stream.check_idle()
else:
self._cleanup()
def _cleanup(self):
"""Remove provider.""" """Remove provider."""
self._segments = [] self._segments = []
self._stream.remove_provider(self) self._stream.remove_provider(self)