Merge 804d91f2ad into 34f2d2b98b

django_mailbox/migrations/0005_auto_20160523_2240.py

@@ -1,9 +1,9 @@
 from django.db import migrations, models
+from functools import partial
 import django_mailbox.utils
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('django_mailbox', '0004_bytestring_to_unicode'),
     ]
@@ -12,6 +12,8 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='messageattachment',
             name='document',
-            field=models.FileField(upload_to=django_mailbox.utils.get_attachment_save_path, verbose_name='Document'),
+            field=models.FileField(
+                upload_to=partial(django_mailbox.utils.get_save_path, setting='attachment_upload_to'),
+                verbose_name='Document'),
         ),
     ]

django_mailbox/migrations/0009_auto_20200208_0953.py

@@ -0,0 +1,20 @@
+# Generated by Django 2.2.4 on 2020-02-08 09:53
+
+from django.db import migrations, models
+import django_mailbox.utils
+import functools
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_mailbox', '0008_auto_20190219_1553'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='message',
+            name='eml',
+            field=models.FileField(help_text='Original full content of message', null=True, upload_to=functools.partial(django_mailbox.utils.get_save_path, *(), **{'setting': 'message_upload_to'}), verbose_name='Raw message contents'),
+        ),
+    ]

django_mailbox/models.py

@@ -10,6 +10,7 @@ from email.utils import formatdate, parseaddr
 from urllib.parse import parse_qs, unquote, urlparse
 from quopri import encode as encode_quopri
 from io import BytesIO
+from functools import partial
 import base64
 import email
 import logging
@@ -306,8 +307,8 @@ class Mailbox(models.Model):
                     self._get_dehydrated_message(part, record)
                 )
         elif (
-            settings['strip_unallowed_mimetypes']
-            and not msg.get_content_type() in settings['allowed_mimetypes']
+                settings['strip_unallowed_mimetypes']
+                and not msg.get_content_type() in settings['allowed_mimetypes']
         ):
             for header, value in msg.items():
                 new[header] = value
@@ -315,16 +316,16 @@ class Mailbox(models.Model):
             # payload, it will be expecting a body for this.
             del new['Content-Transfer-Encoding']
             new[settings['altered_message_header']] = (
-                'Stripped; Content type %s not allowed' % (
-                    msg.get_content_type()
-                )
+                    'Stripped; Content type %s not allowed' % (
+                msg.get_content_type()
+            )
             )
             new.set_payload('')
         elif (
-            (
-                msg.get_content_type() not in settings['text_stored_mimetypes']
-            ) or
-            ('attachment' in msg.get('Content-Disposition', ''))
+                (
+                        msg.get_content_type() not in settings['text_stored_mimetypes']
+                ) or
+                ('attachment' in msg.get('Content-Disposition', ''))
         ):
             filename = None
             raw_filename = msg.get_filename()
@@ -420,7 +421,7 @@ class Mailbox(models.Model):
         except KeyError as exc:
             # email.message.replace_header may raise 'KeyError' if the header
             # 'content-transfer-encoding' is missing
-            logger.warning("Failed to parse message: %s", exc,)
+            logger.warning("Failed to parse message: %s", exc, )
             return None
         msg.set_body(body)
         if message['in-reply-to']:
@@ -576,7 +577,7 @@ class Message(models.Model):
     eml = models.FileField(
         _('Raw message contents'),
         null=True,
-        upload_to="messages",
+        upload_to=partial(utils.get_save_path, setting='message_upload_to'),
         help_text=_('Original full content of message')
     )
     objects = models.Manager()
@@ -715,9 +716,9 @@ class Message(models.Model):
                     encode_base64(new)
             except MessageAttachment.DoesNotExist:
                 new[settings['altered_message_header']] = (
-                    'Missing; Attachment %s not found' % (
-                        msg[settings['attachment_interpolation_header']]
-                    )
+                        'Missing; Attachment %s not found' % (
+                    msg[settings['attachment_interpolation_header']]
+                )
                 )
                 new.set_payload('')
         else:
@@ -816,7 +817,7 @@ class MessageAttachment(models.Model):
 
     document = models.FileField(
         _('Document'),
-        upload_to=utils.get_attachment_save_path,
+        upload_to=partial(utils.get_save_path, setting='attachment_upload_to'),
     )
 
     def delete(self, *args, **kwargs):

django_mailbox/utils.py

@@ -3,9 +3,9 @@ import email.header
 import logging
 import os
 
+from django.utils.deconstruct import deconstructible
 from django.conf import settings
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -66,7 +66,13 @@ def get_settings():
             settings,
             'DJANGO_MAILBOX_default_charset',
             'iso8859-1',
+        ),
+        'message_upload_to': getattr(
+            settings,
+            'DJANGO_MAILBOX_MESSAGE_UPLOAD_TO',
+            'messages/'
         )
+
     }
 
 
@@ -138,10 +144,10 @@ def get_body_from_message(message, maintype, subtype):
     return body
 
 
-def get_attachment_save_path(instance, filename):
+def get_save_path(instance, filename, setting):
     settings = get_settings()
 
-    path = settings['attachment_upload_to']
+    path = settings[setting]
     if '%' in path:
         path = datetime.datetime.utcnow().strftime(path)
 

docs/topics/appendix/settings.rst

@@ -80,3 +80,9 @@ Settings
   * Default: ``False``
   * Type: ``boolean``
   * Controls whether or not we store original messages in ``eml`` field
+
+* ``DJANGO_MAILBOX_MESSAGE_UPLOAD_TO``
+
+  * Default: ``messages/``
+  * Type: ``string``
+  * Original message will be saved to this location.