From 26bc2a755272b3efcd4a1e00ef37894574b975be Mon Sep 17 00:00:00 2001
From: Nemesis <nemesis@ombreport.info>
Date: Wed, 23 May 2018 20:57:28 +0200
Subject: [PATCH] externalisation de la config

---
 README.md   |  2 +-
 asmodee.ini |  6 ++++++
 asmodee.py  | 23 +++++++++++++++++------
 3 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 asmodee.ini

diff --git a/README.md b/README.md
index 1858eb2..fa27bac 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Bot lanceur de dés pour Matrix en python
 
 --- Depend de matrix_bot_api (qui depend de matrix_client)  
---- Il faut remplir les variables suivantes :  
+--- Il faut remplir les variables suivantes dans asmodee.ini:  
 * USERNAME = ""  # Bot's username
 * PASSWORD = ""  # Bot's password
 * SERVER = ""  # Matrix server URL
diff --git a/asmodee.ini b/asmodee.ini
new file mode 100644
index 0000000..d622296
--- /dev/null
+++ b/asmodee.ini
@@ -0,0 +1,6 @@
+[AUTH]
+username = ""
+password = ""
+server = ""
+salons = []
+
diff --git a/asmodee.py b/asmodee.py
index bbd7251..6b2bdf6 100755
--- a/asmodee.py
+++ b/asmodee.py
@@ -1,6 +1,8 @@
 import random
 import re
 import copy
+import configparser
+import io
 
 from matrix_bot_api.matrix_bot_api import MatrixBotAPI
 from matrix_bot_api.mregex_handler import MRegexHandler
@@ -9,12 +11,6 @@ from matrix_client.client import MatrixClient
 
 # Version initiale par Philippe Depriester et Clement Gauche
 
-# Global variables
-USERNAME = ""  # Bot's username
-PASSWORD = ""  # Bot's password
-SERVER = ""  # Matrix server URL
-SALONS=["",""] # Salons dans lesquels le bot officie
-
 cartes_base = ["As de carreau", "2 de carreau", "3 de carreau", "4 de carreau", "5 de carreau", "6 de carreau", \
 "7 de carreau", "8 de carreau", "9 de carreau", "10 de carreau", "Valet de carreau", "Dame de carreau", \
 "Roi de carreau", "As de coeur", "2 de coeur", "3 de coeur", "4 de coeur", "5 de coeur", "6 de coeur", \
@@ -551,6 +547,21 @@ def echo_callback(room, event):
 
 
 def main():
+    config = configparser.ConfigParser()
+    config.read('asmodee.ini')
+    USERNAME = ""  # Bot's username
+    PASSWORD = ""  # Bot's password
+    SERVER = ""  # Matrix server URL
+    SALONS=[] # Salons dans lesquels le bot officie
+
+    if ('AUTH' in config):
+        USERNAME = config['AUTH']['username']  # Bot's username
+        PASSWORD = config['AUTH']['password']  # Bot's password
+        SERVER = config['AUTH']['server']  # Matrix server URL
+        SALONS = config['AUTH']['salons'] # Salons dans lesquels le bot officie
+    else:
+        print("Probleme de lecture de configuration asmodee.ini")
+
     # Create an instance of the MatrixBotAPI
     bot = MatrixBotAPI(USERNAME, PASSWORD, SERVER)