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

enhance formatters

Browse source
This commit is contained in:
Christophe Benz 2010-05-21 19:19:28 +02:00
commit 2ddc249b2b
6 changed files with 140 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

14
weboob/tools/application/console.py
View file

@ -67,18 +67,20 @@ class ConsoleApplication(BaseApplication):
def add_application_options(self, group):
pass
def _handle_app_options(self):
self._formatter = formatters_classes[self.options.formatter]
self._formatter = formatters[self.options.formatter]
if self.options.select:
self._formatter.display_keys = False
self.selected_fields = self.options.select.split(',')
else:
self.selected_fields = None
if self.options.where:
self.where_condition = WhereCondition(self.options.where)
if self.options.condition:
self.condition = ResultsCondition(self.options.condition)
else:
self.where_condition = None
self.condition = None
def _get_completions(self):
return set(name for name, arguments, doc_string in self._commands)
@ -195,10 +197,10 @@ class ConsoleApplication(BaseApplication):
def format(self, result):
try:
result = self._formatter.format(result, selected_fields=self.selected_fields, where_condition=self.where_condition)
result = self._formatter.format(result, selected_fields=self.selected_fields, condition=self.condition)
if result is not None:
print result
except WhereConditionException, e:
except ResultsConditionException, e:
logging.error(e)
register_command = staticmethod(register_command)