Changeset 129

Timestamp:

02/06/10 23:32:29 (6 months ago)

Author:

max

Message:

Added ability to upload zip file of images to create (or add to an existing) gallery.

Location:

trunk/courant/core/media

Files:

• admin.py (modified) (7 diffs)
• models.py (modified) (18 diffs)

trunk/courant/core/media/admin.py

@@ -34 +34 @@
         }),
     )
-    
+
     inlines = [
         MediaBylineInline,
@@ -47 +47 @@
         }),
         ("Image", {
-            'fields': ('image',) 
+            'fields': ('image',)
         }),
         ("Tags", {
@@ -66 +66 @@
         }),
         ("Details", {
-            'fields': ('url','image') 
+            'fields': ('url','image')
         }),
         ("Tags", {
@@ -85 +85 @@
         }),
         ("Details", {
-            'fields': ('file',) 
+            'fields': ('file',)
         }),
         ("Tags", {
@@ -102 +102 @@
     raw_id_fields = ('media_item',)
     fk_name = 'gallery'
-    
+
 class GalleryAdmin(MediaAdmin):
     list_filter = ['created_at']
@@ -111 +111 @@
 admin.site.register(Gallery, GalleryAdmin)
 
+class GalleryUploadAdmin(admin.ModelAdmin):
+    raw_id_fields = ('staffer',)
+    def has_change_permission(self, request, obj=None):
+        return False # To remove the 'Save and continue editing' button
+admin.site.register(GalleryUpload, GalleryUploadAdmin)
+
+
 class FileAdmin(MediaAdmin):
     list_filter = ['created_at']
@@ -118 +125 @@
         }),
         ("File", {
-            'fields': ('file','image','width','height') 
+            'fields': ('file','image','width','height')
         }),
         ("Tags", {

trunk/courant/core/media/models.py

@@ -4 +4 @@
 from django.conf import settings
 from django.core.cache import cache
+from django.template.defaultfilters import slugify
+from django.core.files.base import ContentFile
 
 from courant.core.staff.models import Staffer, ContentByline
@@ -15 +17 @@
 from django_extensions.db.fields import CreationDateTimeField, ModificationDateTimeField
 
-from courant.core.media.utils import get_file_path, get_storage_path, get_image_path
+from courant.core.media.utils import get_file_path, get_storage_path, get_image_path, get_temp_file_path
 
 from sorl.thumbnail.main import DjangoThumbnail
@@ -24 +26 @@
 import urllib
 import os
+import zipfile
+
+try:
+    import Image
+except ImportError:
+    try:
+        from PIL import Image
+    except ImportError:
+        raise ImportError('Courant was unable to import the Python Imaging Library. Please confirm it`s installed and available on your current Python path.')
+
 
 class MediaFolder(models.Model):
@@ -32 +44 @@
     name = models.CharField(max_length=255)
     parent = models.ForeignKey('self', null=True, blank=True, related_name='children')
-    
+
     def __unicode__(self):
         return "%s/%s" % ('/'.join(self.get_ancestors().values_list('name', flat=True)), self.name)
@@ -68 +80 @@
                                      limit_choices_to={'app_label': 'media'},
                                      editable=False, null=True)
-    
+
     staffers = models.ManyToManyField(Staffer, through='MediaByline', related_name='media')
     staffers_override = models.CharField(max_length=255, blank=True,
@@ -78 +90 @@
                                                       associations, esp. for one-off \
                                                       contributors.")
-    
+
     slug = models.SlugField()
-    
+
     created_at = CreationDateTimeField()
     modified_at = ModificationDateTimeField()
     published_at = models.DateTimeField()
-    
+
     tags = TagField()
-    
+
     def default_comment_option():
         try:
@@ -98 +110 @@
 
     comment_options = models.ForeignKey(CommentOptions, null=True, default=default_comment_option)
-    
-    objects = SubclassManager()
-    
-    class Meta:
-        ordering = ["-created_at"]
-        get_latest_by = "-created_at"
-    
+
+    objects = SubclassManager()
+
+    class Meta:
+        ordering = ["-created_at"]
+        get_latest_by = "-created_at"
+
     def __unicode__(self):
         return "Media: %s" % self.name
-    
+
     def save(self, *args, **kwargs):
         if(not self.content_type):
             self.content_type = ContentType.objects.get_for_model(self.__class__)
         self.save_base(*args, **kwargs)
-        
+
     @models.permalink
     def get_absolute_url(self):
@@ -131 +143 @@
             return self
         return model.objects.get(id=self.id)
-        
+
     def admin_thumbnail(self):
         """
@@ -153 +165 @@
     """
     media_item = models.ForeignKey(MediaItem)
-    
+
 class ContentMedia(models.Model):
     """
@@ -161 +173 @@
     media_item = models.ForeignKey(MediaItem)
     order = models.PositiveSmallIntegerField()
-    
+
     class Meta:
         abstract = True
         ordering = ['order']
-    
+
 class Photo(MediaItem):
     """
@@ -171 +183 @@
     """
     image = models.ImageField(_('image'), upload_to=get_storage_path)
-    
-    objects = SubclassManager()
-    
-    class Meta:
-        ordering = ["-created_at"]
-        get_latest_by = "-created_at"
-        
+
+    objects = SubclassManager()
+
+    class Meta:
+        ordering = ["-created_at"]
+        get_latest_by = "-created_at"
+
     def __unicode__(self):
         return u"Photo: %s" % self.name
-    
+
     def thumbnail(self):
         return self.image
@@ -195 +207 @@
     image = models.ImageField("Thumbnail", upload_to=get_storage_path, blank=True,
                               help_text="Leave blank to automatically fetch from external service.")
-    
-    objects = SubclassManager()
-    
-    class Meta:
-        ordering = ["-created_at"]
-        get_latest_by = "-created_at"
-        
+
+    objects = SubclassManager()
+
+    class Meta:
+        ordering = ["-created_at"]
+        get_latest_by = "-created_at"
+
     def __unicode__(self):
         return u"Video: %s" % self.name
-    
+
     def save(self, **kwargs):
         if not self.image:
@@ -218 +230 @@
             self.image = filename
         super(Video, self).save(**kwargs)
-        
+
     def thumbnail(self):
         return self.image
@@ -228 +240 @@
     """
     file = models.FileField(upload_to=get_file_path)
-    
-    class Meta:
-        ordering = ["-created_at"]
-        get_latest_by = "-created_at"
-        
+
+    class Meta:
+        ordering = ["-created_at"]
+        get_latest_by = "-created_at"
+
     def __unicode__(self):
         return u"Audio: %s" % self.name
 gettag.register(Audio)
-  
+
 class Gallery(MediaItem):
     """
@@ -244 +256 @@
     media = models.ManyToManyField(MediaItem, through='GalleryMedia',
                                    related_name='galleries', symmetrical=False)
-    
-    objects = SubclassManager()
-    
+
+    objects = SubclassManager()
+
     def __init__(self, *args, **kwargs):
         super(Gallery, self).__init__(*args, **kwargs)
-        
+
         # fetch the first item in the gallery to be used for thumbnail purposes
         try:
@@ -255 +267 @@
         except:
             pass
-    
+
     class Meta:
         verbose_name_plural = 'galleries'
         ordering = ["-created_at"]
         get_latest_by = "-created_at"
-        
+
     def __unicode__(self):
         return u"Gallery: %s" % self.name
-    
+
     def thumbnail(self):
         return self.image
-gettag.register(Gallery)    
+gettag.register(Gallery)
 
 class GalleryMedia(ContentMedia):
@@ -273 +285 @@
     """
     gallery = models.ForeignKey(Gallery, related_name='gallery_media')
-    
+
+"""
+GalleryUpload model originally based on model from django-photologue (r405, February 6, 2010).
+django-photologue is Copyright (c) 2007-2008, Justin C. Driscoll. All rights reserved.
+"""
+class GalleryUpload(models.Model):
+    zip_file = models.FileField(_('images file (.zip)'), upload_to=get_temp_file_path,
+                                help_text=_('Select a .zip file of images to upload into a new Gallery.'))
+    gallery = models.ForeignKey(Gallery, null=True, blank=True, help_text=_('Select a gallery to add these images to. leave this empty to create a new gallery from the supplied title.'))
+    name = models.CharField(max_length=255, help_text=_('All photos in the gallery will be given a name made up of the gallery name + a sequential number.'))
+    caption = models.TextField(help_text=_('Caption will be added to all photos.'))
+    caption_photos = models.BooleanField(default=True, help_text=_('Gallery caption will also be applied to each photo.'))
+    staffer = models.ForeignKey(Staffer)
+    published_at = models.DateTimeField()
+
+    class Meta:
+        verbose_name = _('gallery upload')
+        verbose_name_plural = _('gallery uploads')
+
+    def save(self, *args, **kwargs):
+        super(GalleryUpload, self).save(*args, **kwargs)
+        gallery = self.process_zipfile()
+        super(GalleryUpload, self).delete()
+        return gallery
+
+    def process_zipfile(self):
+        if os.path.isfile(self.zip_file.path):
+            # TODO: implement try-except here
+            zip = zipfile.ZipFile(self.zip_file.path)
+            bad_file = zip.testzip()
+            if bad_file:
+                raise Exception('"%s" in the .zip archive is corrupt.' % bad_file)
+            count = 1
+            if self.gallery:
+                gallery = self.gallery
+            else:
+                gallery = Gallery.objects.create(name=self.name,
+                                                 slug=slugify(self.name),
+                                                 caption=self.caption,
+                                                 published_at=self.published_at)
+
+                MediaByline(media_item=gallery, staffer=self.staffer, order=1).save()
+
+            from cStringIO import StringIO
+            for filename in sorted(zip.namelist()):
+                if filename.startswith('__'): # do not process meta files
+                    continue
+                data = zip.read(filename)
+                if len(data):
+                    try:
+                        # the following is taken from django.newforms.fields.ImageField:
+                        #  load() is the only method that can spot a truncated JPEG,
+                        #  but it cannot be called sanely after verify()
+                        trial_image = Image.open(StringIO(data))
+                        trial_image.load()
+                        # verify() is the only method that can spot a corrupt PNG,
+                        #  but it must be called immediately after the constructor
+                        trial_image = Image.open(StringIO(data))
+                        trial_image.verify()
+                    except Exception, e:
+                        # if a "bad" file is found we just skip it.
+                        assert False, ('Bad file in zip upload', e)
+                        continue
+                    while 1:
+                        name = ' '.join([self.name, str(count)])
+                        slug = slugify(name)
+                        try:
+                            p = Photo.objects.get(slug=slug)
+                        except Photo.DoesNotExist:
+                            photo = Photo(name=name,
+                                          slug=slug,
+                                          published_at=self.published_at)
+                            photo.caption = self.caption if self.caption_photos else ''
+                            photo.image.save(filename, ContentFile(data))
+                            photo.save()
+
+                            MediaByline(media_item=photo, staffer=self.staffer, order=1).save()
+
+                            GalleryMedia(gallery=gallery, media_item=photo, order=count).save()
+                            count = count + 1
+                            break
+                        count = count + 1
+            zip.close()
+            return gallery
+
 class File(MediaItem):
     """
@@ -281 +377 @@
     image = models.ImageField("Thumbnail", upload_to=get_storage_path, blank=True,
                               help_text="Leave blank to generate automatically.")
-    
+
     width = models.PositiveIntegerField(blank=True, null=True, help_text="Only required for certain file types (e.g., SWF)")
     height = models.PositiveIntegerField(blank=True, null=True, help_text="Only required for certain file types (e.g., SWF)")
-    
-    objects = SubclassManager()
-    
-    class Meta:
-        ordering = ["-created_at"]
-        get_latest_by = "-created_at"
-        
+
+    objects = SubclassManager()
+
+    class Meta:
+        ordering = ["-created_at"]
+        get_latest_by = "-created_at"
+
     def thumbnail(self):
         return self.image if self.image else self.file
-    
+
     def extension(self):
         """