Pathogen
/
monolith
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make the add command much more flexible and properly implement the defaults system

This commit is contained in:
Mark Veidemanis 2017-12-26 13:57:29 +00:00
parent d144b86452
commit 740fc0034c
3 changed files with 110 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
example.json
View File

@ -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]
}

2
help.json
View File

@ -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>",

97
threshold
View File

@ -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])
if length > 6:
failure("Too many arguments")
return
protocol = spl[4].lower()
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"]:
incUsage("connect")
failure("Protocol must be ssl or plain, not %s" % protocol)
return
try:
int(spl[3])
int(port)
except:
failure("Port must be an integer, not %s" % spl[3])
failure("Port must be an integer, not %s" % port)
return
pool[spl[1]] = { "host": spl[2],
"port": spl[3],
pool[name] = { "host": host,
"port": port,
"protocol": protocol,
"bind": None,
"timeout": 30,
"nickname": spl[5],
"bind": config["Default"]["bind"],
"timeout": config["Default"]["timeout"],
"nickname": nickname,
"username": config["Default"]["username"],
"realname": None,
"userinfo": None,
"finger": None,
"version": None,
"source": None,
"autojoin": [],
"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": "NickServ",
"authentity": config["Default"]["authentity"],
"key": config["ListenerKey"],
"certificate": config["ListenerCertificate"],
"enabled": config["ConnectOnCreate"],
}
if config["ConnectOnCreate"] == True:
self.addBot(spl[1])
self.addBot(name)
success("Successfully created bot")
self.savePool()
return
else:
incUsage("add")
return
elif cmd == "del":
if length == 2: