diff --git a/asmodee.py b/asmodee.py index 9000763..a571676 100755 --- a/asmodee.py +++ b/asmodee.py @@ -1736,31 +1736,38 @@ async def eau(room, message): cette_commune = eau_url.replace("", ville).replace("", "nom_commune") oauth = rte_token() result = oauth.get(cette_commune) - eaux = json.loads(result.text) - if (len(eaux["data"]) > 0): - try: - f = True - for eau in eaux["data"]: - if (f): - nom = eau["nom_commune"] - distrib = eau["nom_distributeur"] - concl = eau["conclusion_conformite_prelevement"] - await msg(room, "Prélèvement à " + nom + " réseau " + distrib + ". " + concl, sender) - f = False - date = eau["date_prelevement"][0:10] - res = eau["resultat_alphanumerique"] - unite = str(eau["libelle_unite"]) - if (unite == "SANS OBJET"): - unite = "" - limite = "(" + str(eau["limite_qualite_parametre"]) + ")" - if (limite == "(None)"): - limite = "" - param = eau["libelle_parametre"] + " " + limite - await msg(room, "Résultat du " + date + " : " + res + unite + " / " + param + ".", sender) - except: - await msg(room, str(eaux), sender) + eaux = None + try: + eaux = json.loads(result.text) + except: + eaux = None + if (eaux is not None): + if (len(eaux["data"]) > 0): + try: + f = True + for eau in eaux["data"]: + if (f): + nom = eau["nom_commune"] + distrib = eau["nom_distributeur"] + concl = eau["conclusion_conformite_prelevement"] + await msg(room, "Prélèvement à " + nom + " réseau " + distrib + ". " + concl, sender) + f = False + date = eau["date_prelevement"][0:10] + res = eau["resultat_alphanumerique"] + unite = str(eau["libelle_unite"]) + if (unite == "SANS OBJET"): + unite = "" + limite = "(" + str(eau["limite_qualite_parametre"]) + ")" + if (limite == "(None)"): + limite = "" + param = eau["libelle_parametre"] + " " + limite + await msg(room, "Résultat du " + date + " : " + res + unite + " / " + param + ".", sender) + except: + await msg(room, str(eaux), sender) + else: + await msg(room, "Commune non trouvée", sender) else: - await msg(room, "Commune non trouvée", sender) + await msg(room, "Rapport d'eaux non trouvé", sender) else: await msg(room, "!eau ", sender)