Ticket #961: thumbnailing2.diff

core/meta/__init__.py

@@ -832 +832 @@
                 func.alters_data = True
                 setattr(new_class, 'save_%s_file' % f.name, func)
                 if isinstance(f, ImageField):
+                    if f.thumb_sizes:
+                        setattr(new_class, 'get_%s_thumbnail_url' % f.name, curry(method_get_image_thumbnail_url, f))
+                        setattr(new_class, 'get_%s_thumbnail_sizes' % f.name, curry(method_get_image_thumbnail_sizes, f))
                     # Add get_BLAH_width and get_BLAH_height methods, but only
                     # if the image field doesn't have width and height cache
                     # fields.
@@ -1066 +1069 @@
             # delete it from the filesystem.
             if os.path.exists(file_name) and not opts.get_model_module().get_list(**{'%s__exact' % f.name: getattr(self, f.name)}):
                 os.remove(file_name)
+                if isinstance(f, ImageField) and f.thumb_sizes:
+                    from django.parts.media.photos import get_thumbnail_path
+                    for size in f.thumb_sizes:
+                        thumb_path = get_thumbnail_path(file_name, str(size))
+                        os.remove(thumb_path)
     # Run any post-delete hooks.
     if hasattr(self, '_post_delete'):
         self._post_delete()
@@ -1290 +1298 @@
 
     # Write the file to disk.
     setattr(self, field.attname, filename)
-    fp = open(getattr(self, 'get_%s_filename' % field.name)(), 'wb')
+    path = getattr(self, 'get_%s_filename' % field.name)()
+    fp = open(path, 'wb')
     fp.write(raw_contents)
     fp.close()
 
-    # Save the width and/or height, if applicable.
-    if isinstance(field, ImageField) and (field.width_field or field.height_field):
-        from django.utils.images import get_image_dimensions
-        width, height = get_image_dimensions(getattr(self, 'get_%s_filename' % field.name)())
-        if field.width_field:
-            setattr(self, field.width_field, width)
-        if field.height_field:
-            setattr(self, field.height_field, height)
+    # Save the thumbnails, width, and height, if applicable.
+    if isinstance(field, ImageField):
+        if field.thumb_sizes:
+            from django.parts.media.photos import generate_thumbnail
+            for size in field.thumb_sizes:
+                generate_thumbnail(path, size, field.thumb_mode)
+        if field.width_field or field.height_field:
+            from django.utils.images import get_image_dimensions
+            width, height = get_image_dimensions(path)
+            if field.width_field:
+                setattr(self, field.width_field, width)
+            if field.height_field:
+                setattr(self, field.height_field, height)
 
     # Save the object, because it has changed.
     self.save()
 
 # IMAGE FIELD METHODS ######################
 
+def method_get_image_thumbnail_url(field, self, size=None):
+    from django.parts.media.photos import get_thumbnail_url
+    # If they don't specify a size, or the size doesn't exist,
+    # just give them back the first available thumbnail url.
+    if (size == None) or (size not in field.thumb_sizes):
+        size = field.thumb_sizes[0]
+    url = getattr(self, "get_%s_url" % field.name)()
+    return get_thumbnail_url(url, str(size))
+
+def method_get_image_thumbnail_sizes(field, self):
+    return field.thumb_sizes
+
 def method_get_image_width(field, self):
     return _get_image_dimensions(field, self)[0]
 

core/meta/fields.py

@@ -19 +19 @@
 # Values for Relation.edit_inline.
 TABULAR, STACKED = 1, 2
 
+# Values for ImageField's thumb_mode.
+WIDTH, HEIGHT, BOTH = 1, 2, 3
+
 RECURSIVE_RELATIONSHIP_CONSTANT = 'self'
 
 # prepares a value for use in a LIKE query
@@ -549 +552 @@
         return [curry(formfields.FloatField, max_digits=self.max_digits, decimal_places=self.decimal_places)]
 
 class ImageField(FileField):
-    def __init__(self, verbose_name=None, name=None, width_field=None, height_field=None, **kwargs):
-        self.width_field, self.height_field = width_field, height_field
+    def __init__(self, verbose_name=None, name=None, width_field=None, height_field=None, thumb_sizes=None, thumb_mode=BOTH, **kwargs):
+        self.width_field, self.height_field, self.thumb_sizes, self.thumb_mode = width_field, height_field, thumb_sizes, thumb_mode
         FileField.__init__(self, verbose_name, name, **kwargs)
 
     def get_manipulator_field_objs(self):

parts/media/photos.py

@@ -1 @@
-import re
+from django.core import meta
+import re, os
 
+def get_thumbnail_path(photo_path, width, sep=os.path.sep):
+    bits = photo_path.split(sep)
+    bits[-1] = re.sub(r'(?i)\.(gif|jpg|png)$', '_t%s.\\1' % width, bits[-1])
+    return sep.join(bits)
+
 def get_thumbnail_url(photo_url, width):
-    bits = photo_url.split('/')
-    bits[-1] = re.sub(r'(?i)\.(gif|jpg)$', '_t%s.\\1' % width, bits[-1])
-    return '/'.join(bits)
+    return get_thumbnail_path(photo_url, width, '/')
+
+def generate_thumbnail(photo_path, size, mode):
+    from PIL import Image
+    im = Image.open(photo_path)
+    thumb_path = get_thumbnail_path(photo_path, str(size))
+    thumb_size = (size, size)
+    if mode == meta.WIDTH:
+        thumb_size = (size, 9999)
+    elif mode == meta.HEIGHT:
+        thumb_size = (9999, size)
+    im.thumbnail(thumb_size, Image.ANTIALIAS)
+    im.save(thumb_path)