|
@@ -6,6 +6,8 @@ from core.MainController import MainController
|
|
import signal
|
|
import signal
|
|
import sys
|
|
import sys
|
|
|
|
|
|
|
|
+from core.SynapseLauncher import SynapseLauncher
|
|
|
|
+
|
|
|
|
|
|
def signal_handler(signal, frame):
|
|
def signal_handler(signal, frame):
|
|
print "\n"
|
|
print "\n"
|
|
@@ -30,17 +32,26 @@ def main():
|
|
parser.print_usage()
|
|
parser.print_usage()
|
|
sys.exit(1)
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
+ # by default, no brain file is set. Use the default one: brain.yml in the root path
|
|
|
|
+ brain_file = None
|
|
|
|
+
|
|
if args.action == "start":
|
|
if args.action == "start":
|
|
|
|
+ # check if user set a brain.yml file
|
|
|
|
+ if args.brain_file:
|
|
|
|
+ print "Brain file arg: %s" % args.brain_file
|
|
|
|
+ brain_file = args.brain_file
|
|
|
|
+
|
|
# user set a synapse to start
|
|
# user set a synapse to start
|
|
- if args.synapse is not None:
|
|
|
|
- print "Playing synapse: %s" % args.synapse
|
|
|
|
|
|
+ if args.run_synapse is not None:
|
|
|
|
+ print "Run synapse arg: %s" % args.run_synapse
|
|
|
|
+ SynapseLauncher.start_synapse(args.run_synapse, brain_file=brain_file)
|
|
|
|
|
|
- if args.synapse is None:
|
|
|
|
|
|
+ if args.run_synapse is None:
|
|
print "Starting JARVIS. Press Ctrl+C for stopping"
|
|
print "Starting JARVIS. Press Ctrl+C for stopping"
|
|
# catch signal for killing on Ctrl+C pressed
|
|
# catch signal for killing on Ctrl+C pressed
|
|
signal.signal(signal.SIGINT, signal_handler)
|
|
signal.signal(signal.SIGINT, signal_handler)
|
|
# start the main controller
|
|
# start the main controller
|
|
- main_controller = MainController()
|
|
|
|
|
|
+ main_controller = MainController(brain_file=brain_file)
|
|
main_controller.start()
|
|
main_controller.start()
|
|
|
|
|
|
if args.action == "gui":
|
|
if args.action == "gui":
|