From b8410e1e199a581155566c6c3b9d40dbda32b082 Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Mon, 10 Aug 2015 13:37:37 +0200 Subject: Fixed test_search integration test. --- service/pixelated/adapter/mailstore/leap_mailstore.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'service/pixelated/adapter/mailstore/leap_mailstore.py') diff --git a/service/pixelated/adapter/mailstore/leap_mailstore.py b/service/pixelated/adapter/mailstore/leap_mailstore.py index 9261f877..8831ae84 100644 --- a/service/pixelated/adapter/mailstore/leap_mailstore.py +++ b/service/pixelated/adapter/mailstore/leap_mailstore.py @@ -16,6 +16,7 @@ from uuid import uuid4 from leap.mail.adaptors.soledad import SoledadMailAdaptor from twisted.internet import defer +from pixelated.adapter.mailstore.body_parser import BodyParser from pixelated.adapter.mailstore.mailstore import MailStore, underscore_uuid from leap.mail.mail import Message @@ -65,8 +66,9 @@ class LeapMail(Mail): def raw(self): result = '' for k, v in self._headers.items(): - result = result + '%s: %s\n' % (k, v) - result = result + '\n' + result += '%s: %s\n' % (k, v) + result += '\n' + if self._body: result = result + self._body @@ -151,10 +153,11 @@ class LeapMailStore(MailStore): mailbox = yield self._get_or_create_mailbox(mailbox_name) message = SoledadMailAdaptor().get_msg_from_string(Message, raw_msg) message.get_wrapper().set_mbox_uuid(mailbox.uuid) + yield message.get_wrapper().create(self.soledad) # add behavious from insert_mdoc_id from mail.py - mail = yield self._leap_message_to_leap_mail(message.get_wrapper().mdoc.doc_id, message, include_body=False) + mail = yield self._leap_message_to_leap_mail(message.get_wrapper().mdoc.doc_id, message, include_body=True) # TODO test that asserts include_body defer.returnValue(mail) @defer.inlineCallbacks @@ -200,7 +203,8 @@ class LeapMailStore(MailStore): @defer.inlineCallbacks def _leap_message_to_leap_mail(self, mail_id, message, include_body): if include_body: - body = (yield message.get_wrapper().get_body(self.soledad)).raw + # TODO use body from message if available + body = yield self._raw_message_body(message) else: body = None @@ -212,6 +216,12 @@ class LeapMailStore(MailStore): defer.returnValue(mail) + @defer.inlineCallbacks + def _raw_message_body(self, message): + content_doc = (yield message.get_wrapper().get_body(self.soledad)) + parser = BodyParser(content_doc.raw, content_type=content_doc.content_type, content_transfer_encoding=content_doc.content_transfer_encoding) + defer.returnValue(parser.parsed_content()) + @defer.inlineCallbacks def _mailbox_name_from_uuid(self, uuid): map = (yield self._mailbox_uuid_to_name_map()) -- cgit v1.2.3