Fix calling launch_server from CLI script

agkyra/gui.py

@@ -82,8 +82,7 @@ class GUI(WebSocketBaseClient):
 def run():
     """Prepare SessionHelper and GUI and run them in the proper order"""
     LOG.info('Start SessionHelper session')
-    subprocess.Popen([
-        os.path.join(CURPATH, 'scripts/cli.py'), 'launch_server'])
+    subprocess.Popen(['agkyra-cli', 'launch_server'])
 
     LOG.info('Client blocks until session is ready')
     session = SessionHelper().wait_session_to_load()

agkyra/protocol.py

@@ -147,7 +147,7 @@ class WebSocketProtocol(WebSocket):
     GUI: {"method": "post", "path": "pause"}
     HELPER: {"OK": 200, "action": "post pause"} or error
 
-    -- start --
+    -- START --
     GUI: {"method": "post", "path": "start"}
     HELPER: {"OK": 200, "action": "post start"} or error
 

agkyra/scripts/cli.py

@@ -40,18 +40,20 @@ LOGGER.setLevel(logging.DEBUG)
 def main():
     from agkyra.cli import AgkyraCLI
     from sys import argv
-    AgkyraCLI().onecmd(' '.join(argv[1:] or ['help', ]))
-
-
-if __name__ == "__main__":
     if sys.argv[1] in ('launch_server', ):
         # This piece of code will stay here until the CLI can launch a server
         # by itself
         from agkyra.protocol import SessionHelper
-        LOGGER.debug('Please start the session helper')
+        LOGGER.debug('Start the session helper')
         helper = SessionHelper()
         if not helper.load_active_session():
             helper.create_session()
             helper.server.serve_forever()
+        else:
+            LOGGER.info('Another session is running, aborting')
     else:
-        main()
+        AgkyraCLI().onecmd(' '.join(argv[1:] or ['help', ]))
+
+
+if __name__ == "__main__":
+    main()