Merge pull request #187 from Holzhaus/jasperpath-usage

Use jasperpath for static resources

4 files changed, 16 insertions, 12 deletions

diff --git a/client/g2p.py b/client/g2p.py
index 276f681..6e308ef 100644
--- a/client/g2p.py
+++ b/client/g2p.py
@@ -5,6 +5,8 @@ import subprocess
 import re
 import yaml
 
+import jasperpath
+
 PHONE_MATCH = re.compile(r'<s> (.*) </s>')
 
 FST_MODEL = None
@@ -18,7 +20,7 @@ if os.path.exists(profile_path):
             FST_MODEL = profile['pocketsphinx']['fst_model']
 
 if not FST_MODEL:
-    FST_MODEL = os.environ['JASPER_HOME'] + "/phonetisaurus/g014b2b.fst"
+    FST_MODEL = os.path.join(jasperpath.APP_PATH, os.pardir, 'phonetisaurus', 'g014b2b.fst')
 
 
 def parseLine(line):
diff --git a/client/mic.py b/client/mic.py
index 3150d4e..6c428c0 100644
--- a/client/mic.py
+++ b/client/mic.py
@@ -8,7 +8,7 @@ from wave import open as open_audio
 import audioop
 import pyaudio
 import alteration
-
+import jasperpath
 
 class Mic:
 
@@ -190,7 +190,7 @@ class Mic:
         if THRESHOLD == None:
             THRESHOLD = self.fetchThreshold()
 
-        self.speaker.play("../static/audio/beep_hi.wav")
+        self.speaker.play(jasperpath.data('audio', 'beep_hi.wav'))
 
         # prepare recording stream
         audio = pyaudio.PyAudio()
@@ -219,7 +219,7 @@ class Mic:
             if average < THRESHOLD * 0.8:
                 break
 
-        self.speaker.play("../static/audio/beep_lo.wav")
+        self.speaker.play(jasperpath.data('audio', 'beep_lo.wav'))
 
         # save the audio data
         stream.stop_stream()
diff --git a/client/modules/Joke.py b/client/modules/Joke.py
index 802047c..c560f4e 100644
--- a/client/modules/Joke.py
+++ b/client/modules/Joke.py
@@ -1,11 +1,12 @@
 # -*- coding: utf-8-*-
 import random
 import re
+import jasperpath
 
 WORDS = ["JOKE", "KNOCK KNOCK"]
 
 
-def getRandomJoke(filename="../static/text/JOKES.txt"):
+def getRandomJoke(filename=jasperpath.data('text','JOKES.txt')):
     jokeFile = open(filename, "r")
     jokes = []
     start = ""
diff --git a/client/test.py b/client/test.py
index 8925e66..0160b76 100644
--- a/client/test.py
+++ b/client/test.py
@@ -2,18 +2,16 @@
 # -*- coding: utf-8-*-
 import os
 import sys
-
-if os.environ.get('JASPER_HOME') is None:
-    os.environ['JASPER_HOME'] = '/home/pi'
-
 import unittest
 import argparse
 from mock import patch
 from urllib2 import URLError, urlopen
+
 import test_mic
 import vocabcompiler
 import g2p
 import brain
+import jasperpath
 from diagnose import Diagnostics
 
 DEFAULT_PROFILE = {
@@ -59,8 +57,8 @@ class TestVocabCompiler(unittest.TestCase):
 class TestMic(unittest.TestCase):
 
     def setUp(self):
-        self.jasper_clip = "../static/audio/jasper.wav"
-        self.time_clip = "../static/audio/time.wav"
+        self.jasper_clip = jasperpath.data('audio', 'jasper.wav')
+        self.time_clip = jasperpath.data('audio', 'time.wav')
 
         from stt import PocketSphinxSTT
         self.stt = PocketSphinxSTT()
@@ -134,7 +132,7 @@ class TestModules(unittest.TestCase):
         inputs = ["Who's there?", "Random response"]
         outputs = self.runConversation(query, inputs, Joke)
         self.assertEqual(len(outputs), 3)
-        allJokes = open("../static/text/JOKES.txt", "r").read()
+        allJokes = open(jasperpath.data('text','JOKES.txt'), 'r').read()
         self.assertTrue(outputs[2] in allJokes)
 
     def testTime(self):
@@ -235,6 +233,9 @@ if __name__ == '__main__':
                         help='runs a subset of the tests (only requires Python dependencies)')
     args = parser.parse_args()
 
+    # Change CWD to jasperpath.LIB_PATH
+    os.chdir(jasperpath.LIB_PATH)
+
     test_cases = [TestBrain, TestModules, TestVocabCompiler]
     if not args.light:
         test_cases.append(TestG2P)