Fix thumbnail generation for SVG images when used as a Divio addon (#1312)

* Fix thumbnail generation for SVG images when used as a Divio addon

Remove hardcoded settings from alrdryn_config.py and use the defaults
provided by easy-thumbnails.

* Override easy-thumbnail default processor

* Take default settings from easythumbnail conf

* Isolate settings

* Import easy inside class

* Remove debug message

Co-authored-by: Michael J. Nicholson <[email protected]>

Author: GaretJax

CHANGELOG.rst

@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+
+Unreleased
+==========
+
+* Fix thumbnail generation for SVG images when used as a Divio addon.
+
+
 2.2.3 (2022-08-08)
 ==================
 * Fix CSS styles (Modified SCSS had to be recompiled).

aldryn_config.py

@@ -8,7 +8,9 @@ def to_settings(self, data, settings):
 
         from aldryn_addons.utils import boolean_ish, djsenv
         from aldryn_django import storage
+        from easy_thumbnails.conf import Settings as EasySettings
 
+        EasyThumbnailSettings = EasySettings(isolated=True)
         env = partial(djsenv, settings=settings)
 
         # django-filer
@@ -29,17 +31,16 @@ def to_settings(self, data, settings):
         # easy-thumbnails
         settings['THUMBNAIL_QUALITY'] = env('THUMBNAIL_QUALITY', 90)
         settings['THUMBNAIL_PRESERVE_EXTENSIONS'] = ['png', 'gif']
-        settings['THUMBNAIL_PROCESSORS'] = (
-            'easy_thumbnails.processors.colorspace',
-            'easy_thumbnails.processors.autocrop',
-            'filer.thumbnail_processors.scale_and_crop_with_subject_location',
-            'easy_thumbnails.processors.filters',
-        )
-        settings['THUMBNAIL_SOURCE_GENERATORS'] = (
-            'easy_thumbnails.source_generators.pil_image',
-        )
         settings['THUMBNAIL_CACHE_DIMENSIONS'] = True
 
+        # Swap scale and crop for django-filer version
+        settings['THUMBNAIL_PROCESSORS'] = tuple([
+            processor
+            if processor != 'easy_thumbnails.processors.scale_and_crop'
+            else 'filer.thumbnail_processors.scale_and_crop_with_subject_location'
+            for processor in EasyThumbnailSettings.THUMBNAIL_PROCESSORS
+        ])
+
         # easy_thumbnails uses django's default storage backend (local file
         # system storage) by default, even if the DEFAULT_FILE_STORAGE setting
         # points to something else.