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

enhancement of formatter output

Browse source
This commit is contained in:
Romain Bignon 2013-12-14 18:01:05 +01:00
commit a6df6c0f61
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
weboob/applications/traveloob/traveloob.py
View file

@ -19,7 +19,7 @@
import sys import sys
from datetime import datetime import datetime
from weboob.capabilities.base import Currency, empty from weboob.capabilities.base import Currency, empty
from weboob.capabilities.travel import ICapTravel, RoadmapFilters from weboob.capabilities.travel import ICapTravel, RoadmapFilters
@ -37,14 +37,19 @@ class DeparturesFormatter(PrettyFormatter):
s = obj.type s = obj.type
if hasattr(obj, 'price') and not empty(obj.price): if hasattr(obj, 'price') and not empty(obj.price):
s += u' %s %s' % (self.colored(u'—', 'cyan'), self.colored('%6.2f %s' % (obj.price, Currency.currency2txt(obj.currency)), 'green')) s += u' %s %s' % (self.colored(u'—', 'cyan'), self.colored('%6.2f %s' % (obj.price, Currency.currency2txt(obj.currency)), 'green'))
if hasattr(obj, 'late') and not empty(obj.late) and obj.late > datetime.time():
s += u' %s %s' % (self.colored(u'—', 'cyan'), self.colored('Late: %s' % obj.late, 'red', 'bold'))
if hasattr(obj, 'information') and not empty(obj.information) and obj.information.strip() != '':
s += u' %s %s' % (self.colored(u'—', 'cyan'), self.colored(obj.information, 'red'))
return s return s
def get_description(self, obj): def get_description(self, obj):
if hasattr(obj, 'arrival_time') and not empty(obj.arrival_time): if hasattr(obj, 'arrival_time') and not empty(obj.arrival_time):
s = '(%s) %s\n\t(%s) %s' % (self.colored(obj.time.strftime('%H:%M'), 'cyan'), s = '(%s) %s%s\n\t(%s) %s' % (self.colored(obj.time.strftime('%H:%M'), 'cyan'),
obj.departure_station, obj.departure_station,
self.colored(obj.arrival_time.strftime('%H:%M'), 'cyan'), self.colored(' [Platform: %s]' % obj.platform, 'yellow') if (hasattr(obj, 'platform') and not empty(obj.platform)) else '',
obj.arrival_station) self.colored(obj.arrival_time.strftime('%H:%M'), 'cyan'),
obj.arrival_station)
else: else:
s = '(%s) %20s -> %s' % (self.colored(obj.time.strftime('%H:%M'), 'cyan'), s = '(%s) %20s -> %s' % (self.colored(obj.time.strftime('%H:%M'), 'cyan'),
obj.departure_station, obj.arrival_station) obj.departure_station, obj.arrival_station)
@ -156,12 +161,12 @@ class Traveloob(ReplApplication):
return None return None
try: try:
date = datetime.strptime(text, '%Y-%m-%d %H:%M') date = datetime.datetime.strptime(text, '%Y-%m-%d %H:%M')
except ValueError: except ValueError:
try: try:
date = datetime.strptime(text, '%H:%M') date = datetime.datetime.strptime(text, '%H:%M')
except ValueError: except ValueError:
raise ValueError(text) raise ValueError(text)
date = datetime.now().replace(hour=date.hour, minute=date.minute) date = datetime.datetime.now().replace(hour=date.hour, minute=date.minute)
return date return date