#!/usr/bin/env python
# -*- coding: UTF-8 -*-
-import argparse
import sys
+from gotovienna import argparse
from gotovienna.utils import *
from gotovienna.routing import *
parser = argparse.ArgumentParser(description='Get public transport route for Vienna')
-parser.add_argument('-ot', metavar='type', type=str, help='origin type: %s' % ' | '.join(POSITION_TYPES), default=None, choices=POSITION_TYPES)
-parser.add_argument('-dt', metavar='type', type=str, help='destination type: %s' % ' | '.join(POSITION_TYPES), default=None, choices=POSITION_TYPES)
-parser.add_argument('origin', nargs='?', help='origin station name')
-parser.add_argument('destination', nargs='?', help='destination station name')
+parser.add_argument('-ot', metavar='type', type=str,
+ help='origin type: %s' % ' | '.join(POSITION_TYPES),
+ default=None, choices=POSITION_TYPES)
+parser.add_argument('-dt', metavar='type', type=str,
+ help='destination type: %s' % ' | '.join(POSITION_TYPES),
+ default=None, choices=POSITION_TYPES)
+parser.add_argument('origin', nargs='?',
+ help='origin station name')
+parser.add_argument('destination', nargs='?',
+ help='destination station name')
args = parser.parse_args()
return sParser(result.read())
-print >>sys.stderr, 'Searching...',
+print >>sys.stderr, 'Searching...\n',
parser = do_search(args)
print >>sys.stderr, 'done.'
l = ''
while not l == 'q':
for idx, overview in enumerate(overviews):
- if not overview['date'] or not overview['time']:
+ timespan = overview['timespan']
+ if not timespan:
# XXX: Bogus data for e.g. Pilgramgasse->Karlsplatz?!
continue
-
- print '%d. [%s] %s-%s (%s)' % (idx + 1,
- overview['date'],
- overview['time'][0],
- overview['time'][1],
- overview['duration'])
+
+ str_timespan = timespan[0].strftime('[%Y-%d-%m] %H:%M')
+ str_timespan += '-' + timespan[1].strftime('%H:%M')
+ timedelta = timespan[1] - timespan[0]
+ print '%d. %s (%s)' % (idx + 1,
+ str_timespan,
+ timedelta)
+
print 'q. Quit'
l = sys.stdin.readline().strip()
print
if l.isdigit() and int(l) <= len(details):
for detail in details[int(l) - 1]:
- if detail['time'] and detail['station']:
- time = '%s - %s' % (detail['time'][0].strftime(TIMEFORMAT), detail['time'][1].strftime(TIMEFORMAT))
- print '[%s] %s\n%s' % (time, ' -> '.join(detail['station']), '\n'.join(detail['info']))
+ if detail['timespan'] and detail['station']:
+ time = '%s - %s' % (detail['timespan'][0].strftime(TIMEFORMAT),
+ detail['timespan'][1].strftime(TIMEFORMAT))
+ print '[%s] %s\n%s' % (time,
+ ' -> '.join(detail['station']),
+ '\n'.join(detail['info']))
else:
print '\n'.join(detail['info'])
print '-' * 79
print
else:
print 'Error - unknown page returned.'
-