Make the add command much more flexible and properly implement the defaults system
This commit is contained in:
parent
d144b86452
commit
740fc0034c
20
example.json
20
example.json
|
|
@ -12,9 +12,25 @@
|
|||
"SendDistOutput": false,
|
||||
"Password": "s",
|
||||
"Default": {
|
||||
"password": null,
|
||||
"host": null,
|
||||
"port": null,
|
||||
"protocol": null,
|
||||
"bind": null,
|
||||
"timeout": 30,
|
||||
"nickname": null,
|
||||
"username": null,
|
||||
"authtype": null
|
||||
"realname": null,
|
||||
"userinfo": null,
|
||||
"finger": null,
|
||||
"version": null,
|
||||
"source": null,
|
||||
"autojoin": [],
|
||||
"authtype": null,
|
||||
"password": null,
|
||||
"authentity": "NickServ",
|
||||
"key": "key.pem",
|
||||
"certificate": "cert.pem",
|
||||
"enabled": true
|
||||
},
|
||||
"Master": [null, null]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"pass": "pass <password>",
|
||||
"logout": "logout",
|
||||
"add": "add <name> <address> <port> <ssl|plain> <nickname>",
|
||||
"add": "add <name> [<address>] [<port>] [<ssl|plain>] [<nickname>]",
|
||||
"del": "del <name>",
|
||||
"mod": "mod <name> [<key>] [<value>]",
|
||||
"get": "get <name> <variable>",
|
||||
|
|
|
|||
133
threshold
133
threshold
|
|
@ -872,52 +872,101 @@ class Helper(object):
|
|||
return
|
||||
|
||||
elif cmd == "add":
|
||||
if length == 6:
|
||||
|
||||
if spl[1] in pool.keys():
|
||||
failure("Name already exists: %s" % spl[1])
|
||||
return
|
||||
|
||||
protocol = spl[4].lower()
|
||||
|
||||
if not protocol in ["ssl", "plain"]:
|
||||
incUsage("connect")
|
||||
return
|
||||
|
||||
try:
|
||||
int(spl[3])
|
||||
except:
|
||||
failure("Port must be an integer, not %s" % spl[3])
|
||||
return
|
||||
|
||||
pool[spl[1]] = { "host": spl[2],
|
||||
"port": spl[3],
|
||||
"protocol": protocol,
|
||||
"bind": None,
|
||||
"timeout": 30,
|
||||
"nickname": spl[5],
|
||||
"username": config["Default"]["username"],
|
||||
"realname": None,
|
||||
"userinfo": None,
|
||||
"finger": None,
|
||||
"version": None,
|
||||
"source": None,
|
||||
"autojoin": [],
|
||||
"authtype": config["Default"]["authtype"],
|
||||
"password": config["Default"]["password"],
|
||||
"authentity": "NickServ",
|
||||
"key": config["ListenerKey"],
|
||||
"certificate": config["ListenerCertificate"],
|
||||
"enabled": config["ConnectOnCreate"],
|
||||
}
|
||||
if config["ConnectOnCreate"] == True:
|
||||
self.addBot(spl[1])
|
||||
success("Successfully created bot")
|
||||
self.savePool()
|
||||
if length > 6:
|
||||
failure("Too many arguments")
|
||||
return
|
||||
|
||||
if length > 1:
|
||||
name = spl[1]
|
||||
else:
|
||||
incUsage("add")
|
||||
return
|
||||
if length > 2:
|
||||
host = spl[2]
|
||||
if length > 3:
|
||||
port = spl[3]
|
||||
if length > 4:
|
||||
protocol = spl[4]
|
||||
if length > 5:
|
||||
nickname = spl[5]
|
||||
|
||||
toFail = False
|
||||
if length < 6:
|
||||
if config["Default"]["nickname"] == None:
|
||||
failure("Choose a nickname, or configure one in defaults")
|
||||
toFail = True
|
||||
else:
|
||||
nickname = config["Default"]["nickname"]
|
||||
|
||||
if length < 5:
|
||||
if config["Default"]["protocol"] == None:
|
||||
failure("Choose a protocol, or configure one in defaults")
|
||||
toFail = True
|
||||
else:
|
||||
protocol = config["Default"]["protocol"]
|
||||
|
||||
if length < 4:
|
||||
if config["Default"]["port"] == None:
|
||||
failure("Choose a port, or configure one in defaults")
|
||||
toFail = True
|
||||
else:
|
||||
port = config["Default"]["port"]
|
||||
|
||||
if length < 3:
|
||||
if config["Default"]["host"] == None:
|
||||
failure("Choose a host, or configure one in defaults")
|
||||
toFail = True
|
||||
else:
|
||||
host = config["Default"]["host"]
|
||||
if toFail:
|
||||
failure("Stopping due to previous error(s)")
|
||||
return
|
||||
|
||||
if length < 2:
|
||||
incUsage("add")
|
||||
return
|
||||
|
||||
if name in pool.keys():
|
||||
failure("Name already exists: %s" % name)
|
||||
return
|
||||
|
||||
protocol = protocol.lower()
|
||||
|
||||
if not protocol in ["ssl", "plain"]:
|
||||
failure("Protocol must be ssl or plain, not %s" % protocol)
|
||||
return
|
||||
|
||||
try:
|
||||
int(port)
|
||||
except:
|
||||
failure("Port must be an integer, not %s" % port)
|
||||
return
|
||||
|
||||
pool[name] = { "host": host,
|
||||
"port": port,
|
||||
"protocol": protocol,
|
||||
"bind": config["Default"]["bind"],
|
||||
"timeout": config["Default"]["timeout"],
|
||||
"nickname": nickname,
|
||||
"username": config["Default"]["username"],
|
||||
"realname": config["Default"]["realname"],
|
||||
"userinfo": config["Default"]["userinfo"],
|
||||
"finger": config["Default"]["finger"],
|
||||
"version": config["Default"]["version"],
|
||||
"source": config["Default"]["source"],
|
||||
"autojoin": config["Default"]["autojoin"],
|
||||
"authtype": config["Default"]["authtype"],
|
||||
"password": config["Default"]["password"],
|
||||
"authentity": config["Default"]["authentity"],
|
||||
"key": config["ListenerKey"],
|
||||
"certificate": config["ListenerCertificate"],
|
||||
"enabled": config["ConnectOnCreate"],
|
||||
}
|
||||
if config["ConnectOnCreate"] == True:
|
||||
self.addBot(name)
|
||||
success("Successfully created bot")
|
||||
self.savePool()
|
||||
return
|
||||
|
||||
elif cmd == "del":
|
||||
if length == 2:
|
||||
|
|
|
|||
Loading…
Reference in New Issue