Added support to dynamically load modules.

8 files changed, 96 insertions, 12 deletions

diff --git a/settings.py b/settings.py
index ec2668f..d6c22a9 100644
--- a/settings.py
+++ b/settings.py
@@ -18,6 +18,9 @@ ADMINS = ('com4',)
 ACTIONS = (
     'wmd.actions.passive.nickserv.IdentWithNickserv',
     'wmd.actions.passive.pong.RespondToPing',
+    'wmd.actions.modules.ReloadModule',
+    'wmd.actions.modules.LoadModule',
+    'wmd.actions.modules.ListModules',
 )
 
 try:
diff --git a/wmd/actions/__init__.py b/wmd/actions/__init__.py
index 03cde4c..d0529eb 100644
--- a/wmd/actions/__init__.py
+++ b/wmd/actions/__init__.py
@@ -1,2 +1,3 @@
 class Action(object):
-    pass
\ No newline at end of file
+    def log(self, msg):
+        print "-> %s: %s" %(self.__class__.__name__, msg)
\ No newline at end of file
diff --git a/wmd/actions/echo.py b/wmd/actions/echo.py
new file mode 100644
index 0000000..dfaff7f
--- /dev/null
+++ b/wmd/actions/echo.py
@@ -0,0 +1,11 @@
+from wmd.actions import Action
+
+import settings
+
+class EchoAction(Action):
+    def recv_msg(self, irc, obj_data):
+        channel = obj_data.get_username()
+
+        args = obj_data.params.split(" ")
+        if "PRIVMSG" in obj_data.command and settings.NICKNAME in args[1]:
+            irc.privmsg(channel, " ".join(args[2:]))
\ No newline at end of file
diff --git a/wmd/actions/modules.py b/wmd/actions/modules.py
new file mode 100644
index 0000000..ed55609
--- /dev/null
+++ b/wmd/actions/modules.py
@@ -0,0 +1,56 @@
+from wmd.actions import Action
+
+import settings
+
+class ReloadModule(Action):
+    def recv_msg(self, irc, obj_data):
+        username = obj_data.get_username()
+
+        if username in settings.ADMINS:
+            args = obj_data.params.split(" ")
+            if "PRIVMSG" in obj_data.command and "RELOAD" in args[1].upper():
+                module = args[2]
+                if not module in irc.actions:
+                    irc.privmsg(username, "Invalid Module: %s")
+                    return
+                elif module == self.__class__.__name__:
+                    irc.privmsg(username, "Unable to reload self. Try restarting")
+                    return
+                module_class = irc.actions[module].__module__
+                module_path = module_class + '.' + module
+
+                del(irc.actions[module])
+                irc.load_action(module_path)
+
+                msg = "Reloaded %s" % (module_path,)
+                self.log(msg)
+                irc.privmsg(username, msg)
+
+class LoadModule(Action):
+    def recv_msg(self, irc, obj_data):
+        username = obj_data.get_username()
+
+        if username in settings.ADMINS:
+            args = obj_data.params.split(" ")
+            if "PRIVMSG" in obj_data.command and "LOAD" in args[1].upper():
+                module_path = args[2]
+                if module_path in irc.actions:
+                    irc.privmsg(username, "Module %s already loaded" % (module_path,))
+                    return
+                #irc.load_action(module_path)
+
+                msg = "Loading %s" % (module_path,)
+                self.log(msg)
+                irc.privmsg(username, msg)
+                return {'load': module_path}
+
+class ListModules(Action):
+    def recv_msg(self, irc, obj_data):
+        username = obj_data.get_username()
+
+        if username in settings.ADMINS:
+            args = obj_data.params.split(" ")
+            if "PRIVMSG" in obj_data.command and "LIST" in args[1].upper():
+                for module in irc.actions:
+                    msg = module
+                    irc.privmsg(username, msg)
diff --git a/wmd/actions/passive/nickserv.py b/wmd/actions/passive/nickserv.py
index fa91d5b..e705677 100644
--- a/wmd/actions/passive/nickserv.py
+++ b/wmd/actions/passive/nickserv.py
@@ -14,8 +14,8 @@ class IdentWithNickserv(Action):
             if 'identify' in msg.lower()\
             and not self.logged_in:
                 msg = 'identify %s' % (settings.NICKSERV_PASSWORD)
-                print "%s: Logging in..." % self.__class__.__name__
+                self.log("Logging in...")
                 irc.privmsg(username, msg)
                 self.logged_in = True
             elif 'are now identified' in msg.lower():
-                print "%s: Logged in." % (self.__class__.__name__)
\ No newline at end of file
+                self.log("Logged in.")
\ No newline at end of file
diff --git a/wmd/actions/passive/pong.py b/wmd/actions/passive/pong.py
index 813147d..19e12a7 100644
--- a/wmd/actions/passive/pong.py
+++ b/wmd/actions/passive/pong.py
@@ -9,6 +9,6 @@ class RespondToPing(Action):
                 server = obj_data.params[1:]
             else:
                 server = obj_data.params
-            msg = "-> PONG %s" % server
-            print msg
+            msg = "PONG %s" % server
+            self.log(msg)
             irc.rawsend(msg)
\ No newline at end of file
diff --git a/wmd/irc.py b/wmd/irc.py
index 558712d..dd99f5c 100644
--- a/wmd/irc.py
+++ b/wmd/irc.py
@@ -14,7 +14,7 @@ class IRC(object):
         self.nick = nick
         self.name = name
         self.port = port
-        self.actions = []
+        self.actions = dict()
 
         self.load_actions()
 
@@ -66,7 +66,7 @@ class IRC(object):
         module_name, class_name = path.rsplit('.', 1)
         module = __import__(module_name, globals(), locals(), [class_name], -1)
         classz = getattr(module, class_name)
-        self.actions.insert(0, classz())
+        self.actions[class_name] = classz()
 
     def __call__(self, *args, **kwargs):
         """
@@ -82,14 +82,24 @@ class IRC(object):
             if data[-1] != '\n':
                 data = data + self.irc.recv(4096)
 
+            # For dynamic loading, we have to add to the actions dictionary after we're through looping. Maybe there
+            # are some other cases to use the post_loop_commands
             for line in data.split('\r\n'):
                 obj_data = parser.IRCParse(line)
                 #pass to action handlers here...
                 if (obj_data.prefix == '') and (obj_data.command == '') and (obj_data.params == ''):
                     continue
 
-                print "!" + obj_data.prefix + "~" + obj_data.command + "~" + obj_data.params
-                for action in self.actions:
-                    retval = action.recv_msg(self, obj_data)
-                    if retval:
-                        self.rawsend(retval)
\ No newline at end of file
+                print "<- " + obj_data.prefix + "~" + obj_data.command + "~" + obj_data.params
+
+                modules_to_load = []
+                for plugin_name in self.actions:
+                    retval = self.actions[plugin_name].recv_msg(self, obj_data)
+                    if type(retval) == type(dict()):
+                        if retval.has_key('load'):
+                            modules_to_load.append(retval['load'])
+                    elif type(retval) == type('str is str'):
+                        self.rawsend(retval)
+
+                for module in modules_to_load:
+                    self.load_action(module)
diff --git a/wmd/parser.py b/wmd/parser.py
index 24b965c..f4a704f 100644
--- a/wmd/parser.py
+++ b/wmd/parser.py
@@ -18,6 +18,9 @@ class IRCParse(object):
         else:
             return False
 
+    def get_channel(self):
+        return self.get_username()
+
     def _process_data(self, data):
         data = data.strip()