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

IMAP sensor async/await conversion (#12988)

Browse Source
This commit is contained in:
Anders Melchiorsen 2018-03-08 21:30:50 +01:00 committed by GitHub
parent 5dd0193ba6
commit 8792fd22b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
homeassistant/components/sensor/imap.py
View File

@ -39,8 +39,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 the IMAP platform.""" """Set up the IMAP platform."""
sensor = ImapSensor(config.get(CONF_NAME), sensor = ImapSensor(config.get(CONF_NAME),
config.get(CONF_USERNAME), config.get(CONF_USERNAME),
@ -48,8 +50,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
config.get(CONF_SERVER), config.get(CONF_SERVER),
config.get(CONF_PORT), config.get(CONF_PORT),
config.get(CONF_FOLDER)) config.get(CONF_FOLDER))
if not await sensor.connection():
if not (yield from sensor.connection()):
raise PlatformNotReady raise PlatformNotReady
hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, sensor.shutdown()) hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, sensor.shutdown())
@ -72,8 +73,7 @@ class ImapSensor(Entity):
self._does_push = None self._does_push = None
self._idle_loop_task = None self._idle_loop_task = None
@asyncio.coroutine async def async_added_to_hass(self):
def async_added_to_hass(self):
"""Handle when an entity is about to be added to Home Assistant.""" """Handle when an entity is about to be added to Home Assistant."""
if not self.should_poll: if not self.should_poll:
self._idle_loop_task = self.hass.loop.create_task(self.idle_loop()) self._idle_loop_task = self.hass.loop.create_task(self.idle_loop())
@ -103,8 +103,7 @@ class ImapSensor(Entity):
"""Return if polling is needed.""" """Return if polling is needed."""
return not self._does_push return not self._does_push
@asyncio.coroutine async def connection(self):
def connection(self):
"""Return a connection to the server, establishing it if necessary.""" """Return a connection to the server, establishing it if necessary."""
import aioimaplib import aioimaplib
@ -112,53 +111,50 @@ class ImapSensor(Entity):
try: try:
self._connection = aioimaplib.IMAP4_SSL( self._connection = aioimaplib.IMAP4_SSL(
self._server, self._port) self._server, self._port)
yield from self._connection.wait_hello_from_server() await self._connection.wait_hello_from_server()
yield from self._connection.login(self._user, self._password) await self._connection.login(self._user, self._password)
yield from self._connection.select(self._folder) await self._connection.select(self._folder)
self._does_push = self._connection.has_capability('IDLE') self._does_push = self._connection.has_capability('IDLE')
except (aioimaplib.AioImapException, asyncio.TimeoutError): except (aioimaplib.AioImapException, asyncio.TimeoutError):
self._connection = None self._connection = None
return self._connection return self._connection
@asyncio.coroutine async def idle_loop(self):
def idle_loop(self):
"""Wait for data pushed from server.""" """Wait for data pushed from server."""
import aioimaplib import aioimaplib
while True: while True:
try: try:
if (yield from self.connection()): if await self.connection():
yield from self.refresh_unread_count() await self.refresh_unread_count()
yield from self.async_update_ha_state() await self.async_update_ha_state()
idle = yield from self._connection.idle_start() idle = await self._connection.idle_start()
yield from self._connection.wait_server_push() await self._connection.wait_server_push()
self._connection.idle_done() self._connection.idle_done()
with async_timeout.timeout(10): with async_timeout.timeout(10):
yield from idle await idle
else: else:
yield from self.async_update_ha_state() await self.async_update_ha_state()
except (aioimaplib.AioImapException, asyncio.TimeoutError): except (aioimaplib.AioImapException, asyncio.TimeoutError):
self.disconnected() self.disconnected()
@asyncio.coroutine async def async_update(self):
def async_update(self):
"""Periodic polling of state.""" """Periodic polling of state."""
import aioimaplib import aioimaplib
try: try:
if (yield from self.connection()): if await self.connection():
yield from self.refresh_unread_count() await self.refresh_unread_count()
except (aioimaplib.AioImapException, asyncio.TimeoutError): except (aioimaplib.AioImapException, asyncio.TimeoutError):
self.disconnected() self.disconnected()
@asyncio.coroutine async def refresh_unread_count(self):
def refresh_unread_count(self):
"""Check the number of unread emails.""" """Check the number of unread emails."""
if self._connection: if self._connection:
yield from self._connection.noop() await self._connection.noop()
_, lines = yield from self._connection.search('UnSeen UnDeleted') _, lines = await self._connection.search('UnSeen UnDeleted')
self._unread_count = len(lines[0].split()) self._unread_count = len(lines[0].split())
def disconnected(self): def disconnected(self):
@ -166,12 +162,11 @@ class ImapSensor(Entity):
_LOGGER.warning("Lost %s (will attempt to reconnect)", self._server) _LOGGER.warning("Lost %s (will attempt to reconnect)", self._server)
self._connection = None self._connection = None
@asyncio.coroutine async def shutdown(self):
def shutdown(self):
"""Close resources.""" """Close resources."""
if self._connection: if self._connection:
if self._connection.has_pending_idle(): if self._connection.has_pending_idle():
self._connection.idle_done() self._connection.idle_done()
yield from self._connection.logout() await self._connection.logout()
if self._idle_loop_task: if self._idle_loop_task:
self._idle_loop_task.cancel() self._idle_loop_task.cancel()