do not display columns when all values are NotLoaded or NotAvailable
This commit is contained in:
parent
908764b4c8
commit
0b646e0e14
1 changed files with 25 additions and 9 deletions
|
|
@ -18,6 +18,8 @@
|
||||||
|
|
||||||
from prettytable import PrettyTable
|
from prettytable import PrettyTable
|
||||||
|
|
||||||
|
from weboob.capabilities.base import NotLoaded, NotAvailable
|
||||||
|
|
||||||
from .iformatter import IFormatter
|
from .iformatter import IFormatter
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -30,17 +32,32 @@ class TableFormatter(IFormatter):
|
||||||
def __init__(self, display_keys=True, return_only=False):
|
def __init__(self, display_keys=True, return_only=False):
|
||||||
IFormatter.__init__(self, display_keys=display_keys, return_only=return_only)
|
IFormatter.__init__(self, display_keys=display_keys, return_only=return_only)
|
||||||
self.queue = []
|
self.queue = []
|
||||||
|
self.keys = None
|
||||||
self.header = None
|
self.header = None
|
||||||
self.column_headers = None
|
|
||||||
|
|
||||||
def after_format(self, formatted):
|
def after_format(self, formatted):
|
||||||
if self.column_headers is None:
|
if self.keys is None:
|
||||||
self.column_headers = formatted.keys()
|
self.keys = formatted.keys()
|
||||||
self.queue.append(formatted.values())
|
self.queue.append(formatted.values())
|
||||||
|
|
||||||
def flush(self):
|
def flush(self):
|
||||||
if self.column_headers is None:
|
if len(self.queue) == 0:
|
||||||
return None
|
return
|
||||||
|
|
||||||
|
queue = [() for i in xrange(len(self.queue))]
|
||||||
|
column_headers = []
|
||||||
|
# Do not display columns when all values are NotLoaded or NotAvailable
|
||||||
|
for i in xrange(len(self.keys)):
|
||||||
|
available = False
|
||||||
|
for line in self.queue:
|
||||||
|
if line[i] is not NotLoaded and line[i] is not NotAvailable:
|
||||||
|
available = True
|
||||||
|
break
|
||||||
|
if available:
|
||||||
|
column_headers.append(self.keys[i].capitalize().replace('_', ' '))
|
||||||
|
for j in xrange(len(self.queue)):
|
||||||
|
queue[j] += (self.queue[j][i],)
|
||||||
|
|
||||||
s = ''
|
s = ''
|
||||||
if self.display_header and self.header:
|
if self.display_header and self.header:
|
||||||
if self.HTML:
|
if self.HTML:
|
||||||
|
|
@ -48,17 +65,16 @@ class TableFormatter(IFormatter):
|
||||||
else:
|
else:
|
||||||
s += self.header
|
s += self.header
|
||||||
s += "\n"
|
s += "\n"
|
||||||
table = PrettyTable(list(self.column_headers))
|
table = PrettyTable(list(column_headers))
|
||||||
for column_header in self.column_headers:
|
for column_header in column_headers:
|
||||||
table.set_field_align(column_header, 'l')
|
table.set_field_align(column_header, 'l')
|
||||||
for line in self.queue:
|
for line in queue:
|
||||||
table.add_row(line)
|
table.add_row(line)
|
||||||
|
|
||||||
if self.HTML:
|
if self.HTML:
|
||||||
s += table.get_html_string()
|
s += table.get_html_string()
|
||||||
else:
|
else:
|
||||||
s += table.get_string()
|
s += table.get_string()
|
||||||
self.queue = []
|
|
||||||
if self.return_only:
|
if self.return_only:
|
||||||
return s
|
return s
|
||||||
else:
|
else:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue