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

NR: slightly simplify association summaries

Browse source
This commit is contained in:
Evelyn 2017-10-31 23:13:16 +00:00
parent e669b7c2e6
commit 57dfb56ba7
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/nr.py
View file

@ -426,10 +426,8 @@ class Module(object):
if not station["first"]: station["called"] = True if not station["first"]: station["called"] = True
for station in stations: for station in stations:
station["divide_summary"] = ""
for assoc in station["associations"]: for assoc in station["associations"]:
station["divide_summary"] += ", " if station["divide_summary"] else "" assoc["summary"] = "{arrow} {assoc[category]} {assoc[uid_assoc]} {dir_arrow} {assoc[far_name]} ({code})".format(assoc=assoc, arrow=assoc["from"]*"<-" or "->", dir_arrow=(assoc["direction"])*"<-" or "->", code=assoc["far_crs"] or assoc["far_tiploc"])
station["divide_summary"] += "{arrow} {assoc[category]} {assoc[uid_assoc]} {dir_arrow} {assoc[far_name]} ({code})".format(assoc=assoc, arrow=assoc["from"]*"<-" or "->", dir_arrow=(assoc["direction"])*"<-" or "->", code=assoc["far_crs"] or assoc["far_tiploc"])
if station["passing"]: if station["passing"]:
station["times"]["arrival"]["status"], station["times"]["departure"]["status"] = 5, 5 station["times"]["arrival"]["status"], station["times"]["departure"]["status"] = 5, 5
@ -446,7 +444,7 @@ class Module(object):
Utils.color(colours[station["times"][filter["type"]]["status"]]), Utils.color(colours[station["times"][filter["type"]]["status"]]),
station["times"][filter["type"]]["short"], station["times"][filter["type"]]["short"],
Utils.color(Utils.FONT_RESET), Utils.color(Utils.FONT_RESET),
station["divide_summary"], ", ".join([a["summary"] for a in station["associations"]]),
) )
station["summary_external"] = "%1s%-7s %1s%-7s %-3s %-2s %-3s %s%s" % ( station["summary_external"] = "%1s%-7s %1s%-7s %-3s %-2s %-3s %s%s" % (
"~"*station["times"]["arrival"]["estimate"], "~"*station["times"]["arrival"]["estimate"],
@ -457,7 +455,7 @@ class Module(object):
station["length"] or "?", station["length"] or "?",
station["crs"] or station["tiploc"], station["crs"] or station["tiploc"],
station["name"], station["name"],
"\n" + station["divide_summary"] if station["divide_summary"] else "", "\n" + "\n".join([a["summary"] for a in station["associations"]]) if station["associations"] else "",
) )
stations_filtered = [] stations_filtered = []