From 3fad42b73d9dcbc67f0cff34f86fbfd136fb46d9 Mon Sep 17 00:00:00 2001
From: Jaume Florez <jflorez@gisce.net>
Date: Wed, 29 Aug 2018 10:16:10 +0200
Subject: [PATCH] Use Qreu to parse email values

---
 poweremail_core.py | 52 ++++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/poweremail_core.py b/poweremail_core.py
index 22e2598..b9a6d7b 100644
--- a/poweremail_core.py
+++ b/poweremail_core.py
@@ -732,29 +732,28 @@ def save_fullmail(self, cr, uid, mail, coreaccountid, serv_ref, context=None):
                 cr, uid, coreaccountid, ['last_mail_id'])['last_mail_id']
             self.write(cr, uid, coreaccountid, {'last_mail_id': last_mail_id+1})
             return False
-        #TODO:If multipart save attachments and save ids
+        # Use Qreu to parse email data (headers and text)
+        parsed = Email.parse(mail.as_string())
+        parsed_mail = self.get_payloads(parsed)
         vals = {
-            'pem_from':self.decode_header_text(mail['From']),
-            'pem_to':self.decode_header_text(mail['To']),
-            'pem_cc':self.decode_header_text(mail['cc']),
-            'pem_bcc':self.decode_header_text(mail['bcc']),
+            'pem_from': parsed.from_.address,
+            'pem_to': ','.join(parsed.to),
+            'pem_cc': ','.join(parsed.cc),
+            'pem_bcc': ','.join(parsed.bcc),
             'pem_recd':mail['date'],
             'date_mail':self.extracttime(
                             mail['date']
                                 ) or time.strftime("%Y-%m-%d %H:%M:%S"),
-            'pem_subject':self.decode_header_text(mail['subject']),
+            'pem_subject': parsed.subject,
             'server_ref':serv_ref,
             'folder':'inbox',
             'state':context.get('state', 'unread'),
-            'pem_body_text':'Mail not downloaded...', #TODO:Replace with mail text
-            'pem_body_html':'Mail not downloaded...', #TODO:Replace
+            'pem_body_text': parsed_mail['text'],
+            'pem_body_html': parsed_mail['html'],
             'pem_account_id':coreaccountid,
             'pem_message_id': mail['Message-Id'],
-            'pem_mail_orig': str(mail)
+            'pem_mail_orig': unicode(parsed.mime_string, errors='ignore')
         }
-        parsed_mail = self.get_payloads(mail)
-        vals['pem_body_text'] = parsed_mail['text']
-        vals['pem_body_html'] = parsed_mail['html']
         #Create the mailbox item now
         crid = False
         try:
@@ -802,28 +801,25 @@ def complete_mail(self, cr, uid, mail, coreaccountid, serv_ref, mailboxref, cont
         #mailboxref: ID of record in malbox to complete
         logger = netsvc.Logger()
         mail_obj = self.pool.get('poweremail.mailbox')
-        #TODO:If multipart save attachments and save ids
+        parsed = Email.parse(mail.as_string())
+        parsed_mail = self.get_payloads(parsed)
         vals = {
-            'pem_from':self.decode_header_text(mail['From']),
-            'pem_to':mail['To'] and self.decode_header_text(mail['To']) or 'no recepient',
-            'pem_cc':self.decode_header_text(mail['cc']),
-            'pem_bcc':self.decode_header_text(mail['bcc']),
+            'pem_from': parsed.from_.address,
+            'pem_to': ','.join(parsed.to) or 'No Recipient',
+            'pem_cc': ','.join(parsed.cc),
+            'pem_bcc': ','.join(parsed.bcc),
             'pem_recd':mail['date'],
             'date_mail':time.strftime("%Y-%m-%d %H:%M:%S"),
-            'pem_subject':self.decode_header_text(mail['subject']),
+            'pem_subject': parsed.subject,
             'server_ref':serv_ref,
             'folder':'inbox',
             'state':context.get('state', 'unread'),
-            'pem_body_text':'Mail not downloaded...', #TODO:Replace with mail text
-            'pem_body_html':'Mail not downloaded...', #TODO:Replace
+            'pem_body_text': parsed_mail['text'],
+            'pem_body_html': parsed_mail['html'],
             'pem_account_id':coreaccountid,
             'pem_message_id': mail['Message-Id'],
-            'pem_mail_orig': str(mail)
+            'pem_mail_orig': unicode(parsed.mime_string, errors='ignore')
             }
-        #Identify Mail Type and get payload
-        parsed_mail = self.get_payloads(mail)
-        vals['pem_body_text'] = tools.ustr(parsed_mail['text'])
-        vals['pem_body_html'] = tools.ustr(parsed_mail['html'])
         #Create the mailbox item now
         crid = False
         try:
@@ -836,7 +832,7 @@ def complete_mail(self, cr, uid, mail, coreaccountid, serv_ref, mailboxref, cont
 
             # Commenting this code due to the attachments being created on
             #  mailbox's create, as we decode the email there with QREU's Email
-            #If there are attachments save them as well
+            # #If there are attachments save them as well
             # if parsed_mail['attachments']:
             #     self.save_attachments(cr, uid, mail, mailboxref, parsed_mail, coreaccountid, context)
             return True
@@ -1126,15 +1122,13 @@ def send_receive(self, cr, uid, ids, context=None):
             self.pool.get('poweremail.mailbox').send_all_mail(cr, uid, [], context=ctx)
         return True
 
-    def get_payloads(self, mail):
+    def get_payloads(self, parsed_mail):
         """
         Parse the Email with qreu's Email and return a dict with:
         - 'text': body_text
         - 'html': body_html
         - 'attachments': [attachments]
         """
-        # Use qreu's parsing
-        parsed_mail = Email.parse(mail.as_string())
         parts = parsed_mail.body_parts
         attachments = [
             (v['type'], v['name'], v['content'])