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

Update Yi platform to make use of async/await (#12713)

Browse Source
This commit is contained in:
Aaron Bach 2018-02-27 19:06:45 -07:00 committed by Paulus Schoutsen
parent bba1e2adc9
commit c5157c1027
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
homeassistant/components/camera/yi.py
View File

@ -38,8 +38,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
}) })
@asyncio.coroutine async def async_setup_platform(hass,
def async_setup_platform(hass, config, async_add_devices, discovery_info=None): config,
async_add_devices,
discovery_info=None):
"""Set up a Yi Camera.""" """Set up a Yi Camera."""
_LOGGER.debug('Received configuration: %s', config) _LOGGER.debug('Received configuration: %s', config)
async_add_devices([YiCamera(hass, config)], True) async_add_devices([YiCamera(hass, config)], True)
@ -107,31 +109,29 @@ class YiCamera(Camera):
self.user, self.passwd, self.host, self.port, self.path, self.user, self.passwd, self.host, self.port, self.path,
latest_dir, videos[-1]) latest_dir, videos[-1])
@asyncio.coroutine async def async_camera_image(self):
def async_camera_image(self):
"""Return a still image response from the camera.""" """Return a still image response from the camera."""
from haffmpeg import ImageFrame, IMAGE_JPEG from haffmpeg import ImageFrame, IMAGE_JPEG
url = yield from self.hass.async_add_job(self.get_latest_video_url) url = await self.hass.async_add_job(self.get_latest_video_url)
if url != self._last_url: if url != self._last_url:
ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop) ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop)
self._last_image = yield from asyncio.shield(ffmpeg.get_image( self._last_image = await asyncio.shield(ffmpeg.get_image(
url, output_format=IMAGE_JPEG, url, output_format=IMAGE_JPEG,
extra_cmd=self._extra_arguments), loop=self.hass.loop) extra_cmd=self._extra_arguments), loop=self.hass.loop)
self._last_url = url self._last_url = url
return self._last_image return self._last_image
@asyncio.coroutine async def handle_async_mjpeg_stream(self, request):
def handle_async_mjpeg_stream(self, request):
"""Generate an HTTP MJPEG stream from the camera.""" """Generate an HTTP MJPEG stream from the camera."""
from haffmpeg import CameraMjpeg from haffmpeg import CameraMjpeg
stream = CameraMjpeg(self._manager.binary, loop=self.hass.loop) stream = CameraMjpeg(self._manager.binary, loop=self.hass.loop)
yield from stream.open_camera( await stream.open_camera(
self._last_url, extra_cmd=self._extra_arguments) self._last_url, extra_cmd=self._extra_arguments)
yield from async_aiohttp_proxy_stream( await async_aiohttp_proxy_stream(
self.hass, request, stream, self.hass, request, stream,
'multipart/x-mixed-replace;boundary=ffserver') 'multipart/x-mixed-replace;boundary=ffserver')
yield from stream.close() await stream.close()