rewrite formatters management in repl

Commands can use specific default formatters, user can redefine formatters
per commands or globally.

weboob/tools/application/formatters/load.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright(C) 2010  Christophe Benz
+# Copyright(C) 2010  Christophe Benz, Romain Bignon
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,26 +16,53 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
-__all__ = ['load_formatter']
+__all__ = ['FormattersLoader', 'FormatterLoadError']
 
 
-formatters = ('htmltable', 'multiline', 'simple', 'table', 'webkit')
-            
+class FormatterLoadError(Exception):
+    pass
+
+class FormattersLoader(object):
+    BUILTINS = ['htmltable', 'multiline', 'simple', 'table', 'webkit']
+
+    def __init__(self):
+        self.formatters = {}
+
+    def register_formatter(self, name, klass):
+        self.formatters[name] = klass
+
+    def get_available_formatters(self):
+        l = set(self.formatters.iterkeys())
+        l = l.union(self.BUILTINS)
+        l = list(l)
+        l.sort()
+        return l
+
+    def build_formatter(self, name):
+        if not name in self.formatters:
+            try:
+                self.formatters[name] = self.load_builtin_formatter(name)
+            except ImportError, e:
+                FormattersLoader.BUILTINS.remove(name)
+                raise FormatterLoadError('Unable to load formatter "%s": %s' % (name, e))
+        return self.formatters[name]()
+
+    def load_builtin_formatter(self, name):
+        if not name in self.BUILTINS:
+            raise FormatterLoadError('Formatter "%s" does not exist' % name)
 
-def load_formatter(name):
-    assert name in formatters
-    if name in ('htmltable', 'table'):
-        from .table import TableFormatter
         if name == 'htmltable':
-            return TableFormatter(result_funcname='get_html_string')
+            from .table import HTMLTableFormatter
+            return HTMLTableFormatter
         elif name == 'table':
-            return TableFormatter()
-    elif name == 'simple':
-        from .simple import SimpleFormatter
-        return SimpleFormatter()
-    elif name == 'multiline':
-        from .multiline import MultilineFormatter
-        return MultilineFormatter()
-    elif name == 'webkit':
-        from .webkit import WebkitGtkFormatter
-        return WebkitGtkFormatter()
+            from .table import TableFormatter
+            return TableFormatter
+        elif name == 'simple':
+            from .simple import SimpleFormatter
+            return SimpleFormatter
+        elif name == 'multiline':
+            from .multiline import MultilineFormatter
+            return MultilineFormatter
+        elif name == 'webkit':
+            from .webkit import WebkitGtkFormatter
+            return WebkitGtkFormatter

weboob/tools/application/formatters/table.py

@@ -21,17 +21,17 @@ from prettytable import PrettyTable
 from .iformatter import IFormatter
 
 
-__all__ = ['TableFormatter']
+__all__ = ['TableFormatter', 'HTMLTableFormatter']
 
 
 class TableFormatter(IFormatter):
     column_headers = None
     queue = []
     header = None
+    HTML = False
 
-    def __init__(self, display_keys=True, return_only=False, result_funcname='get_string'):
+    def __init__(self, display_keys=True, return_only=False):
         IFormatter.__init__(self, display_keys=display_keys, return_only=return_only)
-        self.result_funcname = result_funcname
 
     def after_format(self, formatted):
         if self.column_headers is None:
@@ -43,17 +43,21 @@ class TableFormatter(IFormatter):
             return None
         s = ''
         if self.display_header and self.header:
-            if self.result_funcname == 'get_string':
-                s += self.header
-            elif self.result_funcname == 'get_html_string':
+            if self.HTML:
                 s+= '<p>%s</p>' % self.header
+            else:
+                s += self.header
             s += "\n"
         table = PrettyTable(list(self.column_headers))
         for column_header in self.column_headers:
             table.set_field_align(column_header, 'l')
         for line in self.queue:
             table.add_row(line)
-        s += getattr(table, self.result_funcname)()
+
+        if self.HTML:
+            s += table.get_html_string()
+        else:
+            s += table.get_string()
         self.queue = []
         if self.return_only:
             return s
@@ -66,3 +70,6 @@ class TableFormatter(IFormatter):
 
     def set_header(self, string):
         self.header = string
+
+class HTMLTableFormatter(TableFormatter):
+    HTML = True