deavmi
/
skippy
mirror of https://github.com/deavminet/skippy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactored 'connect' code

This commit is contained in:
Tristan B. Kildaire 2020-09-26 19:18:09 +02:00
parent fa620ba152
commit 364a72758a
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/app.d
View File

@ -64,6 +64,10 @@ void commandLine()
/* If the command is `connect` */
else if(cmp(command, "connect") == 0)
{
string address;
string port;
Address addr;
/* If there is only one argument then it is a server name */
if(elements.length == 2)
{
@ -73,29 +77,33 @@ void commandLine()
{
/* Get the address and port */
JSONValue serverInfo = config["servers"][serverName];
address = serverInfo["address"].str();
port = serverInfo["port"].str();
}
catch(JSONException e)
{
writeln("Could not find server: "~to!(string)(e));
continue;
}
}
/* Then it must be `<address> <port>` */
else if(elements.length == 3)
{
string address = elements[1];
string port = elements[2];
Address addr = parseAddress(address, to!(ushort)(port));
writeln("Connecting to "~to!(string)(addr)~"...");
client = new DClient(addr);
d = new NotificationWatcher(client.getManager());
writeln("Connected!");
address = elements[1];
port = elements[2];
}
/* Syntax error */
else
{
writeln("Syntax error");
continue;
}
addr = parseAddress(address, to!(ushort)(port));
writeln("Connecting to "~to!(string)(addr)~"...");
client = new DClient(addr);
d = new NotificationWatcher(client.getManager());
writeln("Connected!");
}
/* If the command is `auth` */
else if(cmp(command, "auth") == 0)
@ -161,7 +169,10 @@ void defaultConfig()
JSONValue serverBlock;
/* TODO: Remove test servers? */
serverBlock["dserv"] = "";
JSONValue dserv;
dserv["address"] = "127.0.0.1";
dserv["port"] = "7777";
serverBlock["dserv"] = dserv;
config["servers"] = serverBlock;
}