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

NR: Train division information for services, simple '*' filtering for arrivals

Browse source
This commit is contained in:
Evelyn 2016-12-20 14:03:06 +00:00
parent 9669f6d058
commit 40b31d9860
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/nr.py
View file

@ -52,6 +52,7 @@ class Module(object):
colours = [Utils.COLOR_LIGHTBLUE, Utils.COLOR_GREEN, Utils.COLOR_RED] colours = [Utils.COLOR_LIGHTBLUE, Utils.COLOR_GREEN, Utils.COLOR_RED]
location_code = event["args_split"][0].upper() location_code = event["args_split"][0].upper()
filter = event["args_split"][1] if len(event["args_split"]) > 1 else ""
token = self.bot.config["nre-api-key"] token = self.bot.config["nre-api-key"]
client = Client(URL) client = Client(URL)
@ -114,7 +115,7 @@ class Module(object):
train_dest_plat = [] train_dest_plat = []
for train in trains: for train in trains:
if (train["destinations"], train["platform"]) in train_dest_plat: continue if (train["destinations"], train["platform"]) in train_dest_plat and not filter: continue
train_dest_plat.append((train["destinations"], train["platform"])) train_dest_plat.append((train["destinations"], train["platform"]))
trains_filtered.append(train) trains_filtered.append(train)
@ -175,7 +176,8 @@ class Module(object):
"prediction": "eta" in station or "etd" in station and not "atd" in station, "prediction": "eta" in station or "etd" in station and not "atd" in station,
"first": len(stations) == 0, "first": len(stations) == 0,
"last" : False, "last" : False,
"cancelled" : station["isCancelled"] if "isCancelled" in station else False "cancelled" : station["isCancelled"] if "isCancelled" in station else False,
"divide_summary": ""
} }
parsed["arrival"] = datetime.strptime(station["eta"] if "eta" in station else station["ata"], "%Y-%m-%dT%H:%M:%S") if "eta" in station or "ata" in station else None parsed["arrival"] = datetime.strptime(station["eta"] if "eta" in station else station["ata"], "%Y-%m-%dT%H:%M:%S") if "eta" in station or "ata" in station else None
parsed["departure"] = datetime.strptime(station["etd"] if "etd" in station else station["atd"], "%Y-%m-%dT%H:%M:%S") if "etd" in station or "atd" in station else None parsed["departure"] = datetime.strptime(station["etd"] if "etd" in station else station["atd"], "%Y-%m-%dT%H:%M:%S") if "etd" in station or "atd" in station else None
@ -187,6 +189,17 @@ class Module(object):
parsed["time"] = parsed["time"].strftime("%H%M") parsed["time"] = parsed["time"].strftime("%H%M")
parsed["on_time"] = parsed["datetime"] == parsed["scheduled"] and not parsed["cancelled"] parsed["on_time"] = parsed["datetime"] == parsed["scheduled"] and not parsed["cancelled"]
parsed["associations"] = {a["category"] : a for a in station["associations"][0]} if "associations" in station else {}
parsed["divides"] = "divide" in parsed["associations"].keys()
if parsed["divides"]:
divide = parsed["associations"]["divide"]
parsed["divide_summary"] = "%sDividing as %s to %s (%s)%s at " % (
Utils.color(Utils.FONT_BOLD),
divide["uid"], divide["destination"],
divide["destCRS"] if "destCRS" in divide else divide["destTiploc"],
Utils.color(Utils.FONT_RESET)
)
stations.append(parsed) stations.append(parsed)
[a for a in stations if a["called"] or a["first"]][-1]["last"] = True [a for a in stations if a["called"] or a["first"]][-1]["last"] = True
@ -199,7 +212,8 @@ class Module(object):
if station["called"]: station["status"] = 0 if station["called"]: station["status"] = 0
if station["passing"]: station["status"] = 3 if station["passing"]: station["status"] = 3
station["summary"] = "%s%s(%s, %s%s%s%s)" % ( station["summary"] = "%s%s%s(%s, %s%s%s%s)" % (
station["divide_summary"],
"*" if station["passing"] else '', "*" if station["passing"] else '',
station["name"] + " " if station["name"] != station["crs"] else '', station["name"] + " " if station["name"] != station["crs"] else '',
station["crs"], ("~" if station["prediction"] else '') + station["timeprefix"], station["crs"], ("~" if station["prediction"] else '') + station["timeprefix"],