Changeset 7102

Timestamp:

13 Nov 2011, 09:18:36 (13 years ago)

Author:

Henrik Bettermann

Message:

Use given file name extension provided by original uploaded file instead.

Location:

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

Files:

• student.py (modified) (2 diffs)
• viewlets.py (modified) (3 diffs)

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

@@ -182 +182 @@
         *Example:*
 
-        For a student with student id ``'A123456'`` and
-        with attr ``'nice_image'`` stored in
+        For a student with student id ``'A123456'``,
+        with attr ``'nice_image'`` and an uploaded file named
+        `'anybasename.JPG'`` to be stored in
         the students container this chooser would create:
 
@@ -194 +195 @@
 
         """
+        ext = u''
+        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.jpg' % (
-            STUDENT_FILE_STORE_NAME, stud_id[0], stud_id, attr, stud_id)
+        marked_filename = '__%s__%s/%s/%s_%s%s' % (
+            STUDENT_FILE_STORE_NAME, stud_id[0], stud_id, attr, stud_id, ext)
         return marked_filename
 

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

@@ -198 +198 @@
         return self.view.application_url() + rel_link
 
-def handle_img_upload(upload, context, view, max_size, attr=None):
+def handle_file_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)
+    file_id = IFileStoreNameChooser(
+        context).chooseName(attr=attr, name=upload.filename)
     store.createFile(file_id, upload)
     return True
@@ -252 +253 @@
         if upload:
             # We got a fresh upload
-            file_changed = handle_img_upload(
+            file_changed = handle_file_upload(
                 upload, self.context, self.view, self.mus, self.attr)
             if file_changed is False:  # False is not None!