changed date, time to datetime in overview part

[pywienerlinien] / scotty

diff --git a/scotty b/scotty
index 8375815..bfc0e82 100755 (executable)
--- a/scotty
+++ b/scotty
@@ -1,26 +1,29 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 
-from BeautifulSoup import BeautifulSoup, NavigableString
-from urllib2 import urlopen
-from urllib import urlencode
-import settings
-from datetime import datetime, time
-from textwrap import wrap
 import argparse
 import sys
-import os.path
 
 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')
-parser.add_argument('destination')
+parser.add_argument('origin', nargs='?')
+parser.add_argument('destination', nargs='?')
 
 args = parser.parse_args()
 
+if not args.origin:
+    args.origin = raw_input('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()
+print >>sys.stderr, 'done.'
+
 finished = False
 while not finished:
 
@@ -32,12 +35,9 @@ while not finished:
     if state == PageType.CORRECTION:
         try:
             cor = parser.get_correction()
-            print "A", args.origin, args.destination
             origin, origin_place = split_station(args.origin)
             destination, destination_place = split_station(args.destination)
             
-            print "B", origin, origin_place, destination, destination_place
-            
             # FIXME refactoring
             
             if cor.has_key('origin'):
@@ -92,7 +92,6 @@ while not finished:
     
                 destination_place = cor['destination_place'][int(l) - 1]
                 
-            print origin, origin_place, destination, destination_place
             args.origin = '%s, %s' % (origin, origin_place)
             args.destination = '%s, %s' %(destination, destination_place)