Add configurable storage

Superseeds #156

Author: pickfire

docs-src/customization.md

@@ -232,6 +232,18 @@ MARKDOWNX_IMAGE_MAX_SIZE = {
 }
 ```
 
+### `MARKDOWNX_IMAGE_STORAGE`
+
+Default: `None`
+
+Specify the default file storage for markdownx image upload. If `None`, follow
+[`DJANGO_FILE_STORAGE`](https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-DEFAULT_FILE_STORAGE).
+Example which uses S3 storage backend:
+
+```python
+DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
+```
+
 ### `MARKDOWNX_SVG_JAVASCRIPT_PROTECTION`
 
 Default: `True`

markdownx/forms.py

@@ -4,21 +4,25 @@
 from collections import namedtuple
 
 from django import forms
-from django.core.files.storage import default_storage
+from django.core.files.storage import get_storage_class
 from django.core.files.uploadedfile import InMemoryUploadedFile
 
 from .utils import scale_and_crop, xml_has_javascript
 from .exceptions import MarkdownxImageUploadError
 
 from .settings import (
     MARKDOWNX_IMAGE_MAX_SIZE,
+    MARKDOWNX_IMAGE_STORAGE,
     MARKDOWNX_MEDIA_PATH,
     MARKDOWNX_UPLOAD_CONTENT_TYPES,
     MARKDOWNX_UPLOAD_MAX_SIZE,
     MARKDOWNX_SVG_JAVASCRIPT_PROTECTION
 )
 
 
+image_storage = get_storage_class(MARKDOWNX_IMAGE_STORAGE)()
+
+
 class ImageForm(forms.Form):
     """
     Used for the handling of images uploaded using the editor through :guilabel:`AJAX`.
@@ -104,8 +108,8 @@ def _save(self, image, file_name, commit):
         full_path = path.join(MARKDOWNX_MEDIA_PATH, unique_file_name)
 
         if commit:
-            default_storage.save(full_path, image)
-            return default_storage.url(full_path)
+            image_storage.save(full_path, image)
+            return image_storage.url(full_path)
 
         # If `commit is False`, return the path and in-memory image.
         image_data = namedtuple('image_data', ['path', 'image'])

markdownx/settings.py

@@ -68,6 +68,8 @@ def _mdx(var, default):
 
 MARKDOWNX_IMAGE_MAX_SIZE = _mdx('IMAGE_MAX_SIZE', dict(size=(IM_WIDTH, IM_HEIGHT), quality=NINETY_DPI))
 
+MARKDOWNX_IMAGE_STORAGE = _mdx('IMAGE_STORAGE', None)
+
 MARKDOWNX_SVG_JAVASCRIPT_PROTECTION = True