Added ONVIF camera component #7979

matt2005 · 2017-06-09T20:38:21Z

Description:

Added support for ONVIF IP camera's. This discovers the stream url via ONVIF.

Pull request in home-assistant.github.io with documentation (if applicable): home-assistant/home-assistant.io#2794

Example entry for `configuration.yaml` (if applicable):

camera:
    platform: onvif
    host: 192.168.1.111
    name: onviftest

Checklist:

If user exposed functionality or configuration variables are added/changed:

Documentation added/updated in home-assistant.github.io

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
New dependencies have been added to the REQUIREMENTS variable ([example][ex-requir]).
New dependencies are only imported inside functions that use them ([example][ex-import]).
New dependencies have been added to requirements_all.txt by running script/gen_requirements_all.py.
New files were added to .coveragerc.

homeassistant · 2017-06-09T21:08:29Z

Hi @matt2005,

It seems you haven't yet signed a CLA. Please do so here.

Once you do that we will be able to review and accept this pull request.

Thanks!

houndci-bot · 2017-06-09T21:08:33Z

homeassistant/components/camera/onvif.py

+                     self._name, self._username, self._password)
+
+
+    @asyncio.coroutine


too many blank lines (2)

houndci-bot · 2017-06-09T21:08:33Z

homeassistant/components/camera/onvif.py

+        _LOGGER.debug("WSDL for %s: %s",
+                     self._name, wsdl)
+        _LOGGER.debug("Login details for %s: %s %s",
+                     self._name, self._username, self._password)


continuation line under-indented for visual indent

houndci-bot · 2017-06-09T21:08:33Z

homeassistant/components/camera/onvif.py

+        _LOGGER.debug("Using the device URL for %s: %s",
+                     self._name, device_url)
+        _LOGGER.debug("WSDL for %s: %s",
+                     self._name, wsdl)


continuation line under-indented for visual indent

houndci-bot · 2017-06-09T21:08:34Z

homeassistant/components/camera/onvif.py

+        _LOGGER.debug("Using the base URL for %s: %s",
+                     self._name, self._base_url)
+        _LOGGER.debug("Using the device URL for %s: %s",
+                     self._name, device_url)


continuation line under-indented for visual indent

houndci-bot · 2017-06-09T21:08:34Z

homeassistant/components/camera/onvif.py

+        _LOGGER.debug("Using the following URL for %s: %s",
+                     self._name, self._input)
+        _LOGGER.debug("Using the base URL for %s: %s",
+                     self._name, self._base_url)


continuation line under-indented for visual indent

houndci-bot · 2017-06-09T21:08:34Z

homeassistant/components/camera/onvif.py

+        media_profile = media.GetProfiles()[0]
+        self._input = media.GetStreamUri().Uri
+        _LOGGER.debug("Using the following URL for %s: %s",
+                     self._name, self._input)


continuation line under-indented for visual indent

houndci-bot · 2017-06-09T21:08:34Z

homeassistant/components/camera/onvif.py

+        self._username = config.get(CONF_USERNAME)
+        self._password = config.get(CONF_PASSWORD)
+        media = ONVIFService(device_url,self._username, self._password, wsdl + 'media.wsdl')
+        media_profile = media.GetProfiles()[0]


local variable 'media_profile' is assigned to but never used

houndci-bot · 2017-06-09T21:08:34Z

homeassistant/components/camera/onvif.py

+        device_url = self._base_url + 'onvif/device_service'
+        self._username = config.get(CONF_USERNAME)
+        self._password = config.get(CONF_PASSWORD)
+        media = ONVIFService(device_url,self._username, self._password, wsdl + 'media.wsdl')


missing whitespace after ','
line too long (92 > 79 characters)

houndci-bot · 2017-06-09T21:08:34Z

homeassistant/components/camera/onvif.py

+
+_LOGGER = logging.getLogger(__name__)
+
+REQUIREMENTS = ['onvif-py3==0.1.3','suds-py3==1.3.3.0','http://github.com/tgaugry/suds-passworddigest-py3/archive/86fc50e39b4d2b8997481967d6a7fe1c57118999.zip#suds-passworddigest-py3==0.1.2a']


missing whitespace after ','
line too long (192 > 79 characters)

houndci-bot · 2017-06-09T21:08:34Z

homeassistant/components/camera/onvif.py

+
+import voluptuous as vol
+
+from homeassistant.const import (CONF_NAME, CONF_USERNAME, CONF_PASSWORD, CONF_PORT)


line too long (84 > 79 characters)

houndci-bot · 2017-06-09T21:16:05Z

homeassistant/components/camera/onvif.py

+        _LOGGER.debug("WSDL for %s: %s",
+                       self._name, wsdl)
+        _LOGGER.debug("Login details for %s: %s %s",
+                       self._name, self._username, self._password)


continuation line over-indented for visual indent

houndci-bot · 2017-06-09T21:16:05Z

homeassistant/components/camera/onvif.py

+        _LOGGER.debug("Using the device URL for %s: %s",
+                       self._name, device_url)
+        _LOGGER.debug("WSDL for %s: %s",
+                       self._name, wsdl)


continuation line over-indented for visual indent

houndci-bot · 2017-06-09T21:16:05Z

homeassistant/components/camera/onvif.py

+        _LOGGER.debug("Using the base URL for %s: %s",
+                       self._name, self._base_url)
+        _LOGGER.debug("Using the device URL for %s: %s",
+                       self._name, device_url)


continuation line over-indented for visual indent

houndci-bot · 2017-06-09T21:16:05Z

homeassistant/components/camera/onvif.py

+        _LOGGER.debug("Using the following URL for %s: %s",
+                       self._name, self._input)
+        _LOGGER.debug("Using the base URL for %s: %s",
+                       self._name, self._base_url)


continuation line over-indented for visual indent

houndci-bot · 2017-06-09T21:16:05Z

homeassistant/components/camera/onvif.py

+            self._password, wsdl + 'media.wsdl')
+        self._input = media.GetStreamUri().Uri
+        _LOGGER.debug("Using the following URL for %s: %s",
+                       self._name, self._input)


continuation line over-indented for visual indent

houndci-bot · 2017-06-09T21:16:05Z

homeassistant/components/camera/onvif.py

+REQUIREMENTS = ['onvif-py3==0.1.3', 
+    'suds-py3==1.3.3.0', 
+    'http://github.com/tgaugry/suds-passworddigest-py3'
+    '/archive/86fc50e39b4d2b8997481967d6a7fe1c57118999.zip'


continuation line under-indented for visual indent

houndci-bot · 2017-06-09T21:16:05Z

homeassistant/components/camera/onvif.py

+
+REQUIREMENTS = ['onvif-py3==0.1.3', 
+    'suds-py3==1.3.3.0', 
+    'http://github.com/tgaugry/suds-passworddigest-py3'


continuation line under-indented for visual indent

houndci-bot · 2017-06-09T21:16:05Z

homeassistant/components/camera/onvif.py

+_LOGGER = logging.getLogger(__name__)
+
+REQUIREMENTS = ['onvif-py3==0.1.3', 
+    'suds-py3==1.3.3.0', 


continuation line under-indented for visual indent
trailing whitespace

houndci-bot · 2017-06-09T21:16:05Z

homeassistant/components/camera/onvif.py

+
+_LOGGER = logging.getLogger(__name__)
+
+REQUIREMENTS = ['onvif-py3==0.1.3', 


trailing whitespace

houndci-bot · 2017-06-09T21:16:06Z

homeassistant/components/camera/onvif.py

+import voluptuous as vol
+
+from homeassistant.const import (CONF_NAME, CONF_USERNAME,
+    CONF_PASSWORD, CONF_PORT)


continuation line under-indented for visual indent

houndci-bot · 2017-06-09T21:22:26Z

homeassistant/components/camera/onvif.py

+        self._username = config.get(CONF_USERNAME)
+        self._password = config.get(CONF_PASSWORD)
+        media = ONVIFService(device_url, self._username, 
+                            self._password, wsdl + 'media.wsdl')


continuation line under-indented for visual indent

houndci-bot · 2017-06-09T21:22:26Z

homeassistant/components/camera/onvif.py

+        device_url = self._base_url + 'onvif/device_service'
+        self._username = config.get(CONF_USERNAME)
+        self._password = config.get(CONF_PASSWORD)
+        media = ONVIFService(device_url, self._username, 


trailing whitespace

fabaff · 2017-06-10T20:49:43Z

You need to rebase your branch and clean-up the requirements.

matt2005 · 2017-06-10T22:49:40Z

rebased and rerun script/gen_requirements_all.py

matt2005 · 2017-06-12T21:02:33Z

rebased again and generated requirements. hopefully it's good to go now.

pvizeli

Looks okay. A small comments

pvizeli · 2017-06-13T15:37:36Z

homeassistant/components/camera/onvif.py

+        _LOGGER.debug("WSDL for %s: %s",
+                      self._name, wsdl)
+        _LOGGER.debug("Login details for %s: %s %s",
+                      self._name, self._username, self._password)


Please cleanup the debugs, it is ok for test but to mutch for the end product.

I've removed the debug logs.

houndci-bot · 2017-06-13T19:00:13Z

homeassistant/components/camera/onvif.py

+                             self._password, wsdl + 'media.wsdl')
+        self._input = media.GetStreamUri().Uri
+        _LOGGER.info("ONVIF Camera Using the following URL for %s: %s",
+                    self._name, self._input)


continuation line under-indented for visual indent

matt2005 · 2017-06-13T19:00:18Z

Removed Debug logging

matt2005 · 2017-06-13T19:45:50Z

Requested changes done

Br3nda · 2017-06-13T22:00:22Z

Most components are using "host" not "input" in the config yml. Is this a relic from it being a ffmpeg input config before? Would host be better?

pvizeli

Need some small cleanups

pvizeli · 2017-06-13T22:33:56Z

homeassistant/components/camera/onvif.py

+DEFAULT_PASSWORD = '888888'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_INPUT): cv.string,


Remove this

pvizeli · 2017-06-13T22:34:18Z

homeassistant/components/camera/onvif.py

+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_INPUT): cv.string,
+    vol.Optional(CONF_EXTRA_ARGUMENTS): cv.string,


Remove this

pvizeli · 2017-06-13T22:35:51Z

homeassistant/components/camera/onvif.py

+
+        self._manager = hass.data[DATA_FFMPEG]
+        self._name = config.get(CONF_NAME)
+        self._input = config.get(CONF_INPUT)


pvizeli · 2017-06-13T22:36:21Z

homeassistant/components/camera/onvif.py

+        self._manager = hass.data[DATA_FFMPEG]
+        self._name = config.get(CONF_NAME)
+        self._input = config.get(CONF_INPUT)
+        self._extra_arguments = config.get(CONF_EXTRA_ARGUMENTS)


pvizeli · 2017-06-13T22:36:41Z

homeassistant/components/camera/onvif.py

+        wsdl = hass.config.config_dir + '/deps/onvif/wsdl/'
+        self._base_url = 'http://{}:{}/'.format(self._input, port)
+        device_url = self._base_url + 'onvif/device_service'
+        self._username = config.get(CONF_USERNAME)


Is not need to store

pvizeli · 2017-06-13T22:36:47Z

homeassistant/components/camera/onvif.py

+        self._base_url = 'http://{}:{}/'.format(self._input, port)
+        device_url = self._base_url + 'onvif/device_service'
+        self._username = config.get(CONF_USERNAME)
+        self._password = config.get(CONF_PASSWORD)


Is not need to store

pvizeli · 2017-06-13T22:37:23Z

homeassistant/components/camera/onvif.py

+        media = ONVIFService(device_url, self._username,
+                             self._password, wsdl + 'media.wsdl')
+        self._input = media.GetStreamUri().Uri
+        _LOGGER.info("ONVIF Camera Using the following URL for %s: %s",


Set this to debug level

houndci-bot · 2017-06-14T21:38:24Z

homeassistant/components/camera/onvif.py

+        """Generate an HTTP MJPEG stream from the camera."""
+        from haffmpeg import CameraMjpeg
+
+        stream = CameraMjpeg(self.hass.data[DATA_FFMPEG].binary, loop=self.hass.loop)


line too long (85 > 79 characters)

houndci-bot · 2017-06-14T21:38:24Z

homeassistant/components/camera/onvif.py

+    def async_camera_image(self):
+        """Return a still image response from the camera."""
+        from haffmpeg import ImageFrame, IMAGE_JPEG
+        ffmpeg = ImageFrame(self.hass.data[DATA_FFMPEG].binary, loop=self.hass.loop)


line too long (84 > 79 characters)

houndci-bot · 2017-06-14T21:38:24Z

homeassistant/components/camera/onvif.py

+
+        self._name = config.get(CONF_NAME)
+        self._ffmpeg_arguments = config.get(CONF_FFMPEG_ARGUMENTS)
+        media = ONVIFService('http://{}:{}/'.format(config.get(CONF_HOST), 


trailing whitespace

houndci-bot · 2017-06-14T21:38:24Z

homeassistant/components/camera/onvif.py

+        super().__init__()
+
+        self._name = config.get(CONF_NAME)
+        self._ffmpeg_arguments = config.get(CONF_FFMPEG_ARGUMENTS)


undefined name 'CONF_FFMPEG_ARGUMENTS'

houndci-bot · 2017-06-14T21:38:24Z

homeassistant/components/camera/onvif.py

+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_HOST): cv.string,
+    vol.Optional(CONF_FFMPEG_ARGUMENTS, default=DEFAULT_FFMPEG_ARGUMENTS): cv.string,


undefined name 'CONF_FFMPEG_ARGUMENTS'
line too long (85 > 79 characters)

houndci-bot · 2017-06-14T21:38:24Z

homeassistant/components/camera/onvif.py

+DEFAULT_PORT = 5000
+DEFAULT_USERNAME = 'admin'
+DEFAULT_PASSWORD = '888888'
+DEFAULT_FFMPEG_ARGUMENTS= '-q:v 2'


missing whitespace around operator

pvizeli · 2017-06-15T09:08:17Z

homeassistant/components/camera/onvif.py

+
+        self._name = config.get(CONF_NAME)
+        self._ffmpeg_arguments = '-q:v 2'
+        media = ONVIFService('http://{}:{}/'.format(config.get(CONF_HOST),


Use the Format pattern for all params, don't mix + and format

andrey-git · 2018-07-02T07:34:10Z

I know I'm a year late to the party, but we shouldn't have added a new non-pip dependency.

I'm going to create homeassistant-specific package for this :(

matt2005 mentioned this pull request Jun 9, 2017

added ONVIF camera home-assistant/home-assistant.io#2794

Merged

homeassistant added the cla-needed label Jun 9, 2017

balloobbot added platform requirement labels Jun 9, 2017

houndci-bot reviewed Jun 9, 2017

View reviewed changes

homeassistant added cla-signed and removed cla-needed labels Jun 9, 2017

houndci-bot reviewed Jun 9, 2017

View reviewed changes

balloobbot added the component label Jun 10, 2017

homeassistant added cla-signed labels Jun 10, 2017

pvizeli requested changes Jun 13, 2017

View reviewed changes

homeassistant added the cla-signed label Jun 13, 2017

houndci-bot reviewed Jun 13, 2017

View reviewed changes

balloobbot removed the component label Jun 13, 2017

pvizeli requested changes Jun 13, 2017

View reviewed changes

homeassistant added the cla-signed label Jun 14, 2017

houndci-bot reviewed Jun 14, 2017

View reviewed changes

homeassistant added the cla-signed label Jun 14, 2017

pvizeli requested changes Jun 15, 2017

View reviewed changes

matt2005 added 2 commits June 15, 2017 22:42

Added ONVIF camera component

3479716

added requirements

df30ac2

matt2005 added 20 commits June 15, 2017 22:42

updated requirements

e77512d

Added ONVIF camera component

f8d2bf3

added requirements

e54d734

corrected long lines

9f3d464

fixed indenting

f9f2695

fixed indenting

bad633a

removed bad whitespace

d50b6a9

updated requirements

215a5a8

fixed pylink error indenting

876dac4

rebased and fixed requirements

3d8e2d3

Removed Debug logging

96bf6ec

Added info logging to show URL being used.

d035bf2

corrected spacing

2b0c0d1

Tidied up and renamed input to host

568cf3e

fixed typo

abb89c5

corrected line lengths

0087206

added default to ffmpeg_arguments

a41970b

removed unecessary ffmpeg arguements

6f5b659

changed to use .format instead of +

3767992

fixed indenting

689a0a9

homeassistant added the cla-signed label Jun 15, 2017

cleanup & make it more readable

457c525

pvizeli approved these changes Jun 15, 2017

View reviewed changes

pvizeli added this to the 0.47 milestone Jun 15, 2017

balloob merged commit 0eaad46 into home-assistant:dev Jun 16, 2017

balloob modified the milestone: 0.47 Jun 16, 2017

balloob mentioned this pull request Jun 16, 2017

0.47 #8055

Merged

home-assistant locked and limited conversation to collaborators Oct 20, 2017

		self._name, self._username, self._password)


		@asyncio.coroutine


		_LOGGER = logging.getLogger(__name__)

		REQUIREMENTS = ['onvif-py3==0.1.3','suds-py3==1.3.3.0','http://github.com/tgaugry/suds-passworddigest-py3/archive/86fc50e39b4d2b8997481967d6a7fe1c57118999.zip#suds-passworddigest-py3==0.1.2a']


		import voluptuous as vol

		from homeassistant.const import (CONF_NAME, CONF_USERNAME, CONF_PASSWORD, CONF_PORT)


		_LOGGER = logging.getLogger(__name__)

		REQUIREMENTS = ['onvif-py3==0.1.3',

Added ONVIF camera component #7979

Added ONVIF camera component #7979

Conversation

matt2005 commented Jun 9, 2017 • edited

Description:

Example entry for configuration.yaml (if applicable):

Checklist:

homeassistant commented Jun 9, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fabaff commented Jun 10, 2017 • edited

matt2005 commented Jun 10, 2017

matt2005 commented Jun 12, 2017

pvizeli left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matt2005 commented Jun 13, 2017

matt2005 commented Jun 13, 2017

Br3nda commented Jun 13, 2017

pvizeli left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andrey-git commented Jul 2, 2018

matt2005 commented Jun 9, 2017 •

edited

Example entry for `configuration.yaml` (if applicable):

fabaff commented Jun 10, 2017 •

edited