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

Implement 'time' parameter

Browse source
This commit is contained in:
Evelyn 2017-08-27 14:41:11 +01:00
parent bb8d73d9d1
commit f6766ae477
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/nr.py
View file

@ -138,7 +138,7 @@ class Module(object):
"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)),
"nonpassenger": (False, lambda x: type(x)==type(True)), "nonpassenger": (False, lambda x: type(x)==type(True)),
"timebase": ("0000", lambda x: len(x)==4 and x.isdigit()), "time": ("", lambda x: len(x)==4 and x.isdigit()),
"tops": (None, lambda x: len(x)<4 and x.isdigit()), "tops": (None, lambda x: len(x)<4 and x.isdigit()),
"power": (None, lambda x: x.upper() in ["EMU", "DMU", "HST"], lambda x: x.upper()), "power": (None, lambda x: x.upper() in ["EMU", "DMU", "HST"], lambda x: x.upper()),
}) })
@ -152,9 +152,14 @@ class Module(object):
nr_filterlist = client.factory.create("filterList") nr_filterlist = client.factory.create("filterList")
if filter["inter"]: nr_filterlist.crs.append(filter["inter"]) if filter["inter"]: nr_filterlist.crs.append(filter["inter"])
now = datetime.now()
if filter["time"]:
now = now.replace(hour=int(filter["time"][:2]))
now = now.replace(minute=int(filter["time"][2:]))
method = client.service.GetArrivalDepartureBoardByCRS if len(location_code) == 3 else client.service.GetArrivalDepartureBoardByTIPLOC method = client.service.GetArrivalDepartureBoardByCRS if len(location_code) == 3 else client.service.GetArrivalDepartureBoardByTIPLOC
try: try:
query = method(100, location_code, datetime.now().isoformat().split(".")[0], filter["period"], query = method(100, location_code, now.isoformat().split(".")[0], filter["period"],
nr_filterlist, "to", '', "PBS", filter["nonpassenger"]) nr_filterlist, "to", '', "PBS", filter["nonpassenger"])
except WebFault as detail: except WebFault as detail:
if str(detail) == "Server raised fault: 'Invalid crs code supplied'": if str(detail) == "Server raised fault: 'Invalid crs code supplied'":