Change extract_annotations return value.

[librarian.git] / librarian / book2anything.py

diff --git a/librarian/book2anything.py b/librarian/book2anything.py
index 7660ec7..20cae8f 100755 (executable)
--- a/librarian/book2anything.py
+++ b/librarian/book2anything.py
@@ -10,7 +10,7 @@ import optparse
 
 from librarian import DirDocProvider, ParseError
 from librarian.parser import WLDocument
-from librarian.cover import WLCover
+from librarian.cover import DefaultEbookCover
 
 
 class Option(object):
@@ -96,12 +96,16 @@ class Book2Anything(object):
                     if flag.value(options)]
         if transform_flags:
             transform_args['flags'] = transform_flags
+        if options.verbose:
+            transform_args['verbose'] = True
         # Add cover support, if any.
         if cls.uses_cover:
             if options.image_cache:
-                transform_args['cover'] = lambda x: WLCover(x, image_cache = options.image_cache)
+                def cover_class(*args, **kwargs):
+                    return DefaultEbookCover(image_cache=options.image_cache, *args, **kwargs)
+                transform_args['cover'] = cover_class
             elif not cls.cover_optional or options.with_cover:
-                transform_args['cover'] = WLCover
+                transform_args['cover'] = DefaultEbookCover
 
 
         # Do some real work