scripts

commit: b1e5e1a291a062d675e0d383b51481f8bc2e0976
parent: adbbbff2d9ffd260307ab3e758286d4ac47c79d5
Author: lanodan <lanodan.delta@free.fr>
Date:   Tue, 25 Mar 2014 20:33:18 +0100

Uh woups i forget what i modified

Diffstat:
M
IRCBot/IRCBot.py
38
++++++++++++--------------------------
M
IRCBot/config.ini
8
+++++---

2 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/IRCBot/IRCBot.py b/IRCBot/IRCBot.py
@@ -12,23 +12,6 @@ import subprocess
 import ConfigParser
 import os
 
-def load_config_value(section, option):
-  try:
-    out = Config.get(section)[option]
-    return out
-  except:
-    print('exception on '+option)
-
-def load_config():
-  config = ConfigParser.ConfigParser()
-  configLocation = os.path.join(os.path.dirname(__file__), './config.ini')
-  config.read(configLocation)
-  botnick = load_config_value('Config', 'Nick')
-  server  = load_config_value('Config', 'Server')
-  port    = load_config_value('Config', 'Port')
-  channel = load_config_value('Config', 'Channel')
-  quitMsg = load_config_value('Config', 'QuitMessage')
-
 def get_title(textInput):
   idx1=textInput.find('<title>')
   idx2=textInput.find('</title>')
@@ -50,15 +33,18 @@ def log(line):
   log.write(line+'\n')
   log.close()
 
-botnick = 'feyris-nyannyan'
-server  = 'holmes.freenode.net'
-port    = '6667'
-channel = '#kisune'
-quitMsg = 'Sayonara-nyan !'
-source  = 'My sourcecode is under CC-BY-SA and available at the following address: https://github.com/lanodan/scripts/tree/master/IRCBot'
-passwd  = ''
-
-load_config()
+config = ConfigParser.ConfigParser()
+if (config.read('config.ini')):
+  botnick = config.get('Config', 'nick')
+  passwd  = config.get('Config', 'passwd')
+  server  = config.get('Config', 'server')
+  port    = config.get('Config', 'port')
+  channel = config.get('Config', 'channel')
+  quitMsg = config.get('Config', 'quitMessage')
+  source  = config.get('Config', 'source')
+else:
+  print '[ERROR] Couln\'d load config.ini. Exiting…'
+  sys.exit(1)
 
 irc = socket.socket(socket.AF_INET, socket.SOCK_STREAM) #defines the socket
 irc.connect((server, int(port)))                                                         #connects to the server
diff --git a/IRCBot/config.ini b/IRCBot/config.ini
@@ -1,6 +1,8 @@
-[DEFAULT]
-Nick=lanobot
+[Config]
+Nick=feyris-nyannyan
+Passwd=ElPsyCongroo
 Server=holmes.freenode.net
 Port=6667
 Channel=#kisune
-QuitMessage=Emergency time shift !
+QuitMessage=Sayonara-nyan !
+source=My sourcecode is under CC-BY-SA and available at the following address: https://github.com/lanodan/scripts/tree/master/IRCBot