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

NR: Cancellation codes inline, reference to 'major' severity nrcc messages, filter now accepts ! for bools

Browse source
This commit is contained in:
Evelyn 2017-03-08 09:35:23 +00:00
parent f6cb42e5af
commit e3c97db55f
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/nr.py
View file

@ -58,7 +58,7 @@ class Module(object):
elif "=" in arg: elif "=" in arg:
params[arg.split("=", 1)[0]] = arg.split("=", 1)[1] params[arg.split("=", 1)[0]] = arg.split("=", 1)[1]
else: else:
params[arg] = True params[arg.replace("!", "")] = '!' not in arg
ret = {k: v[0] for k,v in defaults.items()} ret = {k: v[0] for k,v in defaults.items()}
ret["default"] = True ret["default"] = True
@ -107,9 +107,16 @@ class Module(object):
method = client.service.GetArrivalDepartureBoardByCRS if len(location_code) == 3 else client.service.GetArrivalDepartureBoardByTIPLOC method = client.service.GetArrivalDepartureBoardByCRS if len(location_code) == 3 else client.service.GetArrivalDepartureBoardByTIPLOC
query = method(100, location_code, datetime.now().isoformat().split(".")[0], filter["period"], query = method(100, location_code, datetime.now().isoformat().split(".")[0], filter["period"],
nr_filterlist, "to", '', "PBS", False) nr_filterlist, "to", '', "PBS", False)
nrcc_severe = len([a for a in query["nrccMessages"][0] if a["severity"] == "Major"]) if "nrccMessages" in query else 0
station_summary = "%s (%s, %s%s)" % (query["locationName"], query["crs"], query["stationManagerCode"],
", %s%s severe messages%s" % (Utils.color(Utils.COLOR_RED), nrcc_severe, Utils.color(Utils.FONT_RESET)) if nrcc_severe else ""
)
if not "trainServices" in query and not "busServices" in query: if not "trainServices" in query and not "busServices" in query:
event["stdout"].write("%s (%s): No services for the next %s minutes" % ( event["stdout"].write("%s: No services for the next %s minutes" % (station_summary, filter["period"]))
query["locationName"], query["crs"], filter["period"]))
return return
trains = [] trains = []
@ -128,6 +135,7 @@ 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,
"cancel_reason" : t["cancelReason"]["value"] if "cancelReason" 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"
} }
@ -149,7 +157,7 @@ class Module(object):
parsed["datetime"] = parsed["time"] parsed["datetime"] = parsed["time"]
if parsed["cancelled"]: if parsed["cancelled"]:
parsed["time"], parsed["timeprefix"], parsed["prediction"] = ("Cancelled", '', False) parsed["time"], parsed["timeprefix"], parsed["prediction"] = ("Cancelled: %s" % parsed["cancel_reason"], '', False)
else: else:
parsed["time"] = parsed["time"].strftime("%H%M") parsed["time"] = parsed["time"].strftime("%H%M")
@ -198,7 +206,9 @@ class Module(object):
Utils.color(Utils.FONT_RESET) Utils.color(Utils.FONT_RESET)
) for t in trains_filtered]) ) for t in trains_filtered])
event["stdout"].write("%s (%s)%s: %s" % (query["locationName"], query["crs"], event["stdout"].write("%s (%s, %s%s)%s: %s" % (query["locationName"], query["crs"],
query["stationManagerCode"],
", %s%s severe messages%s" % (Utils.color(Utils.COLOR_RED), nrcc_severe, Utils.color(Utils.FONT_RESET)) if nrcc_severe else "",
" departures calling at %s" % filter["inter"] if filter["inter"] else '', " departures calling at %s" % filter["inter"] if filter["inter"] else '',
trains_string)) trains_string))