forked from mirror/django-mailbox
Setting for original message upload_to
Also changed the default from "messages" to separate-by-date directories "mailbox_messages/%Y/%m/%d/"
This commit is contained in:
parent
eec7fb76f9
commit
3b50b052ef
4 changed files with 47 additions and 5 deletions
|
|
@ -62,6 +62,11 @@ def get_settings():
|
|||
'DJANGO_MAILBOX_ORIGINAL_MESSAGE_COMPRESSION',
|
||||
6
|
||||
),
|
||||
'original_message_upload_to': getattr(
|
||||
settings,
|
||||
'DJANGO_MAILBOX_ORIGINAL_MESSAGE_UPLOAD_TO',
|
||||
'mailbox_messages/%Y/%m/%d/'
|
||||
),
|
||||
'default_charset': getattr(
|
||||
settings,
|
||||
'DJANGO_MAILBOX_DEFAULT_CHARSET',
|
||||
|
|
@ -138,10 +143,7 @@ def get_body_from_message(message, maintype, subtype):
|
|||
return body
|
||||
|
||||
|
||||
def get_attachment_save_path(instance, filename):
|
||||
settings = get_settings()
|
||||
|
||||
path = settings['attachment_upload_to']
|
||||
def _get_save_path(filename, path):
|
||||
if '%' in path:
|
||||
path = datetime.datetime.utcnow().strftime(path)
|
||||
|
||||
|
|
@ -149,3 +151,15 @@ def get_attachment_save_path(instance, filename):
|
|||
path,
|
||||
filename,
|
||||
)
|
||||
|
||||
def get_attachment_save_path(instance, filename):
|
||||
settings = get_settings()
|
||||
|
||||
path = settings['attachment_upload_to']
|
||||
return _get_save_path(filename, path)
|
||||
|
||||
def get_original_message_save_path(instance, filename):
|
||||
settings = get_settings()
|
||||
|
||||
path = settings['original_message_upload_to']
|
||||
return _get_save_path(filename, path)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue