Stop hardcoding /home/jasper and abstract out mic.say for multiplatform support

2 files changed, 23 insertions, 11 deletions

diff --git a/boot/boot.py b/boot/boot.py
index 59217ec..fcaeedd 100755
--- a/boot/boot.py
+++ b/boot/boot.py
@@ -1,14 +1,16 @@
 #!/usr/bin/env python
 
-import os, json
+import os, sys
 import urllib2
 import yaml
-
 import vocabcompiler
+import traceback
+
+lib_path = os.path.abspath('../client')
+sys.path.append(lib_path)
 
-def say(phrase, OPTIONS = " -vdefault+m3 -p 40 -s 160 --stdout > ../static/audio/say.wav"):
-    os.system("espeak " + json.dumps(phrase) + OPTIONS)
-    os.system("aplay -D hw:1,0 ../static/audio/say.wav")
+import speaker as speak
+speaker = speak.newSpeaker()
 
 def configure():
     try:
@@ -19,17 +21,17 @@ def configure():
         vocabcompiler.compile("../client/sentences.txt", "../client/dictionary.dic", "../client/languagemodel.lm")
 
         print "STARTING CLIENT PROGRAM"
-        os.system("/home/pi/jasper/client/start.sh &")
+        os.system("$JASPER_HOME/jasper/client/start.sh &")
 
     except:
-
         print "COULD NOT CONNECT TO NETWORK"
-        say("Hello, I could not connect to a network. Please read the documentation to configure your Raspberry Pi.")
+        traceback.print_exc()
+        speaker.say("Hello, I could not connect to a network. Please read the documentation to configure your Raspberry Pi.")
 
 if __name__ == "__main__":
     print "==========STARTING JASPER CLIENT=========="
     print "=========================================="
     print "COPYRIGHT 2013 SHUBHRO SAHA, CHARLIE MARSH"
     print "=========================================="
-    say("Hello.... I am Jasper... Please wait one moment.")
+    speaker.say("Hello.... I am Jasper... Please wait one moment.")
     configure()
diff --git a/boot/boot.sh b/boot/boot.sh
index 5ea1b3d..927b4b2 100755
--- a/boot/boot.sh
+++ b/boot/boot.sh
@@ -1,6 +1,16 @@
-cd /home/pi/jasper/boot/
+if [[ -z "$JASPER_HOME" ]]; then
+    if [[ -d "/home/pi" ]]; then
+        JASPER_HOME="/home/pi"
+        export JASPER_HOME;
+    else
+        echo "Error: \$JASPER_HOME is not set."
+        exit 0;
+    fi
+fi
+
+cd $JASPER_HOME/jasper/boot
 LD_LIBRARY_PATH="/usr/local/lib"
 export LD_LIBRARY_PATH
 PATH=$PATH:/usr/local/lib/
 export PATH
-python boot.py &
\ No newline at end of file
+python boot.py &