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

Revert NR departures to showing times, not countdown, add colours, allow referring to service from departures

Browse source
This commit is contained in:
Evelyn 2016-11-04 17:06:07 +00:00
parent 46766507c5
commit 293f1d5935
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
modules/nr.py
View file

@ -5,9 +5,11 @@ from suds.client import Client
URL = 'https://lite.realtime.nationalrail.co.uk/OpenLDBWS/wsdl.aspx?2016-02-16' URL = 'https://lite.realtime.nationalrail.co.uk/OpenLDBWS/wsdl.aspx?2016-02-16'
class Module(object): class Module(object):
_name = "NR" _name = "NR"
def __init__(self, bot): def __init__(self, bot):
self.bot = bot self.bot = bot
self.result_map = {}
bot.events.on("received").on("command").on("nrtrains" bot.events.on("received").on("command").on("nrtrains"
).hook(self.arrivals, min_args=1, ).hook(self.arrivals, min_args=1,
help="Get train information for a station (Powered by NRE)", help="Get train information for a station (Powered by NRE)",
@ -53,15 +55,22 @@ class Module(object):
trains.append({ trains.append({
"estimated" : t["etd"], "estimated" : t["etd"],
"scheduled" : t["std"], "scheduled" : t["std"],
"time" : self.span(query["generatedAt"], t["std"], t["etd"]), "time" : t["std"] if t["etd"] == "On time" else t["etd"],
"on_time" : t["etd"] == "On time",
"dest_name": t["destination"][0][0]["locationName"], "dest_name": t["destination"][0][0]["locationName"],
"dest_id": t["destination"][0][0]["crs"], "dest_id": t["destination"][0][0]["crs"],
"service_id" : t["serviceID"],
"via": '' if not "via" in t["destination"][0][0] else t["destination"][0][0]["via"], "via": '' if not "via" in t["destination"][0][0] else t["destination"][0][0]["via"],
"platform": "?" if not "platform" in t else t["platform"] "platform": "?" if not "platform" in t else t["platform"]
}) })
for t in trains:
t["dest_via"] = t["dest_name"] + (" " if t["via"] else '') + t["via"]
trains = sorted(trains, key=lambda t: int(t["scheduled"].replace(":", ""))) trains = sorted(trains, key=lambda t: int(t["scheduled"].replace(":", "")))
self.result_map[event["target"].name] = trains
trains_filtered = [] trains_filtered = []
train_dest_plat = [] train_dest_plat = []
@ -70,7 +79,10 @@ class Module(object):
train_dest_plat.append((train["dest_name"] + train["via"], train["platform"])) train_dest_plat.append((train["dest_name"] + train["via"], train["platform"]))
trains_filtered.append(train) trains_filtered.append(train)
trains_string = ", ".join(["%s %s (plat %s, %s)" % (t["dest_name"], t["via"], t["platform"], t["time"], trains_string = ", ".join(["%s (plat %s, %s%s%s)" % (t["dest_via"], t["platform"],
Utils.color(Utils.COLOR_GREEN if t["on_time"] else Utils.COLOR_RED),
t["time"],
Utils.color(Utils.FONT_RESET)
) for t in trains_filtered]) ) for t in trains_filtered])
event["stdout"].write("%s (%s): %s" % (query["locationName"], crs, event["stdout"].write("%s (%s): %s" % (query["locationName"], crs,
@ -82,6 +94,16 @@ class Module(object):
token = self.bot.config["nre-api-key"] token = self.bot.config["nre-api-key"]
service_id = event["args_split"][0] service_id = event["args_split"][0]
if service_id.isdigit():
if not event["target"].name in self.result_map:
event["stdout"].write("No history")
return
results = self.result_map[event["target"].name]
if int(service_id) >= len(results):
event["stdout"].write("%s is too high. Remember that the first departure is 0" % service_id)
return
service_id = results[int(service_id)]["service_id"]
client = Client(URL) client = Client(URL)
header_token = client.factory.create('ns2:AccessToken') header_token = client.factory.create('ns2:AccessToken')