Changeset 1347 for CMESS/mediaplayer/branches/3.1/com/zms

Timestamp:

01.02.2011 13:55:21 (16 months ago)

Author:

cmeier

Message:

3.1.7

• applied fix for zip archives with subfolders
• ignore hidden files with suffix "." (e.g. in MACOSX in Apples archives)
• allow upload of single image file instead of zip archive

File:

• CMESS/mediaplayer/branches/3.1/com/zms/mediaplayer/mediaplayer.metaobj.xml (modified) (3 diffs)

CMESS/mediaplayer/branches/3.1/com/zms/mediaplayer/mediaplayer.metaobj.xml

@@ -1750 +1750 @@
 
 def getFileList():
-        temp_files = context.getZipArchive(context.getObjProperty('galleryUpload', REQUEST))
-        temp_files = filter(lambda x: x['content_type'].find('image') >= 0, temp_files)
+        temp_file = context.getObjProperty('galleryUpload', REQUEST)
+        
+        if (temp_file.getContentType().find('image') >= 0):
+                temp_files = [{'filename'                               : temp_file.getFilename(),
+                                                                                'data'                                  : str(temp_file.getData()), 
+                                                                                'content_type'  : temp_file.getContentType()}]
+        else:
+                temp_files = context.getZipArchive(context.getObjProperty('galleryUpload', REQUEST))
+                temp_files = filter(lambda x: (not x['isdir']) and (x['content_type'].find('image') >= 0) and (not x['filename'].startswith('.')), temp_files)
         
         return temp_files
@@ -2025 +2032 @@
             <item key="name"><![CDATA[ZMSGallery]]></item>
             <item key="package"><![CDATA[com.zms.mediaplayer]]></item>
-            <item key="revision"><![CDATA[2.1.14]]></item>
+            <item key="revision"><![CDATA[2.1.15]]></item>
             <item key="type"><![CDATA[ZMSObject]]></item>
           </dictionary>
@@ -5187 +5194 @@
             <item key="name"><![CDATA[com.zms.mediaplayer]]></item>
             <item key="package"/>
-            <item key="revision"><![CDATA[3.1.6]]></item>
+            <item key="revision"><![CDATA[3.1.7]]></item>
             <item key="type"><![CDATA[ZMSPackage]]></item>
           </dictionary>