Update Vivotek camera component (#30191)

- Bump libpyvivotek version to 0.4.0
- Add digest authentication
This commit is contained in:
Kevin McCormack 2019-12-25 05:45:49 -05:00 committed by Martin Hjelmare
parent 89450f405c
commit f56797e413
3 changed files with 9 additions and 2 deletions

View File

@ -7,12 +7,15 @@ import voluptuous as vol
from homeassistant.components.camera import PLATFORM_SCHEMA, SUPPORT_STREAM, Camera from homeassistant.components.camera import PLATFORM_SCHEMA, SUPPORT_STREAM, Camera
from homeassistant.const import ( from homeassistant.const import (
CONF_AUTHENTICATION,
CONF_IP_ADDRESS, CONF_IP_ADDRESS,
CONF_NAME, CONF_NAME,
CONF_PASSWORD, CONF_PASSWORD,
CONF_SSL, CONF_SSL,
CONF_USERNAME, CONF_USERNAME,
CONF_VERIFY_SSL, CONF_VERIFY_SSL,
HTTP_BASIC_AUTHENTICATION,
HTTP_DIGEST_AUTHENTICATION,
) )
from homeassistant.helpers import config_validation as cv from homeassistant.helpers import config_validation as cv
@ -34,6 +37,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Required(CONF_PASSWORD): cv.string, vol.Required(CONF_PASSWORD): cv.string,
vol.Required(CONF_USERNAME): cv.string, vol.Required(CONF_USERNAME): cv.string,
vol.Optional(CONF_AUTHENTICATION, default=HTTP_BASIC_AUTHENTICATION): vol.In(
[HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION]
),
vol.Optional(CONF_SSL, default=False): cv.boolean, vol.Optional(CONF_SSL, default=False): cv.boolean,
vol.Optional(CONF_VERIFY_SSL, default=True): cv.boolean, vol.Optional(CONF_VERIFY_SSL, default=True): cv.boolean,
vol.Optional(CONF_FRAMERATE, default=2): cv.positive_int, vol.Optional(CONF_FRAMERATE, default=2): cv.positive_int,
@ -54,6 +60,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
verify_ssl=config[CONF_VERIFY_SSL], verify_ssl=config[CONF_VERIFY_SSL],
usr=config[CONF_USERNAME], usr=config[CONF_USERNAME],
pwd=config[CONF_PASSWORD], pwd=config[CONF_PASSWORD],
digest_auth=config[CONF_AUTHENTICATION] == HTTP_DIGEST_AUTHENTICATION,
sec_lvl=config[CONF_SECURITY_LEVEL], sec_lvl=config[CONF_SECURITY_LEVEL],
), ),
stream_source=f"rtsp://{creds}@{config[CONF_IP_ADDRESS]}:554/{config[CONF_STREAM_PATH]}", stream_source=f"rtsp://{creds}@{config[CONF_IP_ADDRESS]}:554/{config[CONF_STREAM_PATH]}",

View File

@ -3,7 +3,7 @@
"name": "Vivotek", "name": "Vivotek",
"documentation": "https://www.home-assistant.io/integrations/vivotek", "documentation": "https://www.home-assistant.io/integrations/vivotek",
"requirements": [ "requirements": [
"libpyvivotek==0.3.1" "libpyvivotek==0.4.0"
], ],
"dependencies": [], "dependencies": [],
"codeowners": [ "codeowners": [

View File

@ -762,7 +762,7 @@ libpurecool==0.5.0
libpyfoscam==1.0 libpyfoscam==1.0
# homeassistant.components.vivotek # homeassistant.components.vivotek
libpyvivotek==0.3.1 libpyvivotek==0.4.0
# homeassistant.components.mikrotik # homeassistant.components.mikrotik
librouteros==2.3.0 librouteros==2.3.0