Changeset 7103

Timestamp:

13 Nov 2011, 10:22:25 (13 years ago)

Author:

Henrik Bettermann

Message:

File name choosers generally don't know the extension of the file stored. So we have to feed the chooseName method with the extension (ext) of the file stored in the file system.

This may conflict somehow with the idea behind the file name chooser. I think you (Uli) intended to use only the attr parameter to select a proper extension. In my opinion it's better to use attr and ext.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• applicants/applicant.py (modified) (1 diff)
• imagestorage.py (modified) (8 diffs)
• students/student.py (modified) (2 diffs)
• students/viewlets.py (modified) (3 diffs)
• tests/test_imagestorage.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicant.py

@@ -146 +146 @@
         return name == self.chooseName()
 
-    def chooseName(self, name=None, attr=None):
+    def chooseName(self, name=None, attr=None, ext=None):
         """Get a valid file id for applicant context.
 

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

@@ -223 +223 @@
         return False
 
-    def chooseName(self, name, attr=None):
+    def chooseName(self, name, attr=None, ext=None):
         """Choose a unique valid file id for the object.
 
@@ -233 +233 @@
 
         For this default name chooser we return the given name if it
-        is valid or ``unknown_file`` else. The `attr` param is not
-        taken into account here.
+        is valid or ``unknown_file`` else. The `attr` and the `ext` params
+        are not taken into account here.
         """
         if self.checkName(name):
@@ -344 +344 @@
         return fd
 
-    def getFileByContext(self, context, attr=None):
+    def getFileByContext(self, context, attr=None, ext=None):
         """Get a file for given context.
 
@@ -355 +355 @@
         id for the context and `attr` given.
 
-        Both, `context` and `attr` are used to find (`context`)
+        `context`, `attr` and `ext` are used to find (`context`)
         and feed (`attr`) an appropriate file name chooser.
 
@@ -364 +364 @@
                      :class:`DefaultFileStoreHandler`.
         """
-        file_id = IFileStoreNameChooser(context).chooseName(attr=attr)
+        file_id = IFileStoreNameChooser(context).chooseName(attr=attr, ext=ext)
         return self.getFile(file_id)
 
@@ -378 +378 @@
         return
 
-    def deleteFileByContext(self, context, attr=None):
+    def deleteFileByContext(self, context, attr=None, ext=None):
         """Remove file identified by `context` and `attr` if it exists.
 
@@ -385 +385 @@
         id for the context and `attr` given.
 
-        Both, `context` and `attr` are used to find (`context`)
+        `context`, `attr` and `ext` are used to find (`context`)
         and feed (`attr`) an appropriate file name chooser.
 
@@ -395 +395 @@
 
         """
-        file_id = IFileStoreNameChooser(context).chooseName(attr=attr)
+        file_id = IFileStoreNameChooser(context).chooseName(attr=attr, ext=ext)
         return self.deleteFile(file_id)
 

main/waeup.sirp/trunk/src/waeup/sirp/students/student.py

@@ -177 +177 @@
         return name == self.chooseName()
 
-    def chooseName(self, name=None, attr=None):
+    def chooseName(self, name=None, attr=None, ext=u''):
         """Get a valid file id for student context.
 
@@ -195 +195 @@
 
         """
-        ext = u''
         if name and name.count('.') == 1:
             basename, ext = os.path.splitext(name)
-        ext.lower()
+            ext.lower()
         stud_id = self.context.student_id
         marked_filename = '__%s__%s/%s/%s_%s%s' % (

main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py

@@ -288 +288 @@
     grok.baseclass()
     attr = None
+    ext = u'.jpg'
 
     def render(self):
@@ -293 +294 @@
         # for file storage.
         image = getUtility(IExtFileStore).getFileByContext(
-            self.context, attr=self.attr)
+            self.context, attr=self.attr, ext=self.ext)
         self.response.setHeader(
             'Content-Type', 'image/jpeg')
@@ -306 +307 @@
     grok.name('birth_certificate.jpg')
     attr = u'birth_certificate'
+    ext = u'.jpg'

main/waeup.sirp/trunk/src/waeup/sirp/tests/test_imagestorage.py

@@ -158 +158 @@
         self.context = context
 
-    def chooseName(self, name=None, attr=None):
+    def chooseName(self, name=None, attr=None, ext=None):
         # this name chooser returns different file ids depending on
         # the `attr` parameter, a simple string.