jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-21 20:27:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

GTFS: check start/end date on services (#8373)

Browse Source 
Fixes #8372
This commit is contained in:
Marc Plano-Lesay 2017-07-07 07:22:31 +02:00 committed by Paulus Schoutsen
parent 63cc658010
commit 074e31bcf9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/sensor/gtfs.py
View File

@ -52,6 +52,7 @@ def get_next_departure(sched, start_station_id, end_station_id, offset):
now = datetime.datetime.now() + offset now = datetime.datetime.now() + offset
day_name = now.strftime('%A').lower() day_name = now.strftime('%A').lower()
now_str = now.strftime('%H:%M:%S') now_str = now.strftime('%H:%M:%S')
today = now.strftime('%Y-%m-%d')
from sqlalchemy.sql import text from sqlalchemy.sql import text
@ -89,11 +90,14 @@ def get_next_departure(sched, start_station_id, end_station_id, offset):
AND start_station.stop_id = :origin_station_id AND start_station.stop_id = :origin_station_id
AND end_station.stop_id = :end_station_id AND end_station.stop_id = :end_station_id
AND origin_stop_time.stop_sequence < destination_stop_time.stop_sequence AND origin_stop_time.stop_sequence < destination_stop_time.stop_sequence
AND calendar.start_date <= :today
AND calendar.end_date >= :today
ORDER BY origin_stop_time.departure_time LIMIT 1; ORDER BY origin_stop_time.departure_time LIMIT 1;
""".format(day_name=day_name)) """.format(day_name=day_name))
result = sched.engine.execute(sql_query, now_str=now_str, result = sched.engine.execute(sql_query, now_str=now_str,
origin_station_id=origin_station.id, origin_station_id=origin_station.id,
end_station_id=destination_station.id) end_station_id=destination_station.id,
today=today)
item = {} item = {}
for row in result: for row in result:
item = row item = row
@ -101,7 +105,6 @@ def get_next_departure(sched, start_station_id, end_station_id, offset):
if item == {}: if item == {}:
return None return None
today = now.strftime('%Y-%m-%d')
departure_time_string = '{} {}'.format(today, item[2]) departure_time_string = '{} {}'.format(today, item[2])
arrival_time_string = '{} {}'.format(today, item[3]) arrival_time_string = '{} {}'.format(today, item[3])
departure_time = datetime.datetime.strptime(departure_time_string, departure_time = datetime.datetime.strptime(departure_time_string,