1st refacto

script/getstats.py

@@ -20,12 +20,30 @@ def getColor():
     b = random.randrange(255)
     return 'rgb({:0},{:0},{:0})'.format(r,g,b)
 
+def save(info):
+  # Récupération du répertoire racine du repo
+  rootFolder = os.path.join(os.path.dirname(__file__), '..')
+  # Répertoire pour stocker le fichier de sortie
+  dataFolder = os.path.join(rootFolder, 'public', 'data')
+
+  statsFilePath = os.path.abspath(
+      os.path.join(dataFolder, 'channelsstat.json'))
+  with open(statsFilePath, "w") as file_write:
+    json.dump(info, file_write)
+
+def createElement(label, color, data) :
+  return {
+    "label": label,
+    "backgroundColor": color,
+    "data": data
+  }
+
+def main():
   rocket = RocketChat(cfg.rocket['user'], cfg.rocket['password'],
                       server_url='https://coa.crapaud-fou.org')
   index = 0
   labels = [None] * 12
   messagesByChannel = []
-messagesByTsunamy = []
   usersByChannel = []
   messagesDataTsunamy = {
     "global": [0] * 12,
@@ -44,31 +62,13 @@ info = {
     "labels": labels,
     "messagesByChannel": messagesByChannel,
     "usersByChannel": usersByChannel,
-  "messagesByTsunamy": [{        
+    "messagesByTsunamy": [
-        "label": "global",
+      createElement("global", getColor(), messagesDataTsunamy['global']),
-        "backgroundColor": getColor(),
+      createElement("project", getColor(), messagesDataTsunamy['project']),
-        "data": messagesDataTsunamy['global']
+      createElement("democratie", getColor(), messagesDataTsunamy['democraty']),
-    },
+      createElement("ecologie", getColor(), messagesDataTsunamy['ecology']),
-    {        
+      createElement("technologie", getColor(), messagesDataTsunamy['technology'])
-        "label": "projet",
+    ],
-        "backgroundColor": getColor(),
-        "data": messagesDataTsunamy['project']
-    },
-    {        
-        "label": "democratie",
-        "backgroundColor": getColor(),
-        "data": messagesDataTsunamy['democraty']
-    },
-    {        
-        "label": "ecologie",
-        "backgroundColor": getColor(),
-        "data": messagesDataTsunamy['ecology']
-    },
-    {        
-        "label": "technologie",
-        "backgroundColor": getColor(),
-        "data": messagesDataTsunamy['technology']
-    }],
     "usersGlobal": usersGlobal
   }
 
@@ -76,7 +76,6 @@ usersTest = [None] * 12
 
   while True:
     channels = rocket.channels_list(offset=index).json()
-  totalChannels = channels['total']
       
     for channel in channels['channels']:
       dataMess = []
@@ -123,17 +122,8 @@ while True:
         end = begin + monthdelta(1)
     
       color = getColor()
-    messageByChannel = {
+      messageByChannel = createElement(channel['name'], color,dataMess)
-        "label": channel['name'],
+      userByChannel = createElement( channel['name'], color,dataUsers)
-        "backgroundColor": color,
-        "data": dataMess
-    }
-
-    userByChannel = {
-        "label": channel['name'],
-        "backgroundColor": color,
-        "data": dataUsers
-    }
 
       messagesByChannel.append(messageByChannel)
       usersByChannel.append(userByChannel)
@@ -145,20 +135,10 @@ while True:
   for id in range(0, 12):
     usersTest[id] = len(set(usersTest[id]))
 
-userGlobal = {
+  userGlobal = createElement( 'global', 'red', usersTest)
-    "label": 'global',
-    "backgroundColor": 'red',
-    "data": usersTest
-}
   usersGlobal.append(userGlobal)
 
-# Récupération du répertoire racine du repo
+  save(info)
-rootFolder = os.path.join(os.path.dirname(__file__), '..')
-# Répertoire pour stocker le fichier de sortie
-dataFolder = os.path.join(rootFolder, 'public', 'data')
-
-statsFilePath = os.path.abspath(
-    os.path.join(dataFolder, 'channelsstat.json'))
-with open(statsFilePath, "w") as file_write:
-  json.dump(info, file_write)
 
+if __name__ == "__main__":
+    main()