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

Stream: Only add base url when needed (#21979)

Browse Source
This commit is contained in:
Paulus Schoutsen 2019-03-12 11:46:20 -07:00 committed by GitHub
parent d635111e4f
commit 4a4bb43422
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/camera/__init__.py
View File

@ -566,7 +566,7 @@ async def async_handle_play_stream_service(camera, service_call):
url = request_stream(hass, camera.stream_source, fmt=fmt) url = request_stream(hass, camera.stream_source, fmt=fmt)
data = { data = {
ATTR_ENTITY_ID: entity_ids, ATTR_ENTITY_ID: entity_ids,
ATTR_MEDIA_CONTENT_ID: url, ATTR_MEDIA_CONTENT_ID: "{}{}".format(hass.config.api.base_url, url),
ATTR_MEDIA_CONTENT_TYPE: FORMAT_CONTENT_TYPE[fmt] ATTR_MEDIA_CONTENT_TYPE: FORMAT_CONTENT_TYPE[fmt]
} }

2
homeassistant/components/stream/__init__.py
View File

@ -59,7 +59,7 @@ def request_stream(hass, stream_source, *, fmt='hls',
stream.access_token = generate_secret() stream.access_token = generate_secret()
stream.start() stream.start()
return hass.data[DOMAIN][ATTR_ENDPOINTS][fmt].format( return hass.data[DOMAIN][ATTR_ENDPOINTS][fmt].format(
hass.config.api.base_url, stream.access_token) stream.access_token)
except Exception: except Exception:
raise HomeAssistantError('Unable to get stream') raise HomeAssistantError('Unable to get stream')

2
homeassistant/components/stream/hls.py
View File

@ -18,7 +18,7 @@ def async_setup_hls(hass):
"""Set up api endpoints.""" """Set up api endpoints."""
hass.http.register_view(HlsPlaylistView()) hass.http.register_view(HlsPlaylistView())
hass.http.register_view(HlsSegmentView()) hass.http.register_view(HlsSegmentView())
return '{}/api/hls/{}/playlist.m3u8' return '/api/hls/{}/playlist.m3u8'
class HlsPlaylistView(StreamView): class HlsPlaylistView(StreamView):