Show next 90 minutes instead of 30 minutes, necessary for good nightline

[pywienerlinien] / gotovienna / realtime.py

diff --git a/gotovienna/realtime.py b/gotovienna/realtime.py
index be36453..594bf79 100644 (file)
--- a/gotovienna/realtime.py
+++ b/gotovienna/realtime.py
@@ -5,6 +5,7 @@ from urllib2 import urlopen
 from datetime import time
 import re
 import collections
+from errors import LineNotFoundError, StationNotFoundError
 
 from gotovienna import defaults
 
@@ -79,8 +80,9 @@ class ITipParser:
         if not url:
             # FIXME prevent from calling this method with None
             return []
-
-        bs = BeautifulSoup(urlopen(url))
+        
+        # open url for 90 min timeslot / get departure for next 90 min
+        bs = BeautifulSoup(urlopen(url + "&departureSizeTimeSlot=90"))
         result_lines = bs.findAll('table')[-1].findAll('tr')
 
         dep = []
@@ -89,10 +91,12 @@ class ITipParser:
             if len(th) < 2:
                 #TODO replace with logger
                 print "[DEBUG] Unable to find th in:\n%s" % str(tr)
-                continue
-
+            elif len(th) == 2:
+                t = th[-1]
+            else:
+                t = th[-2]
             # parse time
-            time = th[-2].text.split(' ')
+            time = t.text.split(' ')
             if len(time) < 2:
                 #print 'Invalid time: %s' % time
                 # TODO: Issue a warning OR convert "HH:MM" format to countdown
@@ -178,3 +182,35 @@ def categorize_lines(lines):
     return [(LINE_TYPE_NAMES[key], categorized_lines[key])
             for key in sorted(categorized_lines)]
 
+
+class Line:
+    def __init__(self, name):
+        self._stations = None
+        self.parser = ITipParser()
+        if name.strip() in self.parser.lines():
+            self.name = name.strip()
+        else:
+            raise LineNotFoundError('There is no line "%s"' % name.strip())
+        
+    @property
+    def stations(self):
+        if not self._stations:
+            self._stations = parser.get_stations(self.name)
+        return self._stations
+    
+    def get_departures(self, stationname):
+        stationname = stationname.strip().lower()
+        stations = self.stations
+        
+        found = false
+        
+        for direction in stations.keys():
+            # filter stations starting with stationname
+            stations[direction] = filter(lambda station: station[0].lower().starts_with(stationname), stations)
+            found = found or bool(stations[direction])
+        
+        if found:
+            # TODO return departures
+            raise NotImplementedError()
+        else:
+            raise StationNotFoundError('There is no stationname called "%s" at route of line "%s"' % (stationname, self.name))