Changeset 6035

Timestamp:

10 May 2011, 22:24:37 (14 years ago)

Author:

uli

Message:

Fix image widget: file setters/getters should return
WAeUPImageFile objects and not HurryFiles?.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/image/browser/widget.py (modified) (5 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/image/browser/widget.py

@@ -22 +22 @@
 """Image file widgets.
 """
-from hurry.file import HurryFile
+from waeup.sirp.image import WAeUPImageFile
 from hurry.file.browser.widget import (
     FileWidgetBase, EncodingFileWidget, DownloadWidget,
@@ -28 +28 @@
 from zope.app.form.browser.textwidgets import escape
 from zope.app.form.browser.widget import renderElement
+from zope.app.form.interfaces import ConversionError
+
 
 class EncodingImageFileWidget(EncodingFileWidget):
     """A hurry.file widget that stores images.
+
+    This is an upload widget suitable for edit forms and the like.
     """
     #: We can set a basename for the image to be rendered.
     #: This will result in <img> links like <img src='.../<basename>.jpg' />
     image_basename = None
-    
+
+    def _toFieldValue(self, (input, file_id)):
+       # we got no file upload input
+        if not input:
+            # if we got a file_id, then retrieve file and return it
+            if file_id:
+                return self._retrieveFile(file_id)
+            # no file upload input nor file id, so return missing value
+            return self.context.missing_value
+        # read in file from input
+        try:
+            seek = input.seek
+            read = input.read
+        except AttributeError, e:
+            raise ConversionError('Form input is not a file object', e)
+
+        seek(0)
+        data = read()
+
+        if data:
+            return WAeUPImageFile(input.filename, data)
+        else:
+            return self.context.missing_value
+
     def __call__(self):
         # The base widget renders the actual image as filename. We
@@ -52 +79 @@
         # Append the rendering as delivered from the base widget.
         result += super(EncodingImageFileWidget, self).__call__()
-        #import pdb; pdb.set_trace()
         return result
 
@@ -61 +87 @@
         return data.encode('base64')[:-1]
 
+    def _retrieveFile(self, file_id):
+        data = file_id.decode('base64')
+        filename, filedata = data.split('\n', 1)
+        return WAeUPImageFile(filename, filedata)
+
 class ThumbnailWidget(DownloadWidget):
     """An image file widget that displays the data as thumbnail.
+
+    XXX: give some reason to name this a _thumbnail_ widget.
     """
 
@@ -79 +112 @@
             src=filename,
             contents=None)
-