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

enhance --select, add --no-header option

Browse source
This commit is contained in:
Christophe Benz 2010-07-10 03:27:41 +02:00
commit e4b789d340
6 changed files with 33 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

17
weboob/tools/application/formatters/iformatter.py
View file

@ -16,15 +16,16 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import types
from weboob.tools.misc import iter_fields
__all__ = ['IFormatter']
class IFormatter(object):
def __init__(self, display_keys=True, return_only=False):
def __init__(self, display_keys=True, display_header=True, return_only=False):
self.display_keys = display_keys
self.display_header = display_header
self.return_only = return_only
def after_format(self, formatted):
@ -68,14 +69,6 @@ class IFormatter(object):
"""
raise NotImplementedError()
def iter_fields(self, obj):
for attribute_name in dir(obj):
if attribute_name.startswith('_'):
continue
attribute = getattr(obj, attribute_name)
if not isinstance(attribute, types.MethodType):
yield attribute_name, attribute
def set_header(self, string):
raise NotImplementedError()
@ -89,12 +82,12 @@ class IFormatter(object):
else:
id_fields = ('id',)
for k, v in d:
if selected_fields is not None and k not in selected_fields:
if selected_fields is not None and '*' not in selected_fields and k not in selected_fields:
continue
if k in id_fields and backend_name is not None:
v = u'%s@%s' % (unicode(v), backend_name)
yield k, v
fields_iterator = obj.iter_fields() if hasattr(obj, 'iter_fields') else self.iter_fields(obj)
fields_iterator = obj.iter_fields() if hasattr(obj, 'iter_fields') else iter_fields(obj)
d = dict((k, v) for k, v in iter_select_and_decorate(fields_iterator))
if condition is not None and not condition.is_valid(d):
d = None

3
weboob/tools/application/formatters/multiline.py
View file

@ -38,4 +38,5 @@ class MultilineFormatter(IFormatter):
return u'\n'.join(u'%s%s' % ((u'%s%s' % (k, self.key_value_separator) if self.display_keys else ''), v) for k, v in item.iteritems()) + self.after_item
def set_header(self, string):
print string.encode('utf-8')
if self.display_header:
print string.encode('utf-8')

3
weboob/tools/application/formatters/simple.py
View file

@ -38,4 +38,5 @@ class SimpleFormatter(IFormatter):
return self.field_separator.join(u'%s%s' % ((u'%s%s' % (k, self.key_value_separator) if self.display_keys else ''), v) for k, v in item.iteritems())
def set_header(self, string):
print string.encode('utf-8')
if self.display_header:
print string.encode('utf-8')

2
weboob/tools/application/formatters/table.py
View file

@ -42,7 +42,7 @@ class TableFormatter(IFormatter):
if self.column_headers is None:
return None
s = ''
if self.header:
if self.display_header and self.header:
if self.result_funcname == 'get_string':
s += self.header
elif self.result_funcname == 'get_html_string':