add parameters --departure-time and --arrival-time
This commit is contained in:
parent
c284a24842
commit
9dc1e559a7
1 changed files with 46 additions and 2 deletions
|
|
@ -18,9 +18,11 @@
|
||||||
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
|
import sys
|
||||||
|
from datetime import datetime
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from weboob.capabilities.travel import ICapTravel
|
from weboob.capabilities.travel import ICapTravel, RoadmapFilters
|
||||||
from weboob.tools.application.repl import ReplApplication
|
from weboob.tools.application.repl import ReplApplication
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -35,6 +37,10 @@ class Traveloob(ReplApplication):
|
||||||
CAPS = ICapTravel
|
CAPS = ICapTravel
|
||||||
DEFAULT_FORMATTER = 'table'
|
DEFAULT_FORMATTER = 'table'
|
||||||
|
|
||||||
|
def add_application_options(self, group):
|
||||||
|
group.add_option('--departure-time')
|
||||||
|
group.add_option('--arrival-time')
|
||||||
|
|
||||||
def do_stations(self, pattern):
|
def do_stations(self, pattern):
|
||||||
"""
|
"""
|
||||||
stations PATTERN
|
stations PATTERN
|
||||||
|
|
@ -74,8 +80,46 @@ class Traveloob(ReplApplication):
|
||||||
self.flush()
|
self.flush()
|
||||||
|
|
||||||
def do_roadmap(self, line):
|
def do_roadmap(self, line):
|
||||||
|
"""
|
||||||
|
roadmap DEPARTURE ARRIVAL
|
||||||
|
|
||||||
|
Display the roadmap to travel from DEPARTURE to ARRIVAL.
|
||||||
|
|
||||||
|
Command-line parameters:
|
||||||
|
--departure-time TIME requested departure time
|
||||||
|
--arrival-time TIME requested arrival time
|
||||||
|
|
||||||
|
TIME might be in form "yyyy-mm-dd HH:MM" or "HH:MM".
|
||||||
|
|
||||||
|
Example:
|
||||||
|
> roadmap Puteaux Aulnay-sous-Bois --arrival-time 22:00
|
||||||
|
"""
|
||||||
departure, arrival = self.parse_command_args(line, 2, 2)
|
departure, arrival = self.parse_command_args(line, 2, 2)
|
||||||
|
|
||||||
for backend, route in self.do('iter_roadmap', departure, arrival):
|
filters = RoadmapFilters()
|
||||||
|
try:
|
||||||
|
filters.departure_time = self.parse_datetime(self.options.departure_time)
|
||||||
|
filters.arrival_time = self.parse_datetime(self.options.arrival_time)
|
||||||
|
except ValueError, e:
|
||||||
|
print >>sys.stderr, 'Invalid datetime value: %s' % e
|
||||||
|
print >>sys.stderr, 'Please enter a datetime in form "yyyy-mm-dd HH:MM" or "HH:MM".'
|
||||||
|
return 1
|
||||||
|
|
||||||
|
for backend, route in self.do('iter_roadmap', departure, arrival, filters):
|
||||||
self.format(route)
|
self.format(route)
|
||||||
self.flush()
|
self.flush()
|
||||||
|
|
||||||
|
def parse_datetime(self, text):
|
||||||
|
if text is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
try:
|
||||||
|
date = datetime.strptime(text, '%Y-%m-%d %H:%M')
|
||||||
|
except ValueError:
|
||||||
|
try:
|
||||||
|
date = datetime.strptime(text, '%H:%M')
|
||||||
|
except ValueError:
|
||||||
|
raise ValueError(text)
|
||||||
|
date = datetime.now().replace(hour=date.hour, minute=date.minute)
|
||||||
|
|
||||||
|
return date
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue