Add control of Amcrest indicator light #23986
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 tasks
pvizeli
reviewed
May 23, 2019
|
|
||
| def _enable_light(self, enable): | ||
| """Enable or disable indicator light.""" | ||
| from amcrest import AmcrestError |
There was a problem hiding this comment.
You can now import things on top, out of functions
There was a problem hiding this comment.
Cool! I rebased, moved the imports, tested and force pushed.
There was a problem hiding this comment.
@pvizeli is this ok now and ready for a merge, or does it still require more review? Thanks!
Enable feature by default but allow it to be disabled by "control_light: false" in config. Get brand from camera instead of assuming Amcrest (since this works with other cameras, too.) Retrieve RTSP URL in update method instead of in stream_source property and in handle_async_mjpeg_stream method. Move amcrest imports from methods to global.
pnbruckner
force-pushed
the
amcrest-indicator-light
branch
from
029e008 to
3995275
Compare
balloob
approved these changes
May 31, 2019
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
Automatically control the camera's indicator light, turning it on if the audio or video streams are enabled, and turning it off if both streams are disabled.
Enable feature by default but allow it to be disabled by
control_light: falsein config.Get brand from camera instead of assuming Amcrest (since this works with other cameras, too.)
Retrieve RTSP URL in update method instead of in
stream_sourceproperty and inhandle_async_mjpeg_streammethod.Related issue (if applicable): None
Pull request with documentation for home-assistant.io (if applicable): home-assistant/home-assistant.io#9486
Example entry for
configuration.yaml(if applicable):Checklist:
tox. Your PR cannot be merged unless tests passIf user exposed functionality or configuration variables are added/changed:
If the code communicates with devices, web services, or third-party tools:
python3 -m script.hassfest.requirements_all.txtby runningpython3 -m script.gen_requirements_all..coveragerc.