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

Bump amcrest version and refactored to simplify code (#5499)

Browse Source 
* Bumped version to Amcrest 1.1.3 and rebase self.base_url()

* Refactored amcrest camera and amcrest sensor to simply object reference
This commit is contained in:
Marcelo Moreira de Mello 2017-01-22 08:22:25 -05:00 committed by Pascal Vizeli
parent 59b0491d29
commit ab19577322
3 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
homeassistant/components/camera/amcrest.py
View File

@ -18,7 +18,7 @@ from homeassistant.helpers import config_validation as cv
from homeassistant.helpers.aiohttp_client import ( from homeassistant.helpers.aiohttp_client import (
async_get_clientsession, async_aiohttp_proxy_stream) async_get_clientsession, async_aiohttp_proxy_stream)
REQUIREMENTS = ['amcrest==1.1.0'] REQUIREMENTS = ['amcrest==1.1.3']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -62,13 +62,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
def setup_platform(hass, config, add_devices, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
"""Set up an Amcrest IP Camera.""" """Set up an Amcrest IP Camera."""
from amcrest import AmcrestCamera from amcrest import AmcrestCamera
data = AmcrestCamera( camera = AmcrestCamera(
config.get(CONF_HOST), config.get(CONF_PORT), config.get(CONF_HOST), config.get(CONF_PORT),
config.get(CONF_USERNAME), config.get(CONF_PASSWORD)) config.get(CONF_USERNAME), config.get(CONF_PASSWORD)).camera
persistent_notification = loader.get_component('persistent_notification') persistent_notification = loader.get_component('persistent_notification')
try: try:
data.camera.current_time camera.current_time
# pylint: disable=broad-except # pylint: disable=broad-except
except Exception as ex: except Exception as ex:
_LOGGER.error("Unable to connect to Amcrest camera: %s", str(ex)) _LOGGER.error("Unable to connect to Amcrest camera: %s", str(ex))
@ -80,22 +80,18 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
notification_id=NOTIFICATION_ID) notification_id=NOTIFICATION_ID)
return False return False
add_devices([AmcrestCam(hass, config, data)]) add_devices([AmcrestCam(hass, config, camera)])
return True return True
class AmcrestCam(Camera): class AmcrestCam(Camera):
"""An implementation of an Amcrest IP camera.""" """An implementation of an Amcrest IP camera."""
def __init__(self, hass, device_info, data): def __init__(self, hass, device_info, camera):
"""Initialize an Amcrest camera.""" """Initialize an Amcrest camera."""
super(AmcrestCam, self).__init__() super(AmcrestCam, self).__init__()
self._base_url = '%s://%s:%s/cgi-bin' % ( self._camera = camera
'http', self._base_url = self._camera.get_base_url()
device_info.get(CONF_HOST),
device_info.get(CONF_PORT)
)
self._data = data
self._hass = hass self._hass = hass
self._name = device_info.get(CONF_NAME) self._name = device_info.get(CONF_NAME)
self._resolution = RESOLUTION_LIST[device_info.get(CONF_RESOLUTION)] self._resolution = RESOLUTION_LIST[device_info.get(CONF_RESOLUTION)]
@ -110,7 +106,7 @@ class AmcrestCam(Camera):
def camera_image(self): def camera_image(self):
"""Return a still image reponse from the camera.""" """Return a still image reponse from the camera."""
# Send the request to snap a picture and return raw jpg data # Send the request to snap a picture and return raw jpg data
response = self._data.camera.snapshot(channel=self._resolution) response = self._camera.snapshot(channel=self._resolution)
return response.data return response.data
@asyncio.coroutine @asyncio.coroutine
@ -123,10 +119,8 @@ class AmcrestCam(Camera):
# Otherwise, stream an MJPEG image stream directly from the camera # Otherwise, stream an MJPEG image stream directly from the camera
websession = async_get_clientsession(self.hass) websession = async_get_clientsession(self.hass)
streaming_url = '%s/mjpg/video.cgi?channel=0&subtype=%d' % ( streaming_url = '{0}mjpg/video.cgi?channel=0&subtype={1}'.format(
self._base_url, self._base_url, self._resolution)
self._resolution
)
stream_coro = websession.get( stream_coro = websession.get(
streaming_url, auth=self._token, timeout=TIMEOUT) streaming_url, auth=self._token, timeout=TIMEOUT)

30
homeassistant/components/sensor/amcrest.py
View File

@ -20,7 +20,7 @@ import homeassistant.loader as loader
from requests.exceptions import HTTPError, ConnectTimeout from requests.exceptions import HTTPError, ConnectTimeout
REQUIREMENTS = ['amcrest==1.1.0'] REQUIREMENTS = ['amcrest==1.1.3']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -55,13 +55,13 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
"""Set up a sensor for an Amcrest IP Camera.""" """Set up a sensor for an Amcrest IP Camera."""
from amcrest import AmcrestCamera from amcrest import AmcrestCamera
data = AmcrestCamera( camera = AmcrestCamera(
config.get(CONF_HOST), config.get(CONF_PORT), config.get(CONF_HOST), config.get(CONF_PORT),
config.get(CONF_USERNAME), config.get(CONF_PASSWORD)) config.get(CONF_USERNAME), config.get(CONF_PASSWORD)).camera
persistent_notification = loader.get_component('persistent_notification') persistent_notification = loader.get_component('persistent_notification')
try: try:
data.camera.current_time camera.current_time
except (ConnectTimeout, HTTPError) as ex: except (ConnectTimeout, HTTPError) as ex:
_LOGGER.error("Unable to connect to Amcrest camera: %s", str(ex)) _LOGGER.error("Unable to connect to Amcrest camera: %s", str(ex))
persistent_notification.create( persistent_notification.create(
@ -74,7 +74,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
sensors = [] sensors = []
for sensor_type in config.get(CONF_MONITORED_CONDITIONS): for sensor_type in config.get(CONF_MONITORED_CONDITIONS):
sensors.append(AmcrestSensor(config, data, sensor_type)) sensors.append(AmcrestSensor(config, camera, sensor_type))
add_devices(sensors, True) add_devices(sensors, True)
@ -84,11 +84,11 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
class AmcrestSensor(Entity): class AmcrestSensor(Entity):
"""A sensor implementation for Amcrest IP camera.""" """A sensor implementation for Amcrest IP camera."""
def __init__(self, device_info, data, sensor_type): def __init__(self, device_info, camera, sensor_type):
"""Initialize a sensor for Amcrest camera.""" """Initialize a sensor for Amcrest camera."""
super(AmcrestSensor, self).__init__() super(AmcrestSensor, self).__init__()
self._attrs = {} self._attrs = {}
self._data = data self._camera = camera
self._sensor_type = sensor_type self._sensor_type = sensor_type
self._name = '{0}_{1}'.format(device_info.get(CONF_NAME), self._name = '{0}_{1}'.format(device_info.get(CONF_NAME),
SENSOR_TYPES.get(self._sensor_type)[0]) SENSOR_TYPES.get(self._sensor_type)[0])
@ -122,21 +122,21 @@ class AmcrestSensor(Entity):
def update(self): def update(self):
"""Get the latest data and updates the state.""" """Get the latest data and updates the state."""
version, build_date = self._data.camera.software_information version, build_date = self._camera.software_information
self._attrs['Build Date'] = build_date.split('=')[-1] self._attrs['Build Date'] = build_date.split('=')[-1]
self._attrs['Serial Number'] = self._data.camera.serial_number self._attrs['Serial Number'] = self._camera.serial_number
self._attrs['Version'] = version.split('=')[-1] self._attrs['Version'] = version.split('=')[-1]
if self._sensor_type == 'motion_detector': if self._sensor_type == 'motion_detector':
self._state = self._data.camera.is_motion_detected self._state = self._camera.is_motion_detected
self._attrs['Record Mode'] = self._data.camera.record_mode self._attrs['Record Mode'] = self._camera.record_mode
elif self._sensor_type == 'ptz_preset': elif self._sensor_type == 'ptz_preset':
self._state = self._data.camera.ptz_presets_count self._state = self._camera.ptz_presets_count
elif self._sensor_type == 'sdcard': elif self._sensor_type == 'sdcard':
sd_used = self._data.camera.storage_used sd_used = self._camera.storage_used
sd_total = self._data.camera.storage_total sd_total = self._camera.storage_total
self._attrs['Total'] = '{0} {1}'.format(*sd_total) self._attrs['Total'] = '{0} {1}'.format(*sd_total)
self._attrs['Used'] = '{0} {1}'.format(*sd_used) self._attrs['Used'] = '{0} {1}'.format(*sd_used)
self._state = self._data.camera.percent(sd_used[0], sd_total[0]) self._state = self._camera.percent(sd_used[0], sd_total[0])

2
requirements_all.txt
View File

@ -38,7 +38,7 @@ aiohttp_cors==0.5.0
# homeassistant.components.camera.amcrest # homeassistant.components.camera.amcrest
# homeassistant.components.sensor.amcrest # homeassistant.components.sensor.amcrest
amcrest==1.1.0 amcrest==1.1.3
# homeassistant.components.media_player.anthemav # homeassistant.components.media_player.anthemav
anthemav==1.1.7 anthemav==1.1.7