Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

NR: List delayed trains properly, strip prefix

Browse source
This commit is contained in:
Evelyn 2017-08-29 22:53:49 +01:00
parent e69a0c3937
commit a78b713268
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/nr.py
View file

@ -188,7 +188,9 @@ class Module(object):
"platform_hidden": "platformIsHidden" in t and t["platformIsHidden"], "platform_hidden": "platformIsHidden" in t and t["platformIsHidden"],
"toc": t["operatorCode"], "toc": t["operatorCode"],
"cancelled" : t["isCancelled"] if "isCancelled" in t else False, "cancelled" : t["isCancelled"] if "isCancelled" in t else False,
"delayed" : t["departureType"]=="Delayed" if "departureType" in t else None,
"cancel_reason" : t["cancelReason"]["value"] if "cancelReason" in t else "", "cancel_reason" : t["cancelReason"]["value"] if "cancelReason" in t else "",
"delay_reason" : t["delayReason"]["value"] if "delayReason" in t else "",
"terminating" : not "std" in t and not "etd" in t and not "atd" in t, "terminating" : not "std" in t and not "etd" in t and not "atd" in t,
"bus" : t["trainid"]=="0B00", "bus" : t["trainid"]=="0B00",
"times" : self.process(t) "times" : self.process(t)
@ -205,9 +207,12 @@ class Module(object):
parsed["departure_only"] = location_code in [a["code"] for a in parsed["origins"]] parsed["departure_only"] = location_code in [a["code"] for a in parsed["origins"]]
if parsed["cancelled"]: if parsed["cancelled"] or parsed["delayed"]:
for k, time in parsed["times"].items(): for k, time in parsed["times"].items():
time["short"], time["on_time"], time["status"] = "Cancelled: %s" % parsed["cancel_reason"], False, 2 time["short"], time["on_time"], time["status"], time["prefix"] = (
"%s: %s" % ("Cancelled" if parsed["cancel_reason"] else "Delayed", parsed["cancel_reason"] or parsed["delay_reason"] or "?"),
False, 2, ""
)
trains.append(parsed) trains.append(parsed)