archangelic
/
pinhook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add error exceptions for calling commands and for loading plugins

pull/2/head
Mallory Hancock 2017-10-13 15:22:47 -07:00
parent 184cc272eb
commit 3a148ae34f
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pinhook/bot.py
View File

@ -26,20 +26,8 @@ class Bot(irc.bot.SingleServerIRCBot):
irc.bot.SingleServerIRCBot.__init__(self, [(server, self.port)], nickname, nickname) irc.bot.SingleServerIRCBot.__init__(self, [(server, self.port)], nickname, nickname)
self.chanlist = channels self.chanlist = channels
self.bot_nick = nickname self.bot_nick = nickname
self.load_plugins()
# load all plugins
plugins = []
for m in os.listdir(self.plugin_dir):
if m.endswith('.py'):
name = m[:-3]
fp, pathname, description = imp.find_module(name, [self.plugin_dir])
plugins.append(imp.load_module(name, fp, pathname, description))
# gather all commands
self.cmds = {}
for plugin in plugins:
for cmd in plugin.pinhook.plugin.cmds:
self.cmds[cmd['cmd']] = cmd['func']
def set_kwargs(self, **kwargs): def set_kwargs(self, **kwargs):
kwarguments = { kwarguments = {
@ -56,6 +44,24 @@ class Bot(irc.bot.SingleServerIRCBot):
if a not in kwargs: if a not in kwargs:
setattr(self, a, kwarguments[a]) setattr(self, a, kwarguments[a])
def load_plugins(self):
# load all plugins
plugins = []
for m in os.listdir(self.plugin_dir):
if m.endswith('.py'):
try:
name = m[:-3]
fp, pathname, description = imp.find_module(name, [self.plugin_dir])
p = imp.load_module(name, fp, pathname, description)
p.pinhook
plugins.append(p)
except Exception as e:
print(e)
# gather all commands
self.cmds = {}
for plugin in plugins:
for cmd in plugin.pinhook.plugin.cmds:
self.cmds[cmd['cmd']] = cmd['func']
def on_welcome(self, c, e): def on_welcome(self, c, e):
if self.ns_pass: if self.ns_pass:
@ -92,6 +98,7 @@ class Bot(irc.bot.SingleServerIRCBot):
msg = ', '.join(helplist) msg = ', '.join(helplist)
c.privmsg(chan, 'Available commands: {}'.format(msg)) c.privmsg(chan, 'Available commands: {}'.format(msg))
elif cmd in self.cmds: elif cmd in self.cmds:
try:
output = self.cmds[cmd](Message( output = self.cmds[cmd](Message(
channel=chan, channel=chan,
cmd=cmd, cmd=cmd,
@ -100,6 +107,8 @@ class Bot(irc.bot.SingleServerIRCBot):
botnick=self.bot_nick, botnick=self.bot_nick,
ops=self.ops ops=self.ops
)) ))
except Exception as e:
print(e)
if output: if output:
if output.msg_type == 'message': if output.msg_type == 'message':