Merge branch 'master' of github.com:kelvan/gotoVienna into experimental

[pywienerlinien] / scotty

diff --git a/scotty b/scotty
index 8375815..920abba 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: