Merge pull request #374 from dictation-toolbox/pypi

User space breakout and pypi package setup

.gitignore

@@ -38,3 +38,7 @@ sonar-project.properties
 
 # Ignore User Data
 caster/bin/data
+
+# Ignore dist files
+dist
+castervoice.egg-info

MANIFEST.in

@@ -0,0 +1,8 @@
+global-exclude *.pyc
+include castervoice/bin/data/configdebug.txt
+include castervoice/bin/share/bringme.toml.defaults
+include castervoice/bin/reboot.bat
+include castervoice/bin/reboot_wsr.bat
+include castervoice/lib/dll/tirg-dll.dll
+include castervoice/asynch/sikuli/server/xmlrpc_server.sikuli/xmlrpc_server.html
+include castervoice/asynch/sikuli/server/xmlrpc_server.sikuli/xmlrpc_server.py

_caster.py

@@ -9,60 +9,55 @@
 
 import time
 from dragonfly import (Function, Grammar, Playback, Dictation, Choice, Pause)
-from caster.lib.ccr.standard import SymbolSpecs
-
+from castervoice.lib.ccr.standard import SymbolSpecs
 
 def _wait_for_wsr_activation():
     count = 1
     while True:
         try:
-            from caster.apps import firefox
+            from castervoice.apps import firefox
             break
         except:
             print("(%d) Attempting to load Caster -- WSR not loaded and listening yet..."
                   % count)
             count += 1
             time.sleep(1)
 
-
 _NEXUS = None
-
-from caster.lib import settings  # requires nothing
+from castervoice.lib import settings  # requires nothing
 settings.WSR = __name__ == "__main__"
-from caster.lib import utilities  # requires settings
+from castervoice.lib import utilities  # requires settings
 if settings.WSR:
     _wait_for_wsr_activation()
     SymbolSpecs.set_cancel_word("escape")
-from caster.lib import control
+from castervoice.lib import control
 _NEXUS = control.nexus()
 
-from caster.apps import *
-from caster.asynch import *
-from caster.lib import context
-from caster.lib.actions import Key
-import caster.lib.dev.dev
-from caster.asynch.sikuli import sikuli
-from caster.lib import navigation
+from castervoice.apps import *
+from castervoice.asynch import *
+from castervoice.lib import context
+from castervoice.lib.actions import Key
+import castervoice.lib.dev.dev
+from castervoice.asynch.sikuli import sikuli
+from castervoice.lib import navigation
 navigation.initialize_clipboard(_NEXUS)
-from caster.lib.dfplus.state.short import R
-from caster.lib.dfplus.additions import IntegerRefST
-
-from caster.lib.dfplus.merge.mergepair import MergeInf
-from caster.lib.ccr import *
-from caster.lib.ccr.recording.again import Again
-from caster.lib.ccr.recording.bringme import bring_rule
-from caster.lib.ccr.recording.alias import Alias
-from caster.lib.ccr.recording import history
-from caster.lib.dev import dev
-from caster.lib.dfplus.hint.nodes import css
-from caster.user.filters.examples import scen4, modkeysup
-from caster import user
-from caster.lib.dfplus.merge.mergerule import MergeRule
-from caster.lib.dfplus.merge import gfilter
+from castervoice.lib.dfplus.state.short import R
+from castervoice.lib.dfplus.additions import IntegerRefST
+
+from castervoice.lib.dfplus.merge.mergepair import MergeInf
+from castervoice.lib.ccr import *
+from castervoice.lib.ccr.recording.again import Again
+from castervoice.lib.ccr.recording.bringme import bring_rule
+from castervoice.lib.ccr.recording.alias import Alias
+from castervoice.lib.ccr.recording import history
+from castervoice.lib.dev import dev
+from castervoice.lib.dfplus.hint.nodes import css
+from castervoice.lib.dfplus.merge.mergerule import MergeRule
+from castervoice.lib.dfplus.merge import gfilter
 
 
 def change_monitor():
-    if settings.SETTINGS["miscellaneous"]["sikuli_enabled"]:
+    if settings.SETTINGS["sikuli"]["enabled"]:
         Playback([(["monitor", "select"], 0.0)]).execute()
     else:
         print("This command requires SikuliX to be enabled in the settings file")
@@ -164,9 +159,11 @@ def generate_sm_ccr_choices(nexus):
 
 grammar.load()
 
+_NEXUS.process_user_content()
 _NEXUS.merger.update_config()
 _NEXUS.merger.merge(MergeInf.BOOT)
 
+
 print("*- Starting " + settings.SOFTWARE_NAME + " -*")
 
 if settings.WSR: