Changeset 3807

Timestamp:

8 Dec 2008, 16:12:01 (16 years ago)

Author:

Henrik Bettermann

Message:

resolve ticket #589 part 2

File:

• WAeUP_SRP/trunk/WAeUPTool.py (modified) (4 diffs)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -1229 +1229 @@
     def removePictureFolder(self,student_id):
         """remove picture_folder by renaming it"""
-        path = 'images'
-        picture_path = os.path.join(i_home,path,student_id)
-        if not os.path.exists(picture_path):
+        picture_path = getImagesDir(student_id)
+        dest_path = os.path.join("%s" % images_base,'removed',student_id)
+        dest_path = dest_path + "_removed"
+        if os.path.exists(dest_path) or not os.path.exists(picture_path):
             return False
-        os.rename(picture_path,picture_path + "_removed")
+        os.rename(picture_path,dest_path)
         return True
     ###)
@@ -1240 +1241 @@
     def restorePictureFolder(self,student_id):
         """restore picture_folder by renaming it"""
-        path = 'images'
-        picture_path = os.path.join(i_home,path,student_id)
-        if not os.path.exists(picture_path + "_removed"):
-            return False
+        picture_path = getImagesDir(student_id)
+        orig_path = os.path.join("%s" % images_base,'removed',student_id)
+        orig_path = orig_path + "_removed"
+        if os.path.exists(picture_path) or not os.path.exists(orig_path):
+            return False        
         os.rename(picture_path + "_removed",picture_path)
         return True
@@ -1264 +1266 @@
     
     
-    security.declareProtected(ModifyPortalContent,'findUnusedImageFolders') ###(
-    def findUnusedImageFolders(self):
+    security.declareProtected(ModifyPortalContent,'removeUnusedImageFolders') ###(
+    def removeUnusedImageFolders(self):
         """check if an unused image folders exists in the filesystem"""
-
+        mtool = self.portal_membership
+        member = mtool.getAuthenticatedMember()
+        member_id = str(member)
+        logger = logging.getLogger('WAeUPTool.removeUnusedImageFolders')
         abc = os.listdir(images_base)
         ifolders = []
@@ -1274 +1279 @@
             ifolders.extend(os.listdir(picture_path))
         unused_ids = []
-        used_ids = []
         for id in ifolders:
             res = self.students_catalog(id=id)
             if not res:
                 unused_ids.append(id)
-            else:
-                used_ids.append(id)
-        return unused_ids
+                #import pdb;pdb.set_trace()    
+                if not id.endswith('removed'):
+                    removed = self.waeup_tool.removePictureFolder(id)  
+                    if removed:
+                        logger.info('%s: image folder %s successfully removed' % (member_id,id))
+                    else:
+                        logger.info('%s: image folder %s could not be removed' % (member_id,id))
+        return
         
     ###)