Changeset 1007 for CMESS/mediaplayer/branches

Timestamp:

06.05.2010 15:39:05 (2 years ago)

Author:

mhallbauer

Message:

1.0.2

• bugfix: processing other file-extensions than .jpg

File:

• CMESS/mediaplayer/branches/zmsgraphic_extedit/zmsgraphic_extedit.metaobj.xml (modified) (6 diffs)

CMESS/mediaplayer/branches/zmsgraphic_extedit/zmsgraphic_extedit.metaobj.xml

@@ -2043 +2043 @@
 
 def recreateImages(dest_folder, img_info, is_gallery = False):
+        def setInfo(dest_dict, source_list):
+                dest_dict['filename'] = source_list[0]
+                dest_dict['height']             = source_list[2]
+                dest_dict['width']              = source_list[1]
+                
+                return dest_dict
+        
         def doTranspose(image_dict, action_list):
                 if (len(action_list) > 0):
                         if (image_dict['imgsuperres'] is not None):
-                                context.ZMSGraphic_extEdit_transpose(dest_folder, temp_image_dict['imgsuperres']['filename'], action_list, replace_source = True)
+                                image_dict['imgsuperres'] = setInfo(image_dict['imgsuperres'], context.ZMSGraphic_extEdit_transpose(dest_folder, temp_image_dict['imgsuperres']['filename'], action_list, replace_source = True))
                         if (image_dict['imghires'] is not None):
-                                context.ZMSGraphic_extEdit_transpose(dest_folder, temp_image_dict['imghires']['filename'], action_list, replace_source = True)
+                                image_dict['imghires'] = setInfo(image_dict['imghires'], context.ZMSGraphic_extEdit_transpose(dest_folder, temp_image_dict['imghires']['filename'], action_list, replace_source = True))
+                                
+                return image_dict
                         
         # delete temp-images
@@ -2100 +2109 @@
                                         temp_action_list.append(1)
                                 elif (temp_action == 'resize'):
-                                        doTranspose(temp_image_dict, temp_action_list)
+                                        temp_image_dict = doTranspose(temp_image_dict, temp_action_list)
                                         # resize image  
                                         temp_size = img_info['queue'][i]['value'].split(',')
-                                        context.ZMSGraphic_extEdit_resize(dest_folder, temp_image_dict['imghires']['filename'], int (temp_size[0]), int (temp_size[1]), replace_source = True)
+                                        temp_image_dict['imghires'] = setInfo(temp_image_dict['imghires'], context.ZMSGraphic_extEdit_resize(dest_folder, temp_image_dict['imghires']['filename'], int (temp_size[0]), int (temp_size[1]), replace_source = True))
                                         # reset action-list
                                         temp_action_list = []
                         
-                        doTranspose(temp_image_dict, temp_action_list)
+                        temp_image_dict = doTranspose(temp_image_dict, temp_action_list)
                 # create thumb                  
                 if (img_info['thumb']['crop_box'] != 'null'):
@@ -2116 +2125 @@
                         temp_image_dict['img']['height']                = temp_info[2]
                         temp_image_dict['img']['width']                 = temp_info[1]
-                        
+                
                 if (temp_image_dict['img'] is None):
                         context.setObjProperty('img', None)
@@ -2154 +2163 @@
                 recreateImages(temp_folder, optimizeQueue(context.parseXmlString(REQUEST.get('img_info', None))), temp_is_gallery)
                 
-                clearGarbage(temp_folder)
+                #clearGarbage(temp_folder)
                 
                 REQUEST.RESPONSE.redirect('%s/manage_main?lang=%s&manage_lang=%s'%(context.aq_parent.absolute_url(), temp_lang, temp_lang))
@@ -2249 +2258 @@
 <item key="name"><![CDATA[ZMSGraphic_extEdit]]></item>
 <item key="package"><![CDATA[com.zms.zmsgraphic_extedit]]></item>
-<item key="revision"><![CDATA[1.0.1]]></item>
+<item key="revision"><![CDATA[1.0.2]]></item>
 <item key="type"><![CDATA[ZMSLibrary]]></item>
 </dictionary>
@@ -2280 +2289 @@
 <item key="name"><![CDATA[com.zms.extensions]]></item>
 <item key="package"/>
-<item key="revision"><![CDATA[1.0.1]]></item>
+<item key="revision"><![CDATA[1.0.2]]></item>
 <item key="type"><![CDATA[ZMSPackage]]></item>
 </dictionary>