Merge pull request #1 from laurentalacoque/passwordless

Passwordless authentication for emails and photo uploads

Author: laurentalacoque

.gitignore

@@ -1,9 +1,13 @@
 # ignore specific files
-scripts/.credentials
 scripts/*.jpg
 scripts/*.log
+
 #ignore launcher
 photobooth.sh
+scripts/configuration.json
+scripts/client_id.json
+scripts/credentials.dat
+
 # ignore log and animation frames
 run.log
 scripts/animframe*.*
@@ -13,12 +17,3 @@ scripts/*.pyc
 
 # ignore emacs backupfiles
 scripts/*.py~
-
-
-# ignore credentials
-scripts/*.cred
-scripts/*.json
-scripts/*.dat
-
-# ignore album.id file
-scripts/album.id

Photos/README.txt

@@ -0,0 +1,6 @@
+This directory will be populated with archived versions
+of your photos.
+- You can disable this by setting "local_archive" key to 
+  'false' in your script/configuration.json file
+- You can change the destination directory by setting the
+  "local_archive_dir" to "/path/to/the/destination/directory"

scripts/config.py

@@ -0,0 +1,90 @@
+import json
+import os
+
+class Configuration():
+    # default values
+    user_name = None
+    logo_file = None
+    countdown1  = 5 # seconds of preview before first snap
+    countdown2  = 3 # seconds of preview between snaps (Four pictures mode)
+    photoCaption = "" # Caption in the photo album
+    ARCHIVE      = True # Do we archive photos locally
+    archive_dir  = os.path.join("..","Photos") # Where do we archive photos
+    albumID      = None #  use install_credentials.py to create 'album.id'
+    emailSubject = "Here's your photo!" # subject line of the email sent from the photobooth
+    emailMsg     = "Greetings, here's your photo sent from the photobooth" # Brief body of the message sent from the photobooth
+    full_screen  = True #Start application in full screen
+    enable_email  = True #Enable the 'send email" feature
+    enable_upload = True #Enable the upload feature
+    enable_hardware_buttons = False #Enable hardware buttons
+    
+    #init
+    def __init__(self,configuration_file_name):
+        self.config_file = configuration_file_name
+        self.is_valid = False
+        self.__read_config_file()
+    
+    def __read_config_file(self):
+        self.is_valid = True
+        try:
+            with open(self.config_file, 'r') as content_file:
+                file_content = content_file.read()
+            config = json.loads(file_content)
+        except Exception as error:
+            print "Error while parsing %s config file : %s"%(self.config_file,error)
+            self.is_valid = False
+            return False
+        if "gmail_user" in config.keys():  self.user_name = config['gmail_user']
+        else:
+            #mandatory configuration!!
+            self.is_valid = False
+
+
+        # all other configuration keys are optional
+        if "countdown_before_snap" in config.keys(): self.countdown1 = config["countdown_before_snap"]
+        if "countdown_inter_snap" in config.keys():  self.countdown2 = config["countdown_inter_snap"]
+        if "snap_caption" in config.keys():  self.photoCaption = config["snap_caption"]
+        if "local_archive" in config.keys():  self.ARCHIVE = config["local_archive"]
+        if "local_archive_dir" in config.keys():  self.archive_dir = config["local_archive_dir"]
+        if "google_photo_album_id" in config.keys():  self.albumID = config["google_photo_album_id"]
+        if "email_subject" in config.keys():  self.emailSubject = config["email_subject"]
+        if "email_body" in config.keys():  self.emailMsg = config["email_body"]
+        if "logo_file" in config.keys():  self.logo_file = config["logo_file"]
+        if "full_screen" in config.keys():  self.full_screen = config["full_screen"]
+        if "enable_email" in config.keys():  self.enable_email = config["enable_email"]
+        if "enable_upload" in config.keys():  self.enable_upload = config["enable_upload"]
+        if "enable_hardware_buttons" in config.keys():  self.enable_hardware_buttons = config["enable_hardware_buttons"]
+        
+
+        return self.is_valid
+    
+    
+    def write(self):
+        myconfig = {
+            "gmail_user": self.user_name,
+            "countdown_before_snap": self.countdown1,
+            "countdown_inter_snap": self.countdown2,
+            "snap_caption": self.photoCaption,
+            "local_archive" : self.ARCHIVE,
+            "local_archive_dir" : self.archive_dir,
+            "google_photo_album_id" : self.albumID,
+            "email_subject": self.emailSubject,
+            "email_body":self.emailMsg,
+            "logo_file": self.logo_file,
+            "full_screen": self.full_screen,
+            "enable_email": self.enable_email,
+            "enable_upload": self.enable_upload,
+            "enable_hardware_buttons": self.enable_hardware_buttons
+        }
+        try:
+            with open(self.config_file,'w') as config:
+                config.write(json.dumps(myconfig, indent =4, sort_keys=True))
+        except Exception as error:
+            raise ValueError("Problem writing %s configuration file: %s"%(self.config_file,error))
+            
+            
+if __name__ == "__main__":
+
+    config = Configuration("myconf.conf")
+    if not config.is_valid:
+        config.write()

scripts/configuration.py

@@ -42,3 +42,7 @@
 EMAIL_BUTTON_IMG  = "ressources/ic_email.png"
 OAUTH2_REFRESH_PERIOD = 1800000 # interval between two OAuth2 token refresh (ms)
 HARDWARE_POLL_PERIOD = 100      # poll interval for buttons (ms)
+
+CONFIGURATION_FILE = "configuration.json"
+APP_ID_FILE = "client_id.json"
+CREDENTIALS_STORE_FILE = "credentials.dat"

scripts/constants.py

@@ -54,28 +54,9 @@ def capture_continuous(self, output):
 
     def close(self):
         del self.cam
-        
-class Buttons():
-    def __init__(self, buttons_pins=[12, 8, 14], mode=1, active_state=1):
-        self.buttons_pins = buttons_pins
-        self.mode = mode
-        self.active_state = active_state
-        self.hw_state = 0
-        self.counter  = 0
-    
-    def __del__(self):
-        pass
 
-    def state(self):
-        self.counter += 1
-        if self.counter >= 50:
-            self.counter = 0
-            self.hw_state = (self.hw_state + 1) % 3
-            return self.hw_state + 1
-        else:
-            return 0
 
 
 if __name__ == '__main__':
     camera = Camera()
-    camera.capture("out.jpg")
+    camera.capture("out.jpg")