3 files changed, 35 insertions, 4 deletions

diff --git a/settings.py b/settings.py
index d6c22a9..32200da 100644
--- a/settings.py
+++ b/settings.py
@@ -21,6 +21,8 @@ ACTIONS = (
     'wmd.actions.modules.ReloadModule',
     'wmd.actions.modules.LoadModule',
     'wmd.actions.modules.ListModules',
+    'wmd.actions.modules.UnloadModule',
+
 )
 
 try:
diff --git a/wmd/actions/modules.py b/wmd/actions/modules.py
index 60a1436..eb726c2 100644
--- a/wmd/actions/modules.py
+++ b/wmd/actions/modules.py
@@ -32,9 +32,9 @@ class LoadModule(Action):
 
         if username in settings.ADMINS:
             args = obj_data.params.split(" ")
-            if "PRIVMSG" in obj_data.command and "LOADMODULE" in args[1].upper():
+            if "PRIVMSG" in obj_data.command and ":LOADMODULE" in args[1].upper():
                 module_path = args[2]
-                if module_path in irc.actions:
+                if module_path.split(".")[-1] in irc.actions:
                     irc.privmsg(username, "Module %s already loaded" % (module_path,))
                     return
                 #irc.load_action(module_path)
@@ -50,7 +50,25 @@ class ListModules(Action):
 
         if username in settings.ADMINS:
             args = obj_data.params.split(" ")
-            if "PRIVMSG" in obj_data.command and "LISTMODULES" in args[1].upper():
+            if "PRIVMSG" in obj_data.command and ":LISTMODULES" in args[1].upper():
                 for module in irc.actions:
                     msg = module
                     irc.privmsg(username, msg)
+
+class UnloadModule(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 ":UNLOADMODULE" in args[1].upper():
+                module_name = args[2]
+                if not module_name in irc.actions:
+                    irc.privmsg(username, "Module %s already unloaded" % (module_name,))
+                    return
+                    #irc.load_action(module_path)
+
+                msg = "Unloading %s" % (module_name,)
+                self.log(msg)
+                irc.privmsg(username, msg)
+                return {'unload': module_name}
\ No newline at end of file
diff --git a/wmd/irc.py b/wmd/irc.py
index dd99f5c..813f743 100644
--- a/wmd/irc.py
+++ b/wmd/irc.py
@@ -64,7 +64,12 @@ class IRC(object):
         Loads the provided action
         """
         module_name, class_name = path.rsplit('.', 1)
-        module = __import__(module_name, globals(), locals(), [class_name], -1)
+        try:
+            module = __import__(module_name, globals(), locals(), [class_name], -1)
+        except ImportError:
+            self.log("Error loading module: %s" %(path,))
+            return
+
         classz = getattr(module, class_name)
         self.actions[class_name] = classz()
 
@@ -93,13 +98,19 @@ class IRC(object):
                 print "<- " + obj_data.prefix + "~" + obj_data.command + "~" + obj_data.params
 
                 modules_to_load = []
+                modules_to_unload = []
                 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'])
+                        if retval.has_key('unload'):
+                            modules_to_unload.append(retval['unload'])
                     elif type(retval) == type('str is str'):
                         self.rawsend(retval)
 
                 for module in modules_to_load:
                     self.load_action(module)
+                for module in modules_to_unload:
+                    if self.actions.has_key(module):
+                        del(self.actions[module])