Changeset 8448

Timestamp:

14 May 2012, 14:29:02 (12 years ago)

Author:

uli

Message:

Distribute student media files over folders with chronological names, max. 1000 studs per folder.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• student.py (modified) (5 diffs)
• tests/test_student.py (modified) (4 diffs)

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

@@ -20 +20 @@
 """
 import os
+import re
 import shutil
 import grok
@@ -40 +41 @@
 from waeup.kofa.students.utils import generate_student_id
 from waeup.kofa.utils.helpers import attrs_to_fields, now, copy_filesystem_tree
+
+RE_STUDID_NON_NUM = re.compile('[^\d]+')
 
 class Student(grok.Container):
@@ -179 +182 @@
     return
 
+def path_from_studid(student_id):
+    """Convert a student_id into a predictable relative folder path.
+
+    Used for storing files.
+
+    Returns the name of folder in which files for a particular student
+    should be stored. This is a relative path, relative to any general
+    students folder.
+
+    For instance ``K1000000`` will give ``01000/K1000000`` and
+    ``KM123456`` will result in ``00123/KM123456``.
+    """
+    # remove all non numeric characters and turn this into an int.
+    num = int(RE_STUDID_NON_NUM.sub('', student_id))
+    # store max. of 1000 studs per folder
+    folder_name = u'%05d' % (num / 1000)
+    folder_name = os.path.join(folder_name, student_id)
+    return folder_name
+
 def move_student_files(student, del_dir):
     """Move files belonging to `student` to `del_dir`.
@@ -192 +214 @@
 
     src = getUtility(IExtFileStore).root
-    src = os.path.join(src, 'students', stud_id[0], stud_id)
-
-    dst = os.path.join(del_dir, 'media', 'students', stud_id[0], stud_id)
+    src = os.path.join(src, 'students', path_from_studid(stud_id))
+
+    dst = os.path.join(
+        del_dir, 'media', 'students', path_from_studid(stud_id))
 
     if not os.path.isdir(src):
@@ -336 +359 @@
         basename, ext = os.path.splitext(attr)
         stud_id = self.context.student_id
-        marked_filename = '__%s__%s/%s/%s_%s%s' % (
-            STUDENT_FILE_STORE_NAME, stud_id[0], stud_id, basename,
+        marked_filename = '__%s__%s/%s_%s%s' % (
+            STUDENT_FILE_STORE_NAME, path_from_studid(stud_id), basename,
             stud_id, ext)
         return marked_filename

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py

@@ -20 +20 @@
 import os
 import re
+import unittest
 from cStringIO import StringIO
 from datetime import tzinfo
@@ -28 +29 @@
 from waeup.kofa.students.export import EXPORTER_NAMES
 from waeup.kofa.students.student import (
-    Student, StudentFactory, handle_student_removed)
+    Student, StudentFactory, handle_student_removed, path_from_studid)
 from waeup.kofa.students.studycourse import StudentStudyCourse
 from waeup.kofa.students.studylevel import StudentStudyLevel, CourseTicket
@@ -39 +40 @@
 from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
 from waeup.kofa.university.department import Department
+
+class HelperTests(unittest.TestCase):
+    # Tests for helper functions in student module.
+
+    def test_path_from_studid(self):
+        # make sure we get predictable paths from student ids.
+        self.assertEqual(
+            path_from_studid('K1000000'), u'01000/K1000000')
+        self.assertEqual(
+            path_from_studid('KM123456'), u'00123/KM123456')
+        return
 
 class StudentTest(FunctionalTestCase):
@@ -121 +133 @@
         del_dir = self.app['datacenter'].deleted_path
         del_img_path = os.path.join(
-            del_dir, 'media', 'students', 'A', 'A111111',
+            del_dir, 'media', 'students', '00111', 'A111111',
             'passport_A111111.jpg')