rename get_thumbnail_path -> get_cropped_path

Author: jrief

finder/contrib/image/models.py

@@ -29,7 +29,7 @@ class Meta:
     def summary(self):
         return "{width}×{height}px ({size})".format(size=super().summary, width=self.width, height=self.height)
 
-    def get_thumbnail_path(self, width, height):
+    def get_cropped_path(self, width, height):
         id = str(self.id)
         thumbnail_folder = self.filer_public_thumbnails / f'{id[0:2]}/{id[2:4]}/{id}'
         thumbnail_path = Path(self.file_name)

finder/contrib/image/pil/models.py

@@ -54,7 +54,7 @@ def save(self, **kwargs):
         super().save(**kwargs)
 
     def get_thumbnail_url(self):
-        thumbnail_path = self.get_thumbnail_path(self.thumbnail_size, self.thumbnail_size)
+        thumbnail_path = self.get_cropped_path(self.thumbnail_size, self.thumbnail_size)
         if not default_storage.exists(thumbnail_path):
             try:
                 self.crop(thumbnail_path, self.thumbnail_size, self.thumbnail_size)
@@ -168,68 +168,3 @@ def crop(self, thumbnail_path, width, height):
         (default_storage.base_location / thumbnail_path.parent).mkdir(parents=True, exist_ok=True)
         image.save(default_storage.open(thumbnail_path, 'wb'), image.format)
         return image
-
-    def crop_centered(self, image):
-        width, height = image.size
-        if width > height:
-            min_x = (width - height) / 2
-            min_y = 0
-            max_x = (width + height) / 2
-            max_y = height
-        else:
-            min_x = 0
-            min_y = (height - width) / 2
-            max_x = width
-            max_y = (height + width) / 2
-        return image.crop((min_x, min_y, max_x, max_y))
-
-    def crop_eccentric(self, image, crop_x, crop_y, crop_size, gravity):
-        """
-        with cropping, the expected resizing could be done using:
-        `image = image.crop((crop_x, crop_y, crop_x + crop_size, crop_y + crop_size))`
-        however, for small selections or images in low resolution this might result
-        in blurry preview images. We therefore want to use at least `thumbnail_size`
-        pixels from the original image
-        """
-        min_size = max(crop_size, self.thumbnail_size)
-        off_size = min_size - crop_size
-
-        # horizontal thumbnailing
-        if gravity in ('e', 'ne', 'se'):
-            max_x = min(crop_x + min_size, image.width)
-            min_x = max(max_x - min_size, 0)
-        elif gravity in ('w', 'nw', 'sw'):
-            min_x = max(crop_x - off_size, 0)
-        else:
-            min_x = max(crop_x - off_size / 2, 0)
-        if min_x + min_size > image.width:
-            min_x = max(image.width - min_size, 0)
-            max_x = image.width
-        else:
-            max_x = min_x + min_size
-
-        # vertical thumbnailing
-        if gravity in ('s', 'se', 'sw'):
-            max_y = min(crop_y + min_size, image.height)
-            min_y = max(max_y - min_size, 0)
-        elif gravity in ('n', 'ne', 'nw'):
-            min_y = max(crop_y - off_size, 0)
-        else:
-            min_y = max(crop_y - off_size / 2, 0)
-        if min_y + min_size > image.height:
-            min_y = max(image.height - min_size, 0)
-            max_y = image.height
-        else:
-            max_y = min_y + min_size
-
-        # correct thumbnailing for low resolution images with an aspect ratio unequal to 1
-        if round(max_x - min_x) > round(max_y - min_y):
-            off_size = (max_x - min_x - max_y + min_y) / 2
-            min_x += off_size
-            max_x -= off_size
-        elif round(max_x - min_x) < round(max_y - min_y):
-            off_size = (max_y - min_y - max_x + min_x) / 2
-            min_y += off_size
-            max_y -= off_size
-
-        return image.crop((min_x, min_y, max_x, max_y))

finder/contrib/image/svg/models.py

@@ -41,7 +41,7 @@ def save(self, **kwargs):
         super().save(**kwargs)
 
     def get_thumbnail_url(self):
-        thumbnail_path = self.get_thumbnail_path(self.thumbnail_size, self.thumbnail_size)
+        thumbnail_path = self.get_cropped_path(self.thumbnail_size, self.thumbnail_size)
         if not default_storage.exists(thumbnail_path):
             drawing = svg2rlg(default_storage.path(self.file_path))
             if not drawing: