Changeset 6309

Timestamp:

9 Jun 2011, 22:18:27 (13 years ago)

Author:

uli

Message:

Change WAeUPImageFile implementation: it now uses a local Blob to
store image data (much more efficient than the up to now used in-ZODB
string). We also do not check for any external filestorages any more.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/image/image.py (modified) (2 diffs)

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

@@ -23 +23 @@
 Components for handling image files.
 """
-from StringIO import StringIO
+import os
+from ZODB.blob import Blob
 from hurry.file import HurryFile
-from hurry.file.interfaces import IFileRetrieval
-from zope.component import queryUtility
 from zope.interface import implements
 from waeup.sirp.image.interfaces import IWAeUPImageFile
@@ -36 +35 @@
     """
     implements(IWAeUPImageFile)
+
+    def __init__(self, filename, data):
+        self.filename = filename
+        self._file = Blob(data)
+        self.headers = {}
+
+    def _getFile(self):
+        return self._file.open('r')
+
+    file = property(_getFile)
+
+    @property
+    def size(self):
+        f = self._file.open('r')
+        size = int(os.fstat(f.fileno()).st_size)
+        f.close()
+        return size
+
+    @property
+    def data(self):
+        f = self._file.open('r')
+        result = f.read()
+        f.close()
+        return result