nemunaire
/
epaper
1
0
Fork 0
Code Issues Pull Requests Releases Activity

ratp: Differentiate travaux and good lines

This commit is contained in:
nemunaire 2023-01-19 12:57:53 +01:00
parent 615f2a8652
commit 7c9c2a03f0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ratp.py
View File

@ -70,7 +70,7 @@ class IDFMAPI:
cleanrA = re.compile('<a.*?>.*?</a>')
return {
"InfoChannelRef": {
"value": "Perturbation" if src["severity"] >= 2 else "Travaux",
"value": "Perturbation" if src["severity"] >= 2 else ("Travaux" if src["severity"] == 1 else "Message"),
},
"Content": {
"Message": [{
@ -119,11 +119,11 @@ class IDFMAPI:
for i in range(len(res["result"]["schedules"])):
if "message" in res["result"]["schedules"][i]:
if res["result"]["schedules"][i]["message"] == "Train a l'approche" or res["result"]["schedules"][i]["message"] == "Train à l'approche" or res["result"]["schedules"][i]["message"] == "Train à quai" or res["result"]["schedules"][i]["message"] == "Train a quai" or res["result"]["schedules"][i]["message"] == "A l'approche" or res["result"]["schedules"][i]["message"] == "A l'arret":
if res["result"]["schedules"][i]["message"] == "Train a l'approche" or res["result"]["schedules"][i]["message"] == "Train à l'approche" or res["result"]["schedules"][i]["message"] == "Train à quai" or res["result"]["schedules"][i]["message"] == "Train a quai" or res["result"]["schedules"][i]["message"] == "A l'approche" or res["result"]["schedules"][i]["message"] == "A l'arret" or res["result"]["schedules"][i]["message"] == "A l'arrêt" or res["result"]["schedules"][i]["message"] == "A quai":
res["result"]["schedules"][i]["message"] = now.strftime("%H:%M")
elif res["result"]["schedules"][i]["message"].endswith(" mn"):
res["result"]["schedules"][i]["message"] = (now + timedelta(minutes=int(res["result"]["schedules"][i]["message"].split(" ")[0]))).strftime("%H:%M")
res["result"]["schedules"][i]["message"] = res["result"]["schedules"][i]["message"].replace(" Retardé", "+").replace("Train retardé", "...")
res["result"]["schedules"][i]["message"] = res["result"]["schedules"][i]["message"].replace(" Retardé", "+").replace("Train retardé", "++").replace("Retardé", "++")
return [m for m in res["result"]["schedules"] if "message" in m and m["message"] != "Train sans arrêt"]
@ -279,7 +279,7 @@ class RATPWeatherModule:
if "InfoChannelRef" in info:
states.append(info["InfoChannelRef"]["value"])
fill = "gray" if "Perturbation" not in states else "black"
fill = "black" if "Perturbation" in states else ("gray" if "Travaux" in states else "lightgray")
icon = IDFMAPI.get_line_icon(mode, line, line_height, fill=fill)
image.paste(icon, (align_x, align_y), icon)