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

Try to guess if we need to change the formatter

Browse source
This commit is contained in:
Florent 2014-06-17 15:43:04 +02:00
commit b0349f0e8c
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
weboob/tools/application/repl.py
View file

@ -339,13 +339,24 @@ class ReplApplication(Cmd, ConsoleApplication):
fields = kwargs.pop('fields', self.selected_fields) fields = kwargs.pop('fields', self.selected_fields)
if not fields and fields != []: if not fields and fields != []:
fields = self.selected_fields fields = self.selected_fields
if '$direct' in fields: if '$direct' in fields:
fields = [] fields = []
elif '$full' in fields: elif '$full' in fields:
fields = None fields = None
if self.formatter.MANDATORY_FIELDS is not None: if fields and self.formatter.MANDATORY_FIELDS is not None:
missing_fields = set(fields) - set(self.formatter.MANDATORY_FIELDS) missing_fields = set(self.formatter.MANDATORY_FIELDS) - set(fields)
# If a mandatory field is not selected, do not use the customized formatter
if missing_fields:
self.formatter = self.formatters_loader.build_formatter(ReplApplication.DEFAULT_FORMATTER)
if self.formatter.DISPLAYED_FIELDS is not None:
if fields is None:
missing_fields = True
else:
missing_fields = set(fields) - set(self.formatter.DISPLAYED_FIELDS + self.formatter.MANDATORY_FIELDS)
# If a selected field is not displayed, do not use the customized formatter
if missing_fields: if missing_fields:
self.formatter = self.formatters_loader.build_formatter(ReplApplication.DEFAULT_FORMATTER) self.formatter = self.formatters_loader.build_formatter(ReplApplication.DEFAULT_FORMATTER)