Merge pull request #1370 from ZyX-I/improve-imap-segment

Add support for non-SSL IMAP4 connections
This commit is contained in:
Nikolai Aleksandrovich Pavlov 2015-05-29 22:10:34 +03:00
commit a09f1e1776
1 changed files with 18 additions and 14 deletions

View File

@ -3,36 +3,37 @@ from __future__ import (unicode_literals, division, absolute_import, print_funct
import re
from imaplib import IMAP4_SSL_PORT, IMAP4_SSL, IMAP4
from collections import namedtuple
from powerline.lib.threaded import KwThreadedSegment
from powerline.segments import with_docstring
_IMAPKey = namedtuple('Key', 'username password server port folder')
_IMAPKey = namedtuple('Key', 'username password server port folder use_ssl')
class EmailIMAPSegment(KwThreadedSegment):
interval = 60
@staticmethod
def key(username, password, server='imap.gmail.com', port=993, folder='INBOX', **kwargs):
return _IMAPKey(username, password, server, port, folder)
def key(username, password, server='imap.gmail.com', port=IMAP4_SSL_PORT, folder='INBOX', use_ssl=None, **kwargs):
if use_ssl is None:
use_ssl = (port == IMAP4_SSL_PORT)
return _IMAPKey(username, password, server, port, folder, use_ssl)
def compute_state(self, key):
if not key.username or not key.password:
self.warn('Username and password are not configured')
return None
try:
import imaplib
except imaplib.IMAP4.error as e:
unread_count = str(e)
if key.use_ssl:
mail = IMAP4_SSL(key.server, key.port)
else:
mail = imaplib.IMAP4_SSL(key.server, key.port)
mail.login(key.username, key.password)
rc, message = mail.status(key.folder, '(UNSEEN)')
unread_str = message[0].decode('utf-8')
unread_count = int(re.search('UNSEEN (\d+)', unread_str).group(1))
mail = IMAP4(key.server, key.port)
mail.login(key.username, key.password)
rc, message = mail.status(key.folder, '(UNSEEN)')
unread_str = message[0].decode('utf-8')
unread_count = int(re.search('UNSEEN (\d+)', unread_str).group(1))
return unread_count
@staticmethod
@ -53,7 +54,7 @@ class EmailIMAPSegment(KwThreadedSegment):
email_imap_alert = with_docstring(EmailIMAPSegment(),
'''Return unread e-mail count for IMAP servers.
('''Return unread e-mail count for IMAP servers.
:param str username:
login username
@ -69,6 +70,9 @@ email_imap_alert = with_docstring(EmailIMAPSegment(),
Maximum number of messages. If there are more messages then max_msgs then it
will use gradient level equal to 100, otherwise gradient level is equal to
``100 * msgs_num / max_msgs``. If not present gradient is not computed.
:param bool use_ssl:
If ``True`` then use SSL connection. If ``False`` then do not use it.
Default is ``True`` if port is equal to {ssl_port} and ``False`` otherwise.
Highlight groups used: ``email_alert_gradient`` (gradient), ``email_alert``.
''')
''').format(ssl_port=IMAP4_SSL_PORT))