ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

right

Browse source
This commit is contained in:
Luke Rogers 2013-10-02 19:43:12 +13:00
parent 9115d4dc0e
commit 5be3e643d5
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/loader.py
View file

@ -34,7 +34,7 @@ class PluginLoader(object):
self.path = os.path.abspath("plugins") self.path = os.path.abspath("plugins")
self.bot = bot self.bot = bot
self.event_handler = EventHandler(self, patterns=["*.py"]) self.event_handler = PluginEventHandler(self, patterns=["*.py"])
self.observer.schedule(self.event_handler, self.path, recursive=False) self.observer.schedule(self.event_handler, self.path, recursive=False)
self.observer.start() self.observer.start()
@ -80,7 +80,8 @@ class PluginLoader(object):
for type, data in obj._hook: for type, data in obj._hook:
self.bot.plugins[type] += [data] self.bot.plugins[type] += [data]
self.bot.logger.info("Loaded plugin: {} ({})".format(format_plug(data), type)) if not loaded_all:
self.bot.logger.info("Loaded plugin: {} ({})".format(format_plug(data), type))
if not loaded_all: if not loaded_all:
self.rebuild() self.rebuild()
@ -119,7 +120,7 @@ class PluginLoader(object):
self.bot.events[event].append((func, args)) self.bot.events[event].append((func, args))
class EventHandler(Trick): class PluginEventHandler(Trick):
def __init__(self, loader, *args, **kwargs): def __init__(self, loader, *args, **kwargs):
self.loader = loader self.loader = loader
Trick.__init__(self, *args, **kwargs) Trick.__init__(self, *args, **kwargs)