Store raw image in a dedicated folder and final image in the folder d…

…efined in config (solves #43)

pibooth/booth.py

@@ -162,7 +162,7 @@ def entry_actions(self):
         self.app.nbr_printed = 0
         self.app.previous_picture = None
         self.app.previous_picture_file = None
-        self.app.dirname = osp.join(self.app.savedir, time.strftime("%Y-%m-%d-%H-%M-%S"))
+        self.app.dirname = osp.join(self.app.savedir, "raw", time.strftime("%Y-%m-%d-%H-%M-%S"))
         os.makedirs(self.app.dirname)
         self.app.led_preview.switch_on()
 
@@ -227,7 +227,7 @@ def entry_actions(self):
             self.app.previous_picture = concatenate_pictures(
                 self.app.camera.get_captures(), footer_texts, bg_color, text_color, orientation)
 
-        self.app.previous_picture_file = osp.join(self.app.dirname, time.strftime("%Y-%m-%d-%H-%M-%S") + "_ptb.jpg")
+        self.app.previous_picture_file = osp.join(self.app.savedir, time.strftime("%Y-%m-%d-%H-%M-%S") + "_ptb.jpg")
         with timeit("Save the merged picture in {}".format(self.app.previous_picture_file)):
             self.app.previous_picture.save(self.app.previous_picture_file)