From 2e59ddec511c6a84c1953845d21898390cfd8b77 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Wed, 10 Sep 2014 17:30:34 +0200
Subject: Move vocabcompiler into client folder

---
 boot/boot.py            |  3 +--
 boot/vocabcompiler.py   | 71 -------------------------------------------------
 client/vocabcompiler.py | 69 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 73 deletions(-)
 delete mode 100644 boot/vocabcompiler.py
 create mode 100644 client/vocabcompiler.py

diff --git a/boot/boot.py b/boot/boot.py
index 8697c91..e807beb 100755
--- a/boot/boot.py
+++ b/boot/boot.py
@@ -28,14 +28,13 @@ else:
     path = "/usr/local/lib/"
 os.environ["PATH"] = path
 
-import urllib2
-import vocabcompiler
 import traceback
 
 lib_path = os.path.abspath('../client')
 sys.path.append(lib_path)
 
 from diagnose import Diagnostics
+import vocabcompiler
 import speaker as speak
 speaker = speak.newSpeaker()
 
diff --git a/boot/vocabcompiler.py b/boot/vocabcompiler.py
deleted file mode 100644
index f22da1a..0000000
--- a/boot/vocabcompiler.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8-*-
-"""
-    Iterates over all the WORDS variables in the modules and creates a dictionary for the client.
-"""
-
-import os
-import sys
-import glob
-
-lib_path = os.path.abspath('../client')
-mod_path = os.path.abspath('../client/modules/')
-
-sys.path.append(lib_path)
-sys.path.append(mod_path)
-
-import g2p
-
-
-def text2lm(in_filename, out_filename):
-    """Wrapper around the language model compilation tools"""
-    def text2idngram(in_filename, out_filename):
-        cmd = "text2idngram -vocab %s < %s -idngram temp.idngram" % (out_filename,
-                                                                     in_filename)
-        os.system(cmd)
-
-    def idngram2lm(in_filename, out_filename):
-        cmd = "idngram2lm -idngram temp.idngram -vocab %s -arpa %s" % (
-            in_filename, out_filename)
-        os.system(cmd)
-
-    text2idngram(in_filename, in_filename)
-    idngram2lm(in_filename, out_filename)
-
-
-def compile(sentences, dictionary, languagemodel):
-    """
-        Gets the words and creates the dictionary
-    """
-
-    m = [os.path.basename(f)[:-3]
-         for f in glob.glob(os.path.dirname("../client/modules/") + "/*.py")]
-
-    words = []
-    for module_name in m:
-        try:
-            exec("import %s" % module_name)
-            eval("words.extend(%s.WORDS)" % module_name)
-        except:
-            pass  # module probably doesn't have the property
-
-    words = list(set(words))
-
-    # for spotify module
-    words.extend(["MUSIC", "SPOTIFY"])
-
-    # create the dictionary
-    pronounced = g2p.translateWords(words)
-    zipped = zip(words, pronounced)
-    lines = ["%s %s" % (x, y) for x, y in zipped]
-
-    with open(dictionary, "w") as f:
-        f.write("\n".join(lines) + "\n")
-
-    # create the language model
-    with open(sentences, "w") as f:
-        f.write("\n".join(words) + "\n")
-        f.write("<s> \n </s> \n")
-        f.close()
-
-    # make language model
-    text2lm(sentences, languagemodel)
diff --git a/client/vocabcompiler.py b/client/vocabcompiler.py
new file mode 100644
index 0000000..1b4d94c
--- /dev/null
+++ b/client/vocabcompiler.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8-*-
+"""
+    Iterates over all the WORDS variables in the modules and creates a dictionary for the client.
+"""
+
+import os
+import sys
+import glob
+
+mod_path = os.path.abspath('modules/')
+
+sys.path.append(mod_path)
+
+import g2p
+
+
+def text2lm(in_filename, out_filename):
+    """Wrapper around the language model compilation tools"""
+    def text2idngram(in_filename, out_filename):
+        cmd = "text2idngram -vocab %s < %s -idngram temp.idngram" % (out_filename,
+                                                                     in_filename)
+        os.system(cmd)
+
+    def idngram2lm(in_filename, out_filename):
+        cmd = "idngram2lm -idngram temp.idngram -vocab %s -arpa %s" % (
+            in_filename, out_filename)
+        os.system(cmd)
+
+    text2idngram(in_filename, in_filename)
+    idngram2lm(in_filename, out_filename)
+
+
+def compile(sentences, dictionary, languagemodel):
+    """
+        Gets the words and creates the dictionary
+    """
+
+    m = [os.path.basename(f)[:-3]
+         for f in glob.glob(os.path.dirname("../client/modules/") + "/*.py")]
+
+    words = []
+    for module_name in m:
+        try:
+            exec("import %s" % module_name)
+            eval("words.extend(%s.WORDS)" % module_name)
+        except:
+            pass  # module probably doesn't have the property
+
+    words = list(set(words))
+
+    # for spotify module
+    words.extend(["MUSIC", "SPOTIFY"])
+
+    # create the dictionary
+    pronounced = g2p.translateWords(words)
+    zipped = zip(words, pronounced)
+    lines = ["%s %s" % (x, y) for x, y in zipped]
+
+    with open(dictionary, "w") as f:
+        f.write("\n".join(lines) + "\n")
+
+    # create the language model
+    with open(sentences, "w") as f:
+        f.write("\n".join(words) + "\n")
+        f.write("<s> \n </s> \n")
+        f.close()
+
+    # make language model
+    text2lm(sentences, languagemodel)
-- 
cgit v1.3.1