-
Notifications
You must be signed in to change notification settings - Fork 319
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into version-2.10
- Loading branch information
Showing
4 changed files
with
193 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| ======================= | ||
| Animated images support | ||
| ======================= | ||
|
|
||
| Support for animated image formats in easy-thumbnails is experimental and must be activated | ||
| manually, via `SETTINGS`. | ||
|
|
||
| Example settings, that will preserve GIF, WEBP and PNG formats, but wont allow animations on | ||
| PNGs. | ||
|
|
||
| .. code-block:: python | ||
| THUMBNAIL_IMAGE_SAVE_OPTIONS = { | ||
| "GIF": {"save_all": True}, # to save all frames available | ||
| "WEBP": {"save_all": True}, | ||
| "PNG": {"save_all": False}, # dont allow animated PNGs | ||
| } | ||
| THUMBNAIL_PRESERVE_EXTENSIONS = ("webp", "gif", "png") | ||
| There have been issues with conversion from GIF to WEBP, so it's currently not recommended to | ||
| enable this specific conversion for animated images. | ||
|
|
||
|
|
||
| Remark | ||
| ====== | ||
|
|
||
| In the future, Easy Thumbnails might preserve animated images by default, and/or provide the | ||
| option to enable/disable animations for each generated thumbnail. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| from io import BytesIO | ||
| from PIL import Image, ImageChops, ImageDraw | ||
| from easy_thumbnails import processors | ||
| from unittest import TestCase | ||
|
|
||
|
|
||
| def create_animated_image(mode='RGB', format="gif", size=(1000, 1000), no_frames=6): | ||
| frames = [] | ||
| for i in range(no_frames): | ||
| image = Image.new(mode, size, (255, 255, 255)) | ||
| draw = ImageDraw.Draw(image) | ||
| x_bit, y_bit = size[0] // 40 * i, size[1] // 40 * i | ||
| draw.rectangle((x_bit, y_bit * 2, x_bit * 7, y_bit * 3), 'red') | ||
| draw.rectangle((x_bit * 2, y_bit, x_bit * 3, y_bit * 8), 'yellow') | ||
| frames.append(image) | ||
| write_to = BytesIO() | ||
| frames[0].save( | ||
| write_to, format=format, save_all=True, append_images=frames[1:] | ||
| ) | ||
| im = Image.open(write_to) | ||
| # for debugging | ||
| # with open(f"animated{no_frames}.{format}", "wb") as f: | ||
| # write_to.seek(0) | ||
| # f.write(write_to.read()) | ||
| return im | ||
|
|
||
|
|
||
| class AnimatedFormatProcessorsTests(TestCase): | ||
|
|
||
| def test_scale(self): | ||
| no_frames = 20 | ||
| im = create_animated_image(no_frames=no_frames) | ||
| frames_count = im.n_frames | ||
| self.assertEqual(frames_count, no_frames) | ||
| processed = processors.scale_and_crop(im, (100, 100)) | ||
| processed_frames_count = processed.n_frames | ||
| self.assertEqual(frames_count, processed_frames_count) | ||
| self.assertEqual(processed.size, (100, 100)) | ||
|
|
||
| def test_scale_crop(self): | ||
| frames = 9 | ||
| im = create_animated_image(no_frames=frames) | ||
| frames_count = im.n_frames | ||
| self.assertEqual(frames_count, frames) | ||
| processed = processors.scale_and_crop(im, (900, 950), crop=True) | ||
| processed_frames_count = processed.n_frames | ||
| self.assertEqual(frames_count, processed_frames_count) | ||
| self.assertEqual(processed.size, (900, 950)) | ||
|
|
||
| def test_colorspace(self): | ||
| # to have a color conversion | ||
| no_frames = 6 | ||
| im = create_animated_image(format="png") | ||
| frames_count = im.n_frames | ||
| self.assertEqual(frames_count, no_frames) | ||
| processed = processors.colorspace(im, bw=True) | ||
| processed_frames_count = processed.n_frames | ||
| # indeed processed? | ||
| self.assertEqual(frames_count, processed_frames_count) | ||
| self.assertEqual(processed.mode, "L") | ||
| self.assertEqual(processed.size, (1000, 1000)) | ||
|
|
||
| def test_filter(self): | ||
| no_frames = 12 | ||
| im = create_animated_image(format="webp", no_frames=no_frames) | ||
| frames_count = im.n_frames | ||
| self.assertEqual(frames_count, no_frames) | ||
| processed = processors.filters(im, detail=True, sharpen=True) | ||
| processed_frames_count = processed.n_frames | ||
| # indeed processed? | ||
| self.assertEqual(frames_count, processed_frames_count) | ||
| self.assertEqual(processed.size, (1000, 1000)) | ||
|
|
||
| def test_background(self): | ||
| no_frames = 9 | ||
| im = create_animated_image(format="webp", no_frames=no_frames) | ||
| frames_count = im.n_frames | ||
| self.assertEqual(frames_count, no_frames) | ||
| processed = processors.background(im, background="#ff00ff", size=(1000, 1800)) | ||
| processed_frames_count = processed.n_frames | ||
| # indeed processed? | ||
| self.assertEqual(frames_count, processed_frames_count) | ||
| self.assertEqual(processed.size, (1000, 1800)) |