From a2fb80d87294b5fd73a7d22dbc8d44952a0d31b1 Mon Sep 17 00:00:00 2001
From: Julien Lengrand-Lambert <jlengrand@gmail.com>
Date: Thu, 21 Jun 2012 18:38:47 +0200
Subject: [PATCH] Adds output choice feature. mandatory Output folder parameter
 may be removed in the future

---
 Facemoviefier.py       |  4 ++--
 facemovie/Facemovie.py | 24 +++++++++++++++---------
 test/path_test.py      | 16 ++++++++++++++++
 3 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 test/path_test.py

diff --git a/Facemoviefier.py b/Facemoviefier.py
index b7289df..717dd4a 100644
--- a/Facemoviefier.py
+++ b/Facemoviefier.py
@@ -142,10 +142,10 @@ class Facemoviefier():
             self.facemovie.show_faces(1000)
         elif self.args['type'] == 'i':
             print "Saving output images :"
-            self.facemovie.save_faces(self.args['output'])
+            self.facemovie.save_faces()
         elif self.args['type'] == 'v':
             print "Saving output video:"
-            self.facemovie.save_movie(self.args['output'], self.args['speed'])        
+            self.facemovie.save_movie(self.args['speed'])        
 
 if __name__ == '__main__':
     my_job = Facemoviefier()
diff --git a/facemovie/Facemovie.py b/facemovie/Facemovie.py
index 61f66d8..fb58b8a 100644
--- a/facemovie/Facemovie.py
+++ b/facemovie/Facemovie.py
@@ -37,13 +37,14 @@ class FaceMovie(object):
 
         ###checked params
         self.source= in_folder # Source folder for pictures
-        self.out = out_folder # Folder to save outputs
         # Retrieving parameters for Face Detection
         self.face_params = face_params
 
         self.out_path = "./data"
         self.out_name = "output" 
         self.out_format = "avi"
+        # updating the out_folder if needed
+        self.check_out_name(out_folder)
 
         self.sort_method = "name" # sorting by name or using metadata (n or e)
         self.mode = "default" # can be crop or default. 
@@ -251,7 +252,14 @@ class FaceMovie(object):
         self.dims = [wl + wr, ht + hb]                 
         self.center = [wl, ht]
 
-    def save_movie(self, out_folder, speed=2):
+    def get_out_file(self):
+        """
+        Reconstructs the final output file for the movie creation
+        :returns:  String --  The ouput file path to be saved
+        """
+        return os.path.join(self.out_path, (self.out_name + "." + self.out_format))
+
+    def save_movie(self, speed=2):
         """
         Creates a movie with all faces found in the inputs.
         Guy is skipped if no face is found.
@@ -263,8 +271,6 @@ class FaceMovie(object):
         :type fps: int       
         """
 
-        filename = os.path.join(out_folder, self.out_name + "." + self.out_format) # to be refactored
-        # FIXME : Find an unified version
         if "win" in sys.platform:
             fourcc = cv.CV_FOURCC('C', 'V', 'I', 'D')
         else: # some kind of Linux/Unix platform
@@ -274,7 +280,7 @@ class FaceMovie(object):
 
         pace = ["slow", "normal", "fast"]
         print "Speed is set to %s" %(pace[speed - 1])  
-        my_video = cv.CreateVideoWriter(filename, 
+        my_video = cv.CreateVideoWriter(self.get_out_file(), 
                                       fourcc, 
                                       self.speed[speed - 1], 
                                       frameSize,
@@ -305,7 +311,7 @@ class FaceMovie(object):
 
         cv.DestroyWindow(win_name)
 
-    def save_faces(self, out_folder, im_format="png"):
+    def save_faces(self, im_format="png"):
         """
         Save all faces into out_folder, in the given image format
 
@@ -317,7 +323,7 @@ class FaceMovie(object):
         """
         for a_guy in self.guys: 
             out_im = self.prepare_image(a_guy)
-            self.save_guy(out_im, a_guy.name, out_folder, im_format)    
+            self.save_guy(out_im, a_guy.name, im_format)    
 
     def number_guys(self):
         """
@@ -375,7 +381,7 @@ class FaceMovie(object):
             # no filename is given. We keep the default
             self.out_path = os.path.split(out_folder)[0]
 
-    def save_guy(self, im, name, out_folder, ext):
+    def save_guy(self, im, name, ext):
         """
         Saves output image to the given format (given in extension)
         
@@ -389,7 +395,7 @@ class FaceMovie(object):
         :type ext: string        
         """
         file_name = name + "." + ext
-        out_name = os.path.join(out_folder, file_name)
+        out_name = os.path.join(self.out_path, file_name)
         print "Saving %s" %(out_name)
         
         cv.SaveImage(out_name, im)
diff --git a/test/path_test.py b/test/path_test.py
new file mode 100644
index 0000000..5b98868
--- /dev/null
+++ b/test/path_test.py
@@ -0,0 +1,16 @@
+from facemovie import Facemovie
+from facemovie import FaceParams
+
+in_fo = "data/inputs/samples"
+#in_fo = "data/inputs/moi"
+out_fo = "data/plop/caca/test.mkv"
+
+xml_fo = "haarcascades"
+
+face_params = FaceParams.FaceParams(xml_fo, 'frontal_face')
+
+facemovie = Facemovie.FaceMovie(in_fo, out_fo, face_params)
+facemovie.check_out_name(out_fo)
+
+print facemovie.out_path, facemovie.out_name, facemovie.out_format
+print facemovie.get_out_file()
\ No newline at end of file