Changeset 7105

Timestamp:

13 Nov 2011, 17:50:26 (13 years ago)

Author:

Henrik Bettermann

Message:

Undo r7102 and r7103.

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) (6 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, ext=None):
+    def chooseName(self, name=None, attr=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, ext=None):
+    def chooseName(self, name, attr=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` and the `ext` params
-        are not taken into account here.
+        is valid or ``unknown_file`` else. The `attr` param is not
+        taken into account here.
         """
         if self.checkName(name):
@@ -344 +344 @@
         return fd
 
-    def getFileByContext(self, context, attr=None, ext=None):
+    def getFileByContext(self, context, attr=None):
         """Get a file for given context.
 
@@ -355 +355 @@
         id for the context and `attr` given.
 
-        `context`, `attr` and `ext` are used to find (`context`)
+        Both, `context` and `attr` are used to find (`context`)
         and feed (`attr`) an appropriate file name chooser.
 
@@ -364 +364 @@
                      :class:`DefaultFileStoreHandler`.
         """
-        file_id = IFileStoreNameChooser(context).chooseName(attr=attr, ext=ext)
+        file_id = IFileStoreNameChooser(context).chooseName(attr=attr)
         return self.getFile(file_id)
 
@@ -378 +378 @@
         return
 
-    def deleteFileByContext(self, context, attr=None, ext=None):
+    def deleteFileByContext(self, context, attr=None):
         """Remove file identified by `context` and `attr` if it exists.
 
@@ -385 +385 @@
         id for the context and `attr` given.
 
-        `context`, `attr` and `ext` are used to find (`context`)
+        Both, `context` and `attr` are used to find (`context`)
         and feed (`attr`) an appropriate file name chooser.
 
@@ -395 +395 @@
 
         """
-        file_id = IFileStoreNameChooser(context).chooseName(attr=attr, ext=ext)
+        file_id = IFileStoreNameChooser(context).chooseName(attr=attr)
         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, ext=u''):
+    def chooseName(self, name=None, attr=None):
         """Get a valid file id for student context.
 
         *Example:*
 
-        For a student with student id ``'A123456'``,
-        with attr ``'nice_image'`` and an uploaded file named
-        `'anybasename.JPG'`` to be stored in
+        For a student with student id ``'A123456'`` and
+        with attr ``'nice_image'`` stored in
         the students container this chooser would create:
 
@@ -195 +194 @@
 
         """
-        if name and name.count('.') == 1:
-            basename, ext = os.path.splitext(name)
-            ext.lower()
         stud_id = self.context.student_id
-        marked_filename = '__%s__%s/%s/%s_%s%s' % (
-            STUDENT_FILE_STORE_NAME, stud_id[0], stud_id, attr, stud_id, ext)
+        marked_filename = '__%s__%s/%s/%s_%s.jpg' % (
+            STUDENT_FILE_STORE_NAME, stud_id[0], stud_id, attr, stud_id)
         return marked_filename
 

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

@@ -198 +198 @@
         return self.view.application_url() + rel_link
 
-def handle_file_upload(upload, context, view, max_size, attr=None):
+def handle_img_upload(upload, context, view, max_size, attr=None):
     """Handle upload of applicant image.
 
@@ -212 +212 @@
     upload.seek(0) # file pointer moved when determining size
     store = getUtility(IExtFileStore)
-    file_id = IFileStoreNameChooser(
-        context).chooseName(attr=attr, name=upload.filename)
+    file_id = IFileStoreNameChooser(context).chooseName(attr=attr)
     store.createFile(file_id, upload)
     return True
@@ -253 +252 @@
         if upload:
             # We got a fresh upload
-            file_changed = handle_file_upload(
+            file_changed = handle_img_upload(
                 upload, self.context, self.view, self.mus, self.attr)
             if file_changed is False:  # False is not None!
@@ -288 +287 @@
     grok.baseclass()
     attr = None
-    ext = u'.jpg'
 
     def render(self):
@@ -294 +292 @@
         # for file storage.
         image = getUtility(IExtFileStore).getFileByContext(
-            self.context, attr=self.attr, ext=self.ext)
+            self.context, attr=self.attr)
         self.response.setHeader(
             'Content-Type', 'image/jpeg')
@@ -307 +305 @@
     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, ext=None):
+    def chooseName(self, name=None, attr=None):
         # this name chooser returns different file ids depending on
         # the `attr` parameter, a simple string.