nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

display price information

Browse source
This commit is contained in:
Romain Bignon 2013-12-15 14:02:49 +01:00
commit d8ccc81f93
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/voyagessncf/backend.py
View file

@ -79,8 +79,16 @@ class VoyagesSNCFBackend(BaseBackend, ICapTravel):
self._populate_stations() self._populate_stations()
pattern = pattern.lower() pattern = pattern.lower()
already = set()
# First stations whose name starts with pattern...
for _id, name in enumerate(self.STATIONS): for _id, name in enumerate(self.STATIONS):
if name.lower().startswith(pattern): if name.lower().startswith(pattern):
already.add(_id)
yield Station(_id, unicode(name))
# ...then ones whose name contains pattern.
for _id, name in enumerate(self.STATIONS):
if pattern in name.lower() and not _id in already:
yield Station(_id, unicode(name)) yield Station(_id, unicode(name))
def iter_station_departures(self, station_id, arrival_id=None, date=None): def iter_station_departures(self, station_id, arrival_id=None, date=None):
@ -105,4 +113,5 @@ class VoyagesSNCFBackend(BaseBackend, ICapTravel):
departure.arrival_time = d['arrival_time'] departure.arrival_time = d['arrival_time']
departure.price = d['price'] departure.price = d['price']
departure.currency = d['currency'] departure.currency = d['currency']
departure.information = d['price_info']
yield departure yield departure

5
modules/voyagessncf/pages.py
View file

@ -88,14 +88,16 @@ class ResultsPage(BasePage):
def iter_results(self): def iter_results(self):
for div in self.document.getroot().cssselect('div.train_info'): for div in self.document.getroot().cssselect('div.train_info'):
info = None
price = None price = None
currency = None currency = None
for td in div.cssselect('td.price'): for td in div.cssselect('td.price'):
txt = self.parser.tocleanstring(td) txt = self.parser.tocleanstring(td)
p = Decimal(re.sub('([^\d\.]+)', '', txt)) p = Decimal(re.sub('([^\d\.]+)', '', txt))
currency = Currency.get_currency(txt)
if price is None or p < price: if price is None or p < price:
info = list(div.cssselect('strong.price_label')[0].itertext())[-1].strip().strip(':')
price = p price = p
currency = Currency.get_currency(txt)
yield {'type': self.get_value(div, 'div.transporteur-txt'), yield {'type': self.get_value(div, 'div.transporteur-txt'),
'time': self.parse_hour(div, 'div.departure div.hour'), 'time': self.parse_hour(div, 'div.departure div.hour'),
@ -104,4 +106,5 @@ class ResultsPage(BasePage):
'arrival_time': self.parse_hour(div, 'div.arrival div.hour', last=True), 'arrival_time': self.parse_hour(div, 'div.arrival div.hour', last=True),
'price': price, 'price': price,
'currency': currency, 'currency': currency,
'price_info': info,
} }