evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move imports in canary component (#27874)

Browse source
This commit is contained in:
bouni 2019-10-19 01:01:59 +02:00 • committed by cgtobi
parent dc5d38128c
commit d78f14b20a
3 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
homeassistant/components/canary/__init__.py
View file

@ -1,13 +1,14 @@
"""Support for Canary devices.""" """Support for Canary devices."""
import logging
from datetime import timedelta from datetime import timedelta
import logging
import voluptuous as vol from canary.api import Api
from requests import ConnectTimeout, HTTPError from requests import ConnectTimeout, HTTPError
import voluptuous as vol
import homeassistant.helpers.config_validation as cv from homeassistant.const import CONF_PASSWORD, CONF_TIMEOUT, CONF_USERNAME
from homeassistant.const import CONF_USERNAME, CONF_PASSWORD, CONF_TIMEOUT
from homeassistant.helpers import discovery from homeassistant.helpers import discovery
import homeassistant.helpers.config_validation as cv
from homeassistant.util import Throttle from homeassistant.util import Throttle
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -67,7 +68,6 @@ class CanaryData:
def __init__(self, username, password, timeout): def __init__(self, username, password, timeout):
"""Init the Canary data object.""" """Init the Canary data object."""
from canary.api import Api
self._api = Api(username, password, timeout) self._api = Api(username, password, timeout)

10
homeassistant/components/canary/alarm_control_panel.py
View file

@ -1,6 +1,8 @@
"""Support for Canary alarm.""" """Support for Canary alarm."""
import logging import logging
from canary.api import LOCATION_MODE_AWAY, LOCATION_MODE_HOME, LOCATION_MODE_NIGHT
from homeassistant.components.alarm_control_panel import AlarmControlPanel from homeassistant.components.alarm_control_panel import AlarmControlPanel
from homeassistant.const import ( from homeassistant.const import (
STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_AWAY,
@ -42,11 +44,6 @@ class CanaryAlarm(AlarmControlPanel):
@property @property
def state(self): def state(self):
"""Return the state of the device.""" """Return the state of the device."""
from canary.api import (
LOCATION_MODE_AWAY,
LOCATION_MODE_HOME,
LOCATION_MODE_NIGHT,
)
location = self._data.get_location(self._location_id) location = self._data.get_location(self._location_id)
@ -75,18 +72,15 @@ class CanaryAlarm(AlarmControlPanel):
def alarm_arm_home(self, code=None): def alarm_arm_home(self, code=None):
"""Send arm home command.""" """Send arm home command."""
from canary.api import LOCATION_MODE_HOME
self._data.set_location_mode(self._location_id, LOCATION_MODE_HOME) self._data.set_location_mode(self._location_id, LOCATION_MODE_HOME)
def alarm_arm_away(self, code=None): def alarm_arm_away(self, code=None):
"""Send arm away command.""" """Send arm away command."""
from canary.api import LOCATION_MODE_AWAY
self._data.set_location_mode(self._location_id, LOCATION_MODE_AWAY) self._data.set_location_mode(self._location_id, LOCATION_MODE_AWAY)
def alarm_arm_night(self, code=None): def alarm_arm_night(self, code=None):
"""Send arm night command.""" """Send arm night command."""
from canary.api import LOCATION_MODE_NIGHT
self._data.set_location_mode(self._location_id, LOCATION_MODE_NIGHT) self._data.set_location_mode(self._location_id, LOCATION_MODE_NIGHT)

6
homeassistant/components/canary/camera.py
View file

@ -3,6 +3,8 @@ import asyncio
from datetime import timedelta from datetime import timedelta
import logging import logging
from haffmpeg.camera import CameraMjpeg
from haffmpeg.tools import IMAGE_JPEG, ImageFrame
import voluptuous as vol import voluptuous as vol
from homeassistant.components.camera import PLATFORM_SCHEMA, Camera from homeassistant.components.camera import PLATFORM_SCHEMA, Camera
@ -81,8 +83,6 @@ class CanaryCamera(Camera):
"""Return a still image response from the camera.""" """Return a still image response from the camera."""
self.renew_live_stream_session() self.renew_live_stream_session()
from haffmpeg.tools import ImageFrame, IMAGE_JPEG
ffmpeg = ImageFrame(self._ffmpeg.binary, loop=self.hass.loop) ffmpeg = ImageFrame(self._ffmpeg.binary, loop=self.hass.loop)
image = await asyncio.shield( image = await asyncio.shield(
ffmpeg.get_image( ffmpeg.get_image(
@ -98,8 +98,6 @@ class CanaryCamera(Camera):
if self._live_stream_session is None: if self._live_stream_session is None:
return return
from haffmpeg.camera import CameraMjpeg
stream = CameraMjpeg(self._ffmpeg.binary, loop=self.hass.loop) stream = CameraMjpeg(self._ffmpeg.binary, loop=self.hass.loop)
await stream.open_camera( await stream.open_camera(
self._live_stream_session.live_stream_url, extra_cmd=self._ffmpeg_arguments self._live_stream_session.live_stream_url, extra_cmd=self._ffmpeg_arguments