Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make generic camera stream_source a template #36123

Merged
merged 9 commits into from
Jun 22, 2020
Merged

Make generic camera stream_source a template #36123

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
72626d2
stream_source. Can be a template.
zvldz May 25, 2020
46c935e
stream_source. Can be a template. fixed default value
zvldz May 25, 2020
df730ba
fixes from PR #36123
zvldz Jun 11, 2020
4600034
Fixed return result
zvldz Jun 11, 2020
875f727
Test for a new feature
zvldz Jun 16, 2020
06d2e02
Add test for stream source template
MartinHjelmare Jun 17, 2020
df0ff64
Add test for no stream source set
MartinHjelmare Jun 17, 2020
e04e9e7
Clean docstring
MartinHjelmare Jun 17, 2020
68d3072
Add block till done
MartinHjelmare Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions homeassistant/components/generic/camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
{
vol.Required(CONF_STILL_IMAGE_URL): cv.template,
vol.Optional(CONF_STREAM_SOURCE, default=None): vol.Any(None, cv.string),
vol.Optional(CONF_STREAM_SOURCE): cv.template,
vol.Optional(CONF_AUTHENTICATION, default=HTTP_BASIC_AUTHENTICATION): vol.In(
[HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION]
),
Expand Down Expand Up @@ -72,8 +72,10 @@ def __init__(self, hass, device_info):
self._authentication = device_info.get(CONF_AUTHENTICATION)
self._name = device_info.get(CONF_NAME)
self._still_image_url = device_info[CONF_STILL_IMAGE_URL]
self._stream_source = device_info[CONF_STREAM_SOURCE]
self._stream_source = device_info.get(CONF_STREAM_SOURCE)
self._still_image_url.hass = hass
if self._stream_source is not None:
self._stream_source.hass = hass
self._limit_refetch = device_info[CONF_LIMIT_REFETCH_TO_URL_CHANGE]
self._frame_interval = 1 / device_info[CONF_FRAMERATE]
self._supported_features = SUPPORT_STREAM if self._stream_source else 0
Expand Down Expand Up @@ -166,4 +168,11 @@ def name(self):

async def stream_source(self):
"""Return the source of the stream."""
return self._stream_source
if self._stream_source is None:
return None

try:
MartinHjelmare marked this conversation as resolved.
Show resolved Hide resolved
return self._stream_source.async_render()
MartinHjelmare marked this conversation as resolved.
Show resolved Hide resolved
except TemplateError as err:
_LOGGER.error("Error parsing template %s: %s", self._stream_source, err)
return None