loadPhoto(), renamePatient(patient,fN,lN), renamePhoto partially done

src/database/fs.py

@@ -633,3 +633,57 @@ def loadPhotosetTreatments(self, photoset):
             # TODO: error codes
             print("could not access: " + directory) 
             return None
+
+    def loadPhoto(self, photo):
+        """
+            Loads the actual photo.
+
+            Arguments:
+                photo: The photo object who's data we want.
+
+            Returns:
+                The image data for the photo.
+
+            Throws:
+                IOError
+                ?
+        """
+        directory = self.generatePhotosetDir(photo.photoset)
+        if os.path.isdir(directory):
+            f = open(directory + photo.name)
+            data = f.read()
+
+            return data
+
+    def renamePatient(self, patient, firstName, lastName):
+        uid = patient.uid
+        fromDirectory = self.generatePatientDir(patient)
+        toDirectory = self.root + "/" + lastName + ", " + firstName + "#" + str(uid)
+
+        if os.path.isdir(toDirectory):
+            raise Exception
+
+        shutil.copytree(fromDirectory, toDirectory)
+
+        shutil.rmtree(fromDirectory)
+
+
+    def renamePhoto(self, photo, name):
+        """
+            Renames a photo in the filesystem.
+
+            Arguments:
+                photo: The photo object we want to rename.
+                name:  The new name.
+
+            Returns:
+                N/A
+
+            Throws:
+                Error
+        """
+        directory = self.generatePhotosetDir(photo.photoset)
+        if os.path.isdir(directory):
+            shutil.copy(directory + "/" + photo.name, directory + "/" + name)
+            #shutil.rm
+

src/database/patientstorage.py

@@ -142,11 +142,12 @@ def createPatient(self, firstName, lastName, physicians):
         self.fsm.addPhysicians(patient, physicians)
         return patient
 
-    def editName(self, firstName, lastName):
+    def editName(self, patient, firstName, lastName):
         """
             Changes the name of a patient and adjusts it's database entries.
 
             Arguments:
+            
                 firstName: The first name of the patient.
                 lastName:  The last name of the patient.
 
@@ -157,7 +158,7 @@ def editName(self, firstName, lastName):
                 ?
         """
         if not self.checkNewFS():
-            pass
+            self.fsm.renamePatient(patient, firstName, lastName) 
 
     def editPhysicians(self, patient, physicians):
         """

src/database/photostorage.py

@@ -21,12 +21,12 @@ def __init__(self, dbm, fsm):
         self.dbm = dbm
         self.fsm = fsm
 
-    def getPhotoData(self, phot):
-        pass
+    def getPhotoData(self, photo):
+        return self.fsm.getPhoto(photo)
 
-    def renamePhoto(self, phot, toName):
+    def renamePhoto(self, photo, toName):
         pass
 
-    def movePhoto(self, phot, toPhotoset):
+    def movePhoto(self, photo, toPhotoset):
         pass