jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 19:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade pydroid-ipcam to 0.7 (#6772)

Browse Source
This commit is contained in:
Fabian Affolter 2017-03-24 21:42:00 +01:00 committed by Pascal Vizeli
parent 06d3889e1b
commit 1be2706de3
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
homeassistant/components/android_ip_webcam.py
View File

@ -26,17 +26,24 @@ from homeassistant.util.dt import utcnow
from homeassistant.components.camera.mjpeg import ( from homeassistant.components.camera.mjpeg import (
CONF_MJPEG_URL, CONF_STILL_IMAGE_URL) CONF_MJPEG_URL, CONF_STILL_IMAGE_URL)
DOMAIN = 'android_ip_webcam' REQUIREMENTS = ['pydroid-ipcam==0.7']
REQUIREMENTS = ["pydroid-ipcam==0.6"]
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
SCAN_INTERVAL = timedelta(seconds=10)
DATA_IP_WEBCAM = 'android_ip_webcam'
ATTR_AUD_CONNS = 'Audio Connections'
ATTR_HOST = 'host' ATTR_HOST = 'host'
ATTR_VID_CONNS = 'Video Connections' ATTR_VID_CONNS = 'Video Connections'
ATTR_AUD_CONNS = 'Audio Connections'
CONF_MOTION_SENSOR = 'motion_sensor'
DATA_IP_WEBCAM = 'android_ip_webcam'
DEFAULT_NAME = 'IP Webcam'
DEFAULT_PORT = 8080
DEFAULT_TIMEOUT = 10
DOMAIN = 'android_ip_webcam'
SCAN_INTERVAL = timedelta(seconds=10)
SIGNAL_UPDATE_DATA = 'android_ip_webcam_update'
KEY_MAP = { KEY_MAP = {
'audio_connections': 'Audio Connections', 'audio_connections': 'Audio Connections',
@ -123,15 +130,6 @@ SENSORS = ['audio_connections', 'battery_level', 'battery_temp',
'battery_voltage', 'light', 'motion', 'pressure', 'proximity', 'battery_voltage', 'light', 'motion', 'pressure', 'proximity',
'sound', 'video_connections'] 'sound', 'video_connections']
SIGNAL_UPDATE_DATA = 'android_ip_webcam_update'
CONF_MOTION_SENSOR = 'motion_sensor'
DEFAULT_NAME = 'IP Webcam'
DEFAULT_PORT = 8080
DEFAULT_TIMEOUT = 10
CONFIG_SCHEMA = vol.Schema({ CONFIG_SCHEMA = vol.Schema({
DOMAIN: vol.All(cv.ensure_list, [vol.Schema({ DOMAIN: vol.All(cv.ensure_list, [vol.Schema({
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
@ -161,7 +159,7 @@ def async_setup(hass, config):
@asyncio.coroutine @asyncio.coroutine
def async_setup_ipcamera(cam_config): def async_setup_ipcamera(cam_config):
"""Setup a ip camera.""" """Set up an IP camera."""
host = cam_config[CONF_HOST] host = cam_config[CONF_HOST]
username = cam_config.get(CONF_USERNAME) username = cam_config.get(CONF_USERNAME)
password = cam_config.get(CONF_PASSWORD) password = cam_config.get(CONF_PASSWORD)
@ -171,7 +169,7 @@ def async_setup(hass, config):
sensors = cam_config[CONF_SENSORS] sensors = cam_config[CONF_SENSORS]
motion = cam_config[CONF_MOTION_SENSOR] motion = cam_config[CONF_MOTION_SENSOR]
# init ip webcam # Init ip webcam
cam = PyDroidIPCam( cam = PyDroidIPCam(
hass.loop, websession, host, cam_config[CONF_PORT], hass.loop, websession, host, cam_config[CONF_PORT],
username=username, password=password, username=username, password=password,
@ -192,7 +190,7 @@ def async_setup(hass, config):
@asyncio.coroutine @asyncio.coroutine
def async_update_data(now): def async_update_data(now):
"""Update data from ipcam in SCAN_INTERVAL.""" """Update data from IP camera in SCAN_INTERVAL."""
yield from cam.update() yield from cam.update()
async_dispatcher_send(hass, SIGNAL_UPDATE_DATA, host) async_dispatcher_send(hass, SIGNAL_UPDATE_DATA, host)
@ -201,7 +199,7 @@ def async_setup(hass, config):
yield from async_update_data(None) yield from async_update_data(None)
# load platforms # Load platforms
webcams[host] = cam webcams[host] = cam
mjpeg_camera = { mjpeg_camera = {

2
requirements_all.txt
View File

@ -490,7 +490,7 @@ pycmus==0.1.0
pydispatcher==2.0.5 pydispatcher==2.0.5
# homeassistant.components.android_ip_webcam # homeassistant.components.android_ip_webcam
pydroid-ipcam==0.6 pydroid-ipcam==0.7
# homeassistant.components.sensor.ebox # homeassistant.components.sensor.ebox
pyebox==0.1.0 pyebox==0.1.0