Support launching with AP URL

2 files changed, 13 insertions, 5 deletions

@@ -162,5 +162,5 @@ def launch_client(*args):
 
 
 component = Component("Lingo 2 Client", component_type=Type.CLIENT, func=launch_client,
-                      description="Open Lingo 2.")
+                      description="Open Lingo 2.", supports_uri=True, game_name="Lingo 2")
 components.append(component)
@@ -8,7 +8,7 @@ import websockets
 
 import Utils
 import settings
-from CommonClient import CommonContext, server_loop, gui_enabled, logger
+from CommonClient import CommonContext, server_loop, gui_enabled, logger, get_base_parser, handle_url_arg
 from NetUtils import Endpoint, decode, encode
 from Utils import async_start
 
@@ -272,10 +272,10 @@ async def run_game():
 
 
 def client_main(*launch_args: str) -> None:
-    async def main():
+    async def main(args):
         async_start(run_game())
 
-        client_ctx = Lingo2ClientContext()
+        client_ctx = Lingo2ClientContext(args.connect, args.password)
         game_ctx = Lingo2GameContext()
 
         client_ctx.game_ctx = game_ctx
@@ -299,6 +299,14 @@ def client_main(*launch_args: str) -> None:
 
     Utils.init_logging("Lingo2Client", exception_logger="Client")
     import colorama
+
+    parser = get_base_parser(description="Lingo 2 Archipelago Client")
+    parser.add_argument('--name', default=None, help="Slot Name to connect as.")
+    parser.add_argument("url", nargs="?", help="Archipelago connection url")
+    args = parser.parse_args(launch_args)
+
+    args = handle_url_arg(args, parser=parser)
+
     colorama.just_fix_windows_console()
-    asyncio.run(main())
+    asyncio.run(main(args))
     colorama.deinit()