From 5f86b35cf0d080e5a6b3336d9566233bc7eb793a Mon Sep 17 00:00:00 2001
From: nemunaire <nemunaire@nemunai.re>
Date: Tue, 9 Sep 2014 07:02:41 +0200
Subject: [PATCH] Fix context reload feature

---
 bot.py     | 32 +++++++++++++++++++++++++++++---
 nemubot.py |  1 +
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/bot.py b/bot.py
index 4881857..f5fc855 100644
--- a/bot.py
+++ b/bot.py
@@ -451,6 +451,7 @@ def _ctcp_response(sndr, msg):
     return response.Response(sndr, msg, ctcp=True)
 
 def hotswap(bak):
+    bak.stop = True
     new = Bot(str(bak.ip), bak.modules_paths, bak.data_path)
     new.ctcp_capabilities = bak.ctcp_capabilities
     new.servers = bak.servers
@@ -470,26 +471,51 @@ def reload():
     import consumer
     imp.reload(consumer)
 
-    import DCC
-    imp.reload(DCC)
-
     import event
     imp.reload(event)
 
+    import exception
+    imp.reload(exception)
+
     import hooks
     imp.reload(hooks)
 
+    import hooksmanager
+    imp.reload(hooksmanager)
+
     import importer
     imp.reload(importer)
 
     import message
     imp.reload(message)
 
+    import prompt
+    imp.reload(prompt)
     import prompt.builtins
     imp.reload(prompt.builtins)
 
+    import response
+    imp.reload(response)
+
     import server
+    rl,wl,xl = server._rlist,server._wlist,server._xlist
     imp.reload(server)
+    server._rlist,server._wlist,server._xlist = rl,wl,xl
+    import server.socket
+    imp.reload(server.socket)
+    import server.IRC
+    imp.reload(server.IRC)
+
+    import tools
+    imp.reload(tools)
+    import tools.countdown
+    imp.reload(tools.countdown)
+    import tools.date
+    imp.reload(tools.date)
+    import tools.web
+    imp.reload(tools.web)
+    import tools.wrapper
+    imp.reload(tools.wrapper)
 
     import xmlparser
     imp.reload(xmlparser)
diff --git a/nemubot.py b/nemubot.py
index a958de4..e56297e 100755
--- a/nemubot.py
+++ b/nemubot.py
@@ -81,6 +81,7 @@ if __name__ == "__main__":
             bot.reload()
             print("\033[1;32mContext reloaded\033[0m, now in Nemubot %s" %
                   bot.__version__)
+            context.start()
         except:
             logger.exception("\033[1;31mUnable to reload the prompt due to errors.\033[0"
                              "m Fix them before trying to reload the prompt.")