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

Added random eml file name, removed getattr related to self.mailbox.from_email in Message.reply, fix docs - second round of pull requests

Browse source
This commit is contained in:
Adam Dobrawy 2015-03-18 09:56:52 +01:00
parent 42d891bd8d
commit 835986c96a
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
django_mailbox/models.py
View file

@ -332,7 +332,7 @@ class Mailbox(models.Model):
def _process_message(self, message): def _process_message(self, message):
msg = Message() msg = Message()
if STORE_ORIGINAL_MESSAGE: if STORE_ORIGINAL_MESSAGE:
msg.eml.save('message.eml', ContentFile(message), save=False) msg.eml.save('%s.eml' % uuid.uuid4(), ContentFile(message), save=False)
msg.mailbox = self msg.mailbox = self
if 'subject' in message: if 'subject' in message:
msg.subject = convert_header_to_unicode(message['subject'])[0:255] msg.subject = convert_header_to_unicode(message['subject'])[0:255]
@ -460,6 +460,7 @@ class Message(models.Model):
eml = models.FileField( eml = models.FileField(
_(u'Message as a file'), _(u'Message as a file'),
null=True, null=True,
upload_to="messages",
help_text=_(u'Original full content of message') help_text=_(u'Original full content of message')
) )
objects = models.Manager() objects = models.Manager()
@ -510,7 +511,7 @@ class Message(models.Model):
pre-set it. pre-set it.
""" """
if not getattr(message, 'from_email', None): if not self.from_email:
if self.mailbox.from_email: if self.mailbox.from_email:
message.from_email = self.mailbox.from_email message.from_email = self.mailbox.from_email
else: else:
@ -612,7 +613,7 @@ class Message(models.Model):
def get_email_object(self): def get_email_object(self):
""" Returns an `email.message.Message` instance for this message.""" """ Returns an `email.message.Message` instance for this message."""
if self.eml: if self.eml:
return email.message_from_file(Message.objects.last().eml) return email.message_from_file(self.eml)
body = self.get_body() body = self.get_body()
if six.PY3: if six.PY3:
flat = email.message_from_bytes(body) flat = email.message_from_bytes(body)

2
django_mailbox/tests/test_process_email.py
View file

@ -210,7 +210,7 @@ class TestProcessEmail(EmailMessageTestCase):
) )
msg = self.mailbox.record_outgoing_message(email_object.message()) msg = self.mailbox.record_outgoing_message(email_object.message())
self.assertEqual(msg.outgoing, True) self.assertTrue(msg.outgoing)
actual_from = 'username@example.com' actual_from = 'username@example.com'
reply_email_object = EmailMessage('Test subject', # subject reply_email_object = EmailMessage('Test subject', # subject

1
docs/topics/appendix/settings.rst
View file

@ -66,6 +66,7 @@ Settings
* If this is set, it will be read as a number of * If this is set, it will be read as a number of
bytes. Any messages above that size will not be bytes. Any messages above that size will not be
downloaded. ``2000000`` is 2 Megabytes. downloaded. ``2000000`` is 2 Megabytes.
* ``DJANGO_MAILBOX_STORE_ORIGINAL_MESSAGE`` * ``DJANGO_MAILBOX_STORE_ORIGINAL_MESSAGE``
* Default: ``False`` * Default: ``False``
* Type: ``boolean`` * Type: ``boolean``