Merge pull request #144 from gisce/fix-message-id-outlook

Fix strange space before Message-Id

migrations/5.0.23.12.0/post-0001_trim_message_id_database.py

@@ -0,0 +1,32 @@
+# coding=utf-8
+import logging
+from tqdm import tqdm
+
+
+logger = logging.getLogger('openerp.migration.' + __name__)
+
+
+def up(cursor, installed_version):
+    if not installed_version:
+        return
+    cursor.execute("SELECT count(id) FROM poweremail_mailbox where pem_message_id ilike ' %'")
+    total_to_migrate = cursor.fetchone()[0]
+    t = tqdm(total=total_to_migrate, desc='Migrating messages')
+    remaining_to_migrate = total_to_migrate
+    while remaining_to_migrate:
+        cursor.execute(
+            "UPDATE poweremail_mailbox SET pem_message_id = trim(pem_message_id) WHERE id in ("
+            "SELECT id from poweremail_mailbox WHERE pem_message_id ilike ' %' LIMIT 1000"
+            ")"
+        )
+        cursor.execute("SELECT count(id) FROM poweremail_mailbox where pem_message_id ilike ' %'")
+        remaining_to_migrate = cursor.fetchone()[0]
+        t.update(1000)
+    t.close()
+
+
+def down(cursor, installed_version):
+    pass
+
+
+migrate = up

poweremail_core.py

@@ -775,10 +775,11 @@ def save_fullmail(self, cr, uid, mail, coreaccountid, serv_ref, context=None):
         logger = netsvc.Logger()
         mail_obj = self.pool.get('poweremail.mailbox')
         # Check for existing mails
+        message_id = mail['Message-ID'].strip()
         existing_mails = mail_obj.search(
             cr, uid, [
                 ('pem_account_id', '=', coreaccountid),
-                ('pem_message_id', '=', mail['Message-Id'])
+                ('pem_message_id', '=', message_id)
             ]
         )
         if existing_mails:
@@ -805,7 +806,7 @@ def save_fullmail(self, cr, uid, mail, coreaccountid, serv_ref, context=None):
             'pem_body_text': parsed_mail['text'],
             'pem_body_html': parsed_mail['html'],
             'pem_account_id':coreaccountid,
-            'pem_message_id': mail['Message-Id'],
+            'pem_message_id': message_id,
             'pem_mail_orig': six.text_type(parsed.mime_string, errors='ignore')
         }
         #Create the mailbox item now