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

NR: Use station_summary for service listing

Browse source
This commit is contained in:
Evelyn 2017-03-09 12:16:41 +00:00
parent e175567537
commit ad8bde0232
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/nr.py
View file

@ -85,12 +85,12 @@ class Module(object):
location_code = event["args_split"][0].upper() location_code = event["args_split"][0].upper()
filter = self.filter(' '.join(event["args_split"][1:]) if len(event["args_split"]) > 1 else "", { filter = self.filter(' '.join(event["args_split"][1:]) if len(event["args_split"]) > 1 else "", {
"dest": ('', lambda x: x.isalpha() and len(x)==3), "dest": ('', lambda x: x.isalpha() and len(x)==3),
"origin":('', lambda x: x.isalpha() and len(x)==3), "origin":('', lambda x: x.isalpha() and len(x)==3),
"inter": ('', lambda x: x.isalpha() and len(x)==3, lambda x: x.upper()), "inter": ('', lambda x: x.isalpha() and len(x)==3, lambda x: x.upper()),
"toc": ('', lambda x: x.isalpha() and len(x) == 2), "toc": ('', lambda x: x.isalpha() and len(x) == 2),
"dedup": (False, lambda x: type(x)==type(True)), "dedup": (False, lambda x: type(x)==type(True)),
"plat": ('', lambda x: len(x) <= 3), "plat": ('', lambda x: len(x) <= 3),
"type": ("departures", lambda x: x in ["departures", "arrivals", "both"]), "type": ("departures", lambda x: x in ["departures", "arrivals", "both"]),
"terminating": (False, lambda x: type(x)==type(True)), "terminating": (False, lambda x: type(x)==type(True)),
"period": (120, lambda x: x.isdigit() and 1 <= int(x) <= 240, lambda x: int(x)) "period": (120, lambda x: x.isdigit() and 1 <= int(x) <= 240, lambda x: int(x))
@ -212,11 +212,7 @@ 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)%s: %s" % (query["locationName"], query["crs"], event["stdout"].write("%s%s: %s" % (station_summary, " departures calling at %s" % filter["inter"] if filter["inter"] else '', trains_string))
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 '',
trains_string))
def service(self, event): def service(self, event):
client = self.client client = self.client