Fix #1549 (Metadata plugin not working)

src/calibre/customize/ui.py

@@ -105,30 +105,43 @@ def reread_metadata_plugins():
     for plugin in _initialized_plugins:
         if isinstance(plugin, MetadataReaderPlugin):
             for ft in plugin.file_types:
-                _metadata_readers[ft] = plugin
+                if not _metadata_readers.has_key(ft):
+                    _metadata_readers[ft] = []
+                _metadata_readers[ft].append(plugin)
         elif isinstance(plugin, MetadataWriterPlugin):
             for ft in plugin.file_types:
-                _metadata_writers[ft] = plugin 
+                if not _metadata_writers.has_key(ft):
+                    _metadata_writers[ft] = []
+                _metadata_writers[ft].append(plugin) 
+                
+    
                 
 def get_file_type_metadata(stream, ftype):
     mi = MetaInformation(None, None)
-    try:
+    ftype = ftype.lower().strip()
-        plugin = _metadata_readers[ftype.lower().strip()]
+    if _metadata_readers.has_key(ftype):
-        if not is_disabled(plugin):
+        for plugin in _metadata_readers[ftype]:
-            with plugin:
+            if not is_disabled(plugin):
-                mi = plugin.get_metadata(stream, ftype.lower().strip())
+                with plugin:
-    except:
+                    try:
-        pass
+                        mi = plugin.get_metadata(stream, ftype.lower().strip())
+                        break
+                    except:
+                        continue
     return mi
 
 def set_file_type_metadata(stream, mi, ftype):
-    try:
+    ftype = ftype.lower().strip()
-        plugin = _metadata_writers[ftype.lower().strip()]
+    if _metadata_writers.has_key(ftype):
-        if not is_disabled(plugin):
+        for plugin in _metadata_writers[ftype]:
-            with plugin:
+            if not is_disabled(plugin):
-                plugin.set_metadata(stream, mi, ftype.lower().strip())
+                with plugin:
-    except:
+                    try:
-        traceback.print_exc()
+                        plugin.set_metadata(stream, mi, ftype.lower().strip())
+                        break
+                    except:
+                        traceback.print_exc()
+    
                 
 def _run_filetype_plugins(path_to_file, ft=None, occasion='preprocess'):
     occasion = {'import':_on_import, 'preprocess':_on_preprocess, 

src/calibre/ebooks/lrf/html/table_as_image.py

@@ -88,7 +88,7 @@ def render_table(soup, table, css, base_dir, width, height, dpi, factor=1.0):
     
 def do_render(html, base_dir, width, height, dpi, factor):
     if QApplication.instance() is None:
-                QApplication([])
+        QApplication([])
     tr = HTMLTableRenderer(html, base_dir, width, height, dpi, factor)
     tr.loop.exec_()
     return tr.images, tr.tdir

src/calibre/library/cli.py

@@ -231,7 +231,7 @@ NULL = DevNull()
 
 def do_add(db, paths, one_book_per_directory, recurse, add_duplicates):
     orig = sys.stdout
-    sys.stdout = NULL
+    #sys.stdout = NULL
     try:
         files, dirs = [], []
         for path in paths:

src/calibre/utils/fontconfig.py

@@ -34,6 +34,7 @@ except:
 
 iswindows = 'win32' in sys.platform or 'win64' in sys.platform
 isosx     = 'darwin' in sys.platform
+isbsd     = 'bsd' in sys.platform
 DISABLED  = False 
 #if isosx:
 #    libc = ctypes.cdll.LoadLibrary(ctypes.util.find_library('c'))