nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update send_mail to prepare removing of backend

Browse source
This commit is contained in:
Florent 2014-10-08 16:59:13 +02:00
commit fab37e2533
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
weboob/applications/monboob/monboob.py
View file

@ -242,7 +242,7 @@ class Monboob(ReplApplication):
content += u'\n\t%s\n' % to_unicode(e) content += u'\n\t%s\n' % to_unicode(e)
if logging.root.level <= logging.DEBUG: if logging.root.level <= logging.DEBUG:
content += u'\n%s\n' % to_unicode(get_backtrace(e)) content += u'\n%s\n' % to_unicode(get_backtrace(e))
self.send_email(backend, Message(thread, self.send_email(backend.name, Message(thread,
0, 0,
title='Unable to send message', title='Unable to send message',
sender='Monboob', sender='Monboob',
@ -269,25 +269,25 @@ class Monboob(ReplApplication):
def process(self): def process(self):
try: try:
for backend, message in self.weboob.do('iter_unread_messages'): for backend, message in self.weboob.do('iter_unread_messages'):
if self.send_email(backend, message): if self.send_email(message.backend, message):
backend.set_message_read(message) backend.set_message_read(message)
except CallErrors as e: except CallErrors as e:
self.bcall_errors_handler(e) self.bcall_errors_handler(e)
def send_email(self, backend, mail): def send_email(self, backend_name, mail):
domain = self.config.get('domain') domain = self.config.get('domain')
recipient = self.config.get('recipient') recipient = self.config.get('recipient')
reply_id = '' reply_id = ''
if mail.parent: if mail.parent:
reply_id = u'<%s.%s@%s>' % (backend.name, mail.parent.full_id, domain) reply_id = u'<%s.%s@%s>' % (backend_name, mail.parent.full_id, domain)
subject = mail.title subject = mail.title
sender = u'"%s" <%s@%s>' % (mail.sender.replace('"', '""') if mail.sender else '', sender = u'"%s" <%s@%s>' % (mail.sender.replace('"', '""') if mail.sender else '',
backend.name, domain) backend_name, domain)
# assume that .date is an UTC datetime # assume that .date is an UTC datetime
date = formatdate(time.mktime(utc2local(mail.date).timetuple()), localtime=True) date = formatdate(time.mktime(utc2local(mail.date).timetuple()), localtime=True)
msg_id = u'<%s.%s@%s>' % (backend.name, mail.full_id, domain) msg_id = u'<%s.%s@%s>' % (backend_name, mail.full_id, domain)
if self.config.get('html') and mail.flags & mail.IS_HTML: if self.config.get('html') and mail.flags & mail.IS_HTML:
body = mail.content body = mail.content