X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=scotty;h=ca7922cbdd66f422f3fc27ef0daf0ee394dc17f9;hb=HEAD;hp=bfc0e82190d94f50262da59af1c141b9f269dadb;hpb=1a61d38aec0b6cdd8dbee7ca385d38fa52355b07;p=pywienerlinien diff --git a/scotty b/scotty index bfc0e82..ca7922c 100755 --- a/scotty +++ b/scotty @@ -1,16 +1,23 @@ #!/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='stop', choices=POSITION_TYPES) -parser.add_argument('-dt', metavar='type', type=str, help='destination type: %s' % ' | '.join(POSITION_TYPES), default='stop', choices=POSITION_TYPES) -parser.add_argument('origin', nargs='?') -parser.add_argument('destination', nargs='?') +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() @@ -20,121 +27,83 @@ if not args.origin: if not args.destination: args.destination = raw_input('Destination: ') -print >>sys.stderr, 'Searching...', -html = search((args.origin, args.ot), (args.destination, args.dt)).read() +def do_search(args): + if isinstance(args.origin, unicode): + args.origin = args.origin.encode('utf-8', 'ignore') + elif isinstance(args.destination, unicode): + args.destination = args.destination.encode('utf-8', 'ignore') + + result = search((args.origin, args.ot), + (args.destination, args.dt)) + + return sParser(result.read()) + +print >>sys.stderr, 'Searching...\n', +parser = do_search(args) print >>sys.stderr, 'done.' -finished = False -while not finished: +while parser.state == PageType.CORRECTION: + origin_corr, destination_corr = parser.get_correction() - html = search((args.origin, args.ot), (args.destination, args.dt)).read() - - parser = sParser(html) - state = parser.check_page() + if origin_corr: + print + print '* Origin ambiguous:' + lo = None + while not lo or not lo.isdigit() or int(lo) > len(origin_corr): + for idx, correction in enumerate(origin_corr): + print '%3d. %s' % (idx+1, correction) + lo = sys.stdin.readline().strip() - if state == PageType.CORRECTION: - try: - cor = parser.get_correction() - origin, origin_place = split_station(args.origin) - destination, destination_place = split_station(args.destination) - - # FIXME refactoring - - if cor.has_key('origin'): - print - print '* Origin ambiguous:' - l = None - while not l or not l.isdigit() or int(l) > len(cor['origin']): - i = 1 - for c in cor['origin']: - print '%d. %s' % (i, c) - i += 1 - l = sys.stdin.readline().strip() - - origin = cor['origin'][int(l) - 1] - - if cor.has_key('destination'): - print - print '* Destination ambiguous:' - l = None - while not l or not l.isdigit() or int(l) > len(cor['destination']): - i = 1 - for c in cor['destination']: - print '%d. %s' % (i, c) - i += 1 - l = sys.stdin.readline().strip() - - destination = cor['destination'][int(l) - 1] - - if cor.has_key('origin_place'): - print - print '* Origin place ambiguous:' - l = None - while not l or not l.isdigit() or int(l) > len(cor['origin_place']): - i = 1 - for c in cor['origin_place']: - print '%d. %s' % (i, c) - i += 1 - l = sys.stdin.readline().strip() - - origin_place = cor['origin_place'][int(l) - 1] - - if cor.has_key('destination_place'): - print - print '* Destination place ambiguous:' - l = None - while not l or not l.isdigit() or int(l) > len(cor['destination_place']): - i = 1 - for c in cor['destination_place']: - print '%d. %s' % (i, c) - i += 1 - l = sys.stdin.readline().strip() - - destination_place = cor['destination_place'][int(l) - 1] - - args.origin = '%s, %s' % (origin, origin_place) - args.destination = '%s, %s' %(destination, destination_place) + args.origin = origin_corr[int(lo) - 1] + + if destination_corr: + print + print '* Destination ambiguous:' + ld = None + while not ld or not ld.isdigit() or int(ld) > len(destination_corr): + for idx, correction in enumerate(destination_corr): + print '%3d. %s' % (idx+1, correction) + ld = sys.stdin.readline().strip() + + args.destination = destination_corr[int(ld) - 1] + + parser = do_search(args) + +if parser.state == PageType.RESULT: + parser = parser.get_result() + overviews = parser.overview + details = parser.details + l = '' + while not l == 'q': + for idx, overview in enumerate(overviews): + timespan = overview['timespan'] + if not timespan: + # XXX: Bogus data for e.g. Pilgramgasse->Karlsplatz?! + continue - except ParserError: - print 'PANIC at correction page' - finished = True - - elif state == PageType.RESULT: - parser = rParser(html) - try: - overviews = parser.overview - details = parser.details - l = '' - while not l == 'q': - for idx, overview in enumerate(overviews): - if not overview['date'] or not overview['time']: - # 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']) - print 'q. Quit' - l = sys.stdin.readline().strip() - print - print '~' * 80 - - 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'])) - else: - print '\n'.join(detail['info']) - print '-' * 80 - print + 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) - finished = True - - except ParserError: - print 'parsererror' - - elif state == PageType.UNKNOWN: - print 'PANIC unknown result' + print 'q. Quit' + l = sys.stdin.readline().strip() + print + print '~' * 79 + + if l.isdigit() and int(l) <= len(details): + for detail in details[int(l) - 1]: + 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.'