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

NR: Add date filter

Browse source
This commit is contained in:
Evelyn 2017-10-29 12:00:08 +00:00
parent 0df7abb03e
commit 6008cbac2c
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/nr.py
View file

@ -1,5 +1,5 @@
import collections, re, time import collections, re, time
from datetime import datetime from datetime import datetime, date
from collections import Counter from collections import Counter
import Utils import Utils
@ -145,6 +145,7 @@ class Module(object):
"period": (120, lambda x: x.isdigit() and 1 <= int(x) <= 480, lambda x: int(x)), "period": (120, lambda x: x.isdigit() and 1 <= int(x) <= 480, lambda x: int(x)),
"nonpassenger": (False, lambda x: type(x)==type(True)), "nonpassenger": (False, lambda x: type(x)==type(True)),
"time": ("", lambda x: len(x)==4 and x.isdigit()), "time": ("", lambda x: len(x)==4 and x.isdigit()),
"date": ("", lambda x: len(x)==10),
"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", "D", "E"], lambda x: x.upper()), "power": (None, lambda x: x.upper() in ["EMU", "DMU", "HST", "D", "E"], lambda x: x.upper()),
"crs": (False, lambda x: type(x)==type(True)), "crs": (False, lambda x: type(x)==type(True)),
@ -164,6 +165,9 @@ class Module(object):
if filter["time"]: if filter["time"]:
now = now.replace(hour=int(filter["time"][:2])) now = now.replace(hour=int(filter["time"][:2]))
now = now.replace(minute=int(filter["time"][2:])) now = now.replace(minute=int(filter["time"][2:]))
if filter["date"]:
newdate = datetime.strptime(filter["date"], "%Y-%m-%d").date()
now = now.replace(day=newdate.day, month=newdate.month, year=newdate.year)
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: