puh, gravity cropping seems to work now

Author: jrief

finder/contrib/image/pil/models.py

@@ -45,9 +45,9 @@ def save(self, **kwargs):
 
     def get_thumbnail_url(self):
         thumbnail_path = self.get_thumbnail_path(self.thumbnail_size, self.thumbnail_size)
-        if str(self.id) == 'XXX-561d6907-5fd7-40b9-a6f2-5db45a67eda6' or not default_storage.exists(thumbnail_path):
+        if str(self.id) == '4d4d9ae9-3120-4f24-8d57-9d15fa6edfc4' or not default_storage.exists(thumbnail_path):
             try:
-                self.crop(thumbnail_path, self.thumbnail_size, self.thumbnail_size * 1.667)
+                self.crop(thumbnail_path, self.thumbnail_size, self.thumbnail_size * 0.8)
             except Exception:
                 # thumbnail image could not be created
                 return self.fallback_thumbnail_url
@@ -84,48 +84,80 @@ def crop(self, thumbnail_path, width, height):
             self.meta_data.get('crop_size'),
             self.meta_data.get('gravity'),
         )
-        next_crop_size = None
         if crop_x is None or crop_y is None or crop_size is None:
             # crop in the center of the image
             if image.width > image.height:
                 crop_x = (image.width - image.height) / 2
                 crop_y = 0
-                crop_size = image.height
+                crop_resize = crop_size = image.height
             else:
                 crop_x = 0
                 crop_y = (image.height - image.width) / 2
-                crop_size = image.width
+                crop_resize = crop_size = image.width
         # elif width > height:
         #     if width > crop_size * aspect_ratio:
         #         # extend the crop size to prevent blurry images
         #         crop_x = max(crop_x - (width - crop_size) / 2, 0)
         #         crop_y = max(crop_y - (height - crop_size) / 2, 0)
         #         crop_size = width
         elif aspect_ratio > 1:
-            if width > crop_size:
-                offset = width - crop_size
-                next_crop_size = width
-        else:
             if height > crop_size:
-                offset = height - crop_size
-                next_crop_size = height
-        if next_crop_size is not None:
-            # extend the crop size to prevent blurry images
-            if gravity in ('e', 'ne', 'se'):
-                crop_x = max(crop_x - (width - crop_size) / 2, 0)
-                # crop_x = max(crop_x - (width - next_crop_size) / 2, 0)
-            elif gravity in ('w', 'nw', 'sw'):
+                crop_resize = min(image.height, width)
+            else:
+                crop_resize = crop_size
+        else:
+            if width > crop_size:
+                crop_resize = min(image.width, height)
+            else:
+                crop_resize = crop_size
+
+        # extend the horizontal crop size to prevent blurry images
+        if gravity in ('e', 'ne', 'se'):
+            if crop_resize > crop_size:
+                crop_x += (width - crop_resize) / 2
+            elif aspect_ratio > 1:
+                crop_x = max(crop_x - crop_resize * (aspect_ratio - 1), 0)
+            else:
+                crop_x = max(crop_x + crop_size - image.height * aspect_ratio, 0)
+        elif gravity in ('w', 'nw', 'sw'):
+            if crop_resize > crop_size:
                 crop_x = max(crop_x - width + crop_size, 0)
+            elif aspect_ratio > 1:
+                crop_x = max(crop_x - crop_resize * (aspect_ratio - 1), 0)
+        else:  # centered crop
+            if crop_resize > crop_size:
+                # crop_x = max(crop_x - (width - crop_resize) / 2, 0)
+                # crop_x = max(crop_x - crop_resize * (aspect_ratio - 1) / 2, 0)
+                # crop_x = max(crop_x + (crop_resize - image.height * aspect_ratio) / 2, 0)
+                crop_x = max(crop_x - (crop_resize - crop_size) / 2, 0)
+            elif aspect_ratio > 1:
+                crop_x = max(crop_x - crop_resize * (aspect_ratio - 1) / 2, 0)
             else:
-                crop_x = max(crop_x - (next_crop_size - crop_size) / 2, 0)
-            if gravity in ('n', 'ne', 'nw'):
+                crop_x = max(crop_x + (crop_size - image.height * aspect_ratio) / 2, 0)
+
+        # extend the vertical crop size to prevent blurry images
+        if gravity in ('n', 'ne', 'nw'):
+            if crop_resize > crop_size:
                 crop_y = max(crop_y - height + crop_size, 0)
-            elif gravity in ('s', 'se', 'sw'):
+            elif aspect_ratio < 1:
+                crop_y = max(crop_y + crop_size * (1 - 1 / aspect_ratio), 0)
+        elif gravity in ('s', 'se', 'sw'):
+            if crop_resize > crop_size:
+                crop_y += (height - crop_resize) / 2
+            elif aspect_ratio < 1:
+                crop_y = max(crop_y + crop_resize * (1 - 1 / aspect_ratio), 0)
+            else:
+                crop_y = max(crop_y + (crop_size - image.width / aspect_ratio), 0)
+        else:
+            if crop_resize > crop_size:
+                # if aspect_ratio < 1:
                 crop_y = max(crop_y - (height - crop_size) / 2, 0)
-                # crop_y = max(crop_y - (height - next_crop_size) / 2, 0)
+            elif aspect_ratio < 1:
+                crop_y = max(crop_y + crop_resize * (1 - 1 / aspect_ratio) / 2, 0)
             else:
-                crop_y = max(crop_y - (next_crop_size - crop_size) / 2, 0)
-            crop_size = next_crop_size
+                crop_y = max(crop_y + (crop_size - image.width / aspect_ratio) / 2, 0)
+
+        crop_size = crop_resize
 
         print(f"Crop parameters: crop_x={crop_x}, crop_y={crop_y}, crop_size={crop_size}, gravity={gravity}")
 
@@ -147,13 +179,19 @@ def crop(self, thumbnail_path, width, height):
             #     min_height = image.width / aspect_ratio
             min_height = min(crop_size, image.width / aspect_ratio)
             min_width = min_height * aspect_ratio
-        min_x = max(crop_x + (crop_size - min_width) / 2, 0)
+        if False:
+            min_x = max(crop_x + (crop_size - min_width) / 2, 0)
+        else:
+            min_x = crop_x
         if min_x + min_width > image.width:
             min_x = max(image.width - min_width, 0)
             max_x = image.width
         else:
             max_x = min_x + min_width
-        min_y = max(crop_y + (crop_size - min_height) / 2, 0)
+        if False:
+            min_y = max(crop_y + (crop_size - min_height) / 2, 0)
+        else:
+            min_y = crop_y
         if min_y + min_height > image.height:
             min_y = max(image.height - min_height, 0)
             max_y = image.height