From fdd4847f71c86e1f9bea091f2fc6a29169b769f5 Mon Sep 17 00:00:00 2001
From: nemunaire <nemunaire@nemunai.re>
Date: Thu, 28 Aug 2014 11:35:37 +0200
Subject: [PATCH] In config: nick, owner and realname can be overwrited in
 server node

---
 bot.py             |  2 +-
 prompt/builtins.py | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/bot.py b/bot.py
index 7aeaf01..c3f35e7 100644
--- a/bot.py
+++ b/bot.py
@@ -190,7 +190,7 @@ class Bot:
         self.update_timer()
 
 
-    def addServer(self, node, nick, owner, realname, ssl=False):
+    def add_server(self, node, nick, owner, realname, ssl=False):
         """Add a new server to the context"""
         srv = IRCServer(node, nick, owner, realname, ssl)
         srv.add_hook = lambda h: self.hooks.add_hook("irc_hook", h, self)
diff --git a/prompt/builtins.py b/prompt/builtins.py
index ac6ab64..4dd294f 100644
--- a/prompt/builtins.py
+++ b/prompt/builtins.py
@@ -62,18 +62,20 @@ def load_file(filename, context):
         config = xmlparser.parse_file(filename)
 
         # This is a true nemubot configuration file, load it!
-        if (config.getName() == "nemubotconfig"
-            or config.getName() == "config"):
+        if (config.getName() == "botconfig"
+            or config.getName() == "nemubotconfig"):
             # Preset each server in this file
             for server in config.getNodes("server"):
-                if context.addServer(server, config["nick"],
-                                     config["owner"], config["realname"],
+                nick = server["nick"] if server.hasAttribute("nick") else config["nick"]
+                owner = server["owner"] if server.hasAttribute("owner") else config["owner"]
+                realname = server["realname"] if server.hasAttribute("realname") else config["realname"]
+                if context.add_server(server, nick, owner, realname,
                                      server.hasAttribute("ssl")):
-                    logger.info("Server `%s:%s' successfully added.",
-                                server["server"], server["port"])
+                    print("Server `%s:%s' successfully added." %
+                          (server["server"], server["port"]))
                 else:
-                    logger.warn("Server `%s:%s' already added, skiped.",
-                                server["server"], server["port"])
+                    print("Server `%s:%s' already added, skiped." %
+                          (server["server"], server["port"]))
 
             # Load files asked by the configuration file
             for load in config.getNodes("load"):
@@ -88,7 +90,7 @@ def load_file(filename, context):
             print ("  Can't load `%s'; this is not a valid nemubot "
                    "configuration file." % filename)
 
-        # Unexisting file, assume a name was passed, import the module!
+    # Unexisting file, assume a name was passed, import the module!
     else:
         __import__(filename)