add an option to choose betwoon plaintext or html mails
This commit is contained in:
parent
3393fb73e9
commit
e59af132ba
1 changed files with 20 additions and 10 deletions
|
|
@ -37,7 +37,8 @@ class Monboob(BaseApplication):
|
||||||
CONFIG = {'interval': 15,
|
CONFIG = {'interval': 15,
|
||||||
'domain': 'weboob.example.org',
|
'domain': 'weboob.example.org',
|
||||||
'recipient': 'weboob@example.org',
|
'recipient': 'weboob@example.org',
|
||||||
'smtp': 'localhost'}
|
'smtp': 'localhost',
|
||||||
|
'html': False}
|
||||||
|
|
||||||
def main(self, argv):
|
def main(self, argv):
|
||||||
self.load_config()
|
self.load_config()
|
||||||
|
|
@ -54,26 +55,35 @@ class Monboob(BaseApplication):
|
||||||
def process(self):
|
def process(self):
|
||||||
for name, backend in self.weboob.iter_backends():
|
for name, backend in self.weboob.iter_backends():
|
||||||
for message in backend.iter_new_messages():
|
for message in backend.iter_new_messages():
|
||||||
self.send_email(name, message)
|
self.send_email(backend, message)
|
||||||
|
|
||||||
def send_email(self, backend_name, mail):
|
def send_email(self, backend, 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.get_reply_id():
|
if mail.get_reply_id():
|
||||||
reply_id = u'<%s.%s@%s>' % (backend_name, mail.get_full_reply_id(), domain)
|
reply_id = u'<%s.%s@%s>' % (backend.name, mail.get_full_reply_id(), domain)
|
||||||
subject = mail.get_title()
|
subject = mail.get_title()
|
||||||
sender = u'%s <%s@%s>' % (mail.get_from(), backend_name, domain)
|
sender = u'%s <%s@%s>' % (mail.get_from(), backend.name, domain)
|
||||||
|
|
||||||
# assume that get_date() returns an UTC datetime
|
# assume that get_date() returns an UTC datetime
|
||||||
date = time.strftime('%a, %d %b %Y %H:%M:%S +0000', mail.get_date().timetuple())
|
date = time.strftime('%a, %d %b %Y %H:%M:%S +0000', mail.get_date().timetuple())
|
||||||
msg_id = u'<%s.%s@%s>' % (backend_name, mail.get_full_id(), domain)
|
msg_id = u'<%s.%s@%s>' % (backend.name, mail.get_full_id(), domain)
|
||||||
body = html2text(mail.get_content())
|
|
||||||
|
if self.config.get('html'):
|
||||||
|
body = mail.get_content()
|
||||||
|
content_type = 'html'
|
||||||
|
else:
|
||||||
|
body = html2text(mail.get_content())
|
||||||
|
content_type = 'plain'
|
||||||
|
|
||||||
if mail.get_signature():
|
if mail.get_signature():
|
||||||
body += u'\n\n-- \n'
|
if self.config.get('html'):
|
||||||
body += mail.get_signature()
|
body += u'<p>-- <br />%s</p>' % mail.get_signature()
|
||||||
|
else:
|
||||||
|
body += u'\n\n-- \n'
|
||||||
|
body += html2text(mail.get_signature())
|
||||||
|
|
||||||
# Header class is smart enough to try US-ASCII, then the charset we
|
# Header class is smart enough to try US-ASCII, then the charset we
|
||||||
# provide, then fall back to UTF-8.
|
# provide, then fall back to UTF-8.
|
||||||
|
|
@ -102,7 +112,7 @@ class Monboob(BaseApplication):
|
||||||
recipient_addr = recipient_addr.encode('ascii')
|
recipient_addr = recipient_addr.encode('ascii')
|
||||||
|
|
||||||
# Create the message ('plain' stands for Content-Type: text/plain)
|
# Create the message ('plain' stands for Content-Type: text/plain)
|
||||||
msg = MIMEText(body.encode(body_charset), 'plain', body_charset)
|
msg = MIMEText(body.encode(body_charset), content_type, body_charset)
|
||||||
msg['From'] = formataddr((sender_name, sender_addr))
|
msg['From'] = formataddr((sender_name, sender_addr))
|
||||||
msg['To'] = formataddr((recipient_name, recipient_addr))
|
msg['To'] = formataddr((recipient_name, recipient_addr))
|
||||||
msg['Subject'] = Header(unicode(subject), header_charset)
|
msg['Subject'] = Header(unicode(subject), header_charset)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue