More reformatting, colours!

This commit is contained in:
Evelyn 2016-11-04 16:11:03 +00:00
parent 08894b26b5
commit 46766507c5

View file

@ -77,6 +77,8 @@ class Module(object):
trains_string)) trains_string))
def service(self, event): def service(self, event):
colours = [Utils.COLOR_LIGHTBLUE, Utils.COLOR_GREEN, Utils.COLOR_RED]
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]
@ -105,14 +107,23 @@ class Module(object):
}) })
for station in stations: for station in stations:
station["on_time"] = station["time"] == "On time"
station["status"] = 1 if station["on_time"] else 2
if station["called"]: station["status"] = 0
if station["time"] == "On time": station["time"] = station["scheduled"] if station["time"] == "On time": station["time"] = station["scheduled"]
format = "(%s/%s at %s)" if station["called"] else "%s/%s, %s" station["summary"] = "%s (%s, %s %s%s%s)" % (
station["summary"] = format % (station["crs"], station["name"], station["time"]) station["name"], station["crs"], "at" if station["called"] else "est",
Utils.color(colours[station["status"]]),
station["time"],
Utils.color(Utils.FONT_RESET)
)
done_count = len([s for s in stations if s["called"]]) done_count = len([s for s in stations if s["called"]])
total_count = len(stations) total_count = len(stations)
event["stdout"].write("%s car %s train (%s/%s): %s" % (query["length"], event["stdout"].write("%s car %s train (%s/%s): %s" % (query["length"],
query["operator"], done_count, total_count, query["operator"], done_count, total_count,
"-> ".join([s["summary"] for s in stations]))) ", ".join([s["summary"] for s in stations])))