federico/django-mailbox
1
0
Fork 0
forked from mirror/django-mailbox
Code Activity

Cache email object in Message (#148)

Browse source 
* Cache email object in Message

* Email object cache flush in some tests
This commit is contained in:
Adam Dobrawy 2018-03-09 19:10:07 +01:00 • committed by Adam Coddington
parent 2b2bdb9825
commit e0687380a1
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
django_mailbox/models.py
View file

@ -345,6 +345,7 @@ class Mailbox(models.Model):
def _process_message(self, message):
msg = Message()
msg._email_object = message
settings = utils.get_settings()
if settings['store_original_message']:
@ -711,20 +712,22 @@ class Message(models.Model):
(https://docs.python.org/2/library/email.message.html)
"""
if self.eml:
if self.eml.name.endswith('.gz'):
body = gzip.GzipFile(fileobj=self.eml).read()
if not hasattr(self, '_email_object'): # Cache fill
if self.eml:
if self.eml.name.endswith('.gz'):
body = gzip.GzipFile(fileobj=self.eml).read()
else:
self.eml.open()
body = self.eml.file.read()
self.eml.close()
else:
self.eml.open()
body = self.eml.file.read()
self.eml.close()
else:
body = self.get_body()
if six.PY3:
flat = email.message_from_bytes(body)
else:
flat = email.message_from_string(body)
return self._rehydrate(flat)
body = self.get_body()
if six.PY3:
flat = email.message_from_bytes(body)
else:
flat = email.message_from_string(body)
self._email_object = self._rehydrate(flat)
return self._email_object
def delete(self, *args, **kwargs):
"""Delete this message and all stored attachments."""

2
django_mailbox/tests/test_message_flattening.py
View file

@ -64,6 +64,7 @@ class TestMessageFlattening(EmailMessageTestCase):
msg = self.mailbox.process_incoming_message(incoming_email_object)
del msg._email_object # Cache flush
actual_email_object = msg.get_email_object()
self.assertEqual(
@ -89,6 +90,7 @@ class TestMessageFlattening(EmailMessageTestCase):
msg = self.mailbox.process_incoming_message(incoming_email_object)
del msg._email_object # Cache flush
actual_email_object = msg.get_email_object()
self.assertEqual(