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 fc1730d..594bf79 100644 (file)
--- a/gotovienna/realtime.py
+++ b/gotovienna/realtime.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 
-from BeautifulSoup import BeautifulSoup
+from gotovienna.BeautifulSoup import BeautifulSoup
 from urllib2 import urlopen
 from datetime import time
-import argparse
 import re
+import collections
+from errors import LineNotFoundError, StationNotFoundError
 
 from gotovienna import defaults
 
@@ -59,6 +60,15 @@ class ITipParser:
 
         return self._lines
 
+    def get_url_from_direction(self, line, direction, station):
+        stations = self.get_stations(line)
+
+        for stationname, url in stations.get(direction, []):
+            if stationname == station:
+                return url
+
+        return None
+
     def get_departures(self, url):
         """ Get list of next departures
         integer if time until next departure
@@ -70,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 = []
@@ -80,12 +91,15 @@ 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
+                #print 'Invalid time: %s' % time
+                # TODO: Issue a warning OR convert "HH:MM" format to countdown
                 continue
 
             time = time[1]
@@ -108,3 +122,95 @@ class ITipParser:
 
         return dep
 
+
+UBAHN, TRAM, BUS, NIGHTLINE, OTHER = range(5)
+LINE_TYPE_NAMES = ['U-Bahn', 'Strassenbahn', 'Bus', 'Nightline', 'Andere']
+
+def get_line_sort_key(name):
+    """Return a sort key for a line name
+
+    >>> get_line_sort_key('U6')
+    ('U', 6)
+
+    >>> get_line_sort_key('D')
+    ('D', 0)
+
+    >>> get_line_sort_key('59A')
+    ('A', 59)
+    """
+    txt = ''.join(x for x in name if not x.isdigit())
+    num = ''.join(x for x in name if x.isdigit()) or '0'
+
+    return (txt, int(num))
+
+def get_line_type(name):
+    """Get the type of line for the given name
+
+    >>> get_line_type('U1')
+    UBAHN
+    >>> get_line_type('59A')
+    BUS
+    """
+    if name.isdigit():
+        return TRAM
+    elif name.endswith('A') or name.endswith('B') and name[1].isdigit():
+        return BUS
+    elif name.startswith('U'):
+        return UBAHN
+    elif name.startswith('N'):
+        return NIGHTLINE
+    elif name in ('D', 'O', 'VRT', 'WLB'):
+        return TRAM
+
+    return OTHER
+
+def categorize_lines(lines):
+    """Return a categorized version of a list of line names
+
+    >>> categorize_lines(['U4', 'U3', '59A'])
+    [('U-Bahn', ['U3', 'U4']), ('Bus', ['59A'])]
+    """
+    categorized_lines = collections.defaultdict(list)
+
+    for line in sorted(lines):
+        line_type = get_line_type(line)
+        categorized_lines[line_type].append(line)
+
+    for lines in categorized_lines.values():
+        lines.sort(key=get_line_sort_key)
+
+    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))