[Collective-checkins] r18275 - in ATPhoto/trunk: . Extensions model transforms

[jfroche <svn...@pl...>]

Author: jfroche
Date: Sat Jan 21 11:01:58 2006
New Revision: 18275

Modified:
   ATPhoto/trunk/ATPhoto.py
   ATPhoto/trunk/ATPhotoAlbum.py
   ATPhoto/trunk/Extensions/AppInstall.py
   ATPhoto/trunk/configure.zcml
   ATPhoto/trunk/model/ATPhoto.zuml
   ATPhoto/trunk/transforms/PILTransforms.py
   ATPhoto/trunk/transforms/image_to_jpeg.py
Log:
Fixed Issue 1, 2, 3, 4, 5
See http://plone.org/products/atphoto/issues for more info



Modified: ATPhoto/trunk/ATPhoto.py
==============================================================================
--- ATPhoto/trunk/ATPhoto.py	(original)
+++ ATPhoto/trunk/ATPhoto.py	Sat Jan 21 11:01:58 2006
@@ -114,6 +114,7 @@
 
 
 ##code-section after-schema #fill in your manual code here
+ATPhoto_schema['title'].required = 0
 ##/code-section after-schema
 
 class ATPhoto(ATPhotoTransform,FlickrExportable,ATImage):

Modified: ATPhoto/trunk/ATPhotoAlbum.py
==============================================================================
--- ATPhoto/trunk/ATPhotoAlbum.py	(original)
+++ ATPhoto/trunk/ATPhotoAlbum.py	Sat Jan 21 11:01:58 2006
@@ -189,7 +189,8 @@
             photos = flick.getSetPhotos(photoSetId)
             count = 0
             for photo in photos:
-                self.invokeFactory('ATPhoto',photo['id'],RESPONSE=None)
+                if(photo['id'] not in self.objectIds()):
+                    self.invokeFactory('ATPhoto',photo['id'],RESPONSE=None)
                 atphoto = getattr(self,photo['id'])
                 atphoto.setImage(StringIO( photo['data']))
                 atphoto.setTitle(photo['title'])
@@ -198,7 +199,7 @@
         else:
             msg = 'Not Authenticated!'
         if(REQUEST):
-            url = "%s/atphotoalbum_export?portal_status_message=" % self.absolute_url()
+            url = "%s/view?portal_status_message=" % self.absolute_url()
             target = "%s%s" % (url,msg)
             REQUEST.RESPONSE.redirect(target)
         else:
@@ -261,9 +262,10 @@
         file_list = {}
         for filename in zip.namelist():
             path,newfilename = os.path.split(filename)
-            data = zip.read(filename)
-            if(len(data)):
-                file_list[newfilename] = data
+            if newfilename[:2] != '._': ## Avoid to import OSX files
+                data = zip.read(filename)
+                if(len(data)):
+                    file_list[newfilename] = data
         return file_list
 
 
@@ -282,7 +284,7 @@
             tar = tarfile.open(mode="r|bz2",fileobj=tarFile)
         for filename in tar:
             path,newfilename = os.path.split(filename.name)
-            if(filename.isfile()):
+            if(filename.isfile() and newfilename[:2] != '._'):
                 data = tar.extractfile(filename)
                 file_list[newfilename] = data.read()
         return file_list

Modified: ATPhoto/trunk/Extensions/AppInstall.py
==============================================================================
--- ATPhoto/trunk/Extensions/AppInstall.py	(original)
+++ ATPhoto/trunk/Extensions/AppInstall.py	Sat Jan 21 11:01:58 2006
@@ -120,9 +120,10 @@
 
 
     # register in content type registry
-    pr = getToolByName(self, 'content_type_registry')
-    pr.updatePredicate(predicate=pr.getPredicate('image'),predicate_id='image',typeObjectName='ATPhoto')
-#    pr.updatePredicate(predicate=pr.getPredicate('ATImage_ext'),predicate_id='ATImage_ext',typeObjectName='ATPhoto')
+
+    #pr = getToolByName(self, 'content_type_registry')
+    #pr.updatePredicate(predicate=pr.getPredicate('image'),predicate_id='image',typeObjectName='ATPhoto')
+    #pr.updatePredicate(predicate=pr.getPredicate('ATImage_ext'),predicate_id='ATImage_ext',typeObjectName='ATPhoto')
 
 
 

Modified: ATPhoto/trunk/configure.zcml
==============================================================================
--- ATPhoto/trunk/configure.zcml	(original)
+++ ATPhoto/trunk/configure.zcml	Sat Jan 21 11:01:58 2006
@@ -67,6 +67,15 @@
     permission="zope2.View"
     />
 
+
+  <browser:page
+    for=".interfaces.IPhoto"
+    name="getZipFile"
+    class=".browser.ZipView"
+    attribute="getZipFile"
+    permission="zope2.View"
+    />
+
   <browser:page
     for=".interfaces.IPhotoAlbum"
     name="sortById"

Modified: ATPhoto/trunk/model/ATPhoto.zuml
==============================================================================
Binary files. No diff available.

Modified: ATPhoto/trunk/transforms/PILTransforms.py
==============================================================================
--- ATPhoto/trunk/transforms/PILTransforms.py	(original)
+++ ATPhoto/trunk/transforms/PILTransforms.py	Sat Jan 21 11:01:58 2006
@@ -20,6 +20,9 @@
         if(kwargs.has_key('height')):
             newheight = kwargs['height']
         pil_img = PIL.Image.open(orig)
+        if(self.format == 'jpeg'):
+            pil_img.draft("RGB", pil_img.size)
+            pil_img = pil_img.convert("RGB")
         if(newwidth or newheight):
             pil_img.thumbnail((newwidth,newheight),PIL.Image.ANTIALIAS)
         pil_img.save(imgio,self.format)

Modified: ATPhoto/trunk/transforms/image_to_jpeg.py
==============================================================================
--- ATPhoto/trunk/transforms/image_to_jpeg.py	(original)
+++ ATPhoto/trunk/transforms/image_to_jpeg.py	Sat Jan 21 11:01:58 2006
@@ -4,7 +4,7 @@
     __name__  = "image_to_jpeg"
     inputs    = ('image/*', )
     output   = 'image/jpeg'
-    format  = 'jpg'
+    format  = 'jpeg'
 
 
 def register():