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.

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

ONVIF Camera added Error handling and rtsp authentication. #11129

Merged
merged 15 commits into from Feb 17, 2018

Conversation

Projects
None yet
8 participants
@matt2005
Copy link
Contributor

commented Dec 13, 2017

Bugfixes for several issues with hass.io and non-venv installations

Description:

Added passing of credentials to RTSP stream
Changed from ONVIFService to ONVIFCamera as ONVIFService didn't contain the same error handling.
Changed method to get Stream URL from camera to a more compatible method
Added extra Error handling

Checklist:

If the code communicates with devices, web services, or third-party tools:

  • Local tests with tox run successfully. Your PR cannot be merged unless tests pass
homeassistant/components/camera/onvif.py Outdated
)
self._input = stream_uri.Uri.replace(
'rtsp://', 'rtsp://{}:{}@'.format(config.get(
CONF_USERNAME), config.get(CONF_PASSWORD)), 1)

This comment has been minimized.

Copy link
@houndci-bot

houndci-bot Dec 13, 2017

continuation line missing indentation or outdented

This comment has been minimized.

Copy link
@matt2005

matt2005 Jan 12, 2018

Author Contributor

fixed

homeassistant/components/camera/onvif.py Outdated
_LOGGER.debug("ONVIF Camera Using the following URL for %s: %s",
self._input = None
try:
_LOGGER.debug("Attempting to communicate with ONVIF Camera: %s on port %s",

This comment has been minimized.

Copy link
@houndci-bot

houndci-bot Dec 13, 2017

line too long (87 > 79 characters)

This comment has been minimized.

Copy link
@matt2005

matt2005 Jan 12, 2018

Author Contributor

fixed

matt2005 added some commits Dec 13, 2017

added Error handling and rtsp authentication.
Bugfixes for several issues with hass.io and non-venv installations

@matt2005 matt2005 force-pushed the matt2005:dev branch to ffff1cb Dec 14, 2017

@matt2005

This comment has been minimized.

Copy link
Contributor Author

commented Dec 28, 2017

Do I need to do any other changes to this?

@tringler

This comment has been minimized.

Copy link
Contributor

commented Jan 4, 2018

I would really appreciate if this PR can be merged in the next days, because I have a PR in the pipe-line since almost 1 month, which is in conflict with that PR.

@matt2005

This comment has been minimized.

Copy link
Contributor Author

commented Jan 12, 2018

@matt2005
Copy link
Contributor Author

left a comment

fixed pep errors

@matt2005 matt2005 referenced this pull request Jan 17, 2018

Merged

Added support for multiple onvif profiles #11651

9 of 9 tasks complete

matt2005 added some commits Dec 13, 2017

added Error handling and rtsp authentication.
Bugfixes for several issues with hass.io and non-venv installations

@matt2005 matt2005 force-pushed the matt2005:dev branch to b55ebd7 Jan 17, 2018

@matt2005
Copy link
Contributor Author

left a comment

switch to use proper onvifcamersa instead of service from a wsdl

matt2005 added some commits Jan 17, 2018

Merge branch 'dev' of https://github.com/matt2005/home-assistant into…
… dev

# Conflicts:
#	homeassistant/components/camera/onvif.py

@matt2005 matt2005 referenced this pull request Feb 1, 2018

Merged

Support for PTZ in Onvif cameras #11630

9 of 9 tasks complete

@home-assistant home-assistant deleted a comment from homeassistant Feb 14, 2018

@bitglue bitglue merged commit 66dcb6c into home-assistant:dev Feb 17, 2018

5 checks passed

WIP ready for review
Details
cla-bot Everyone involved has signed the CLA
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage remained the same at 93.891%
Details
hound No violations found. Woof!

@balloob balloob referenced this pull request Feb 22, 2018

Merged

0.64.0 #12609

@home-assistant home-assistant locked and limited conversation to collaborators May 29, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
You can’t perform that action at this time.