Merge pull request #2 from mgorny/fb2

[librarian.git] / scripts / book2mobi

diff --git a/scripts/book2mobi b/scripts/book2mobi
index 1c00b51..665dcfa 100755 (executable)
--- a/scripts/book2mobi
+++ b/scripts/book2mobi
@@ -7,7 +7,8 @@
 import os.path
 import optparse
 
 import os.path
 import optparse
 

-from librarian import mobi, DirDocProvider, ParseError
+from librarian import DirDocProvider, ParseError
+from librarian.parser import WLDocument

 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':


@@ -35,20 +36,18 @@ if __name__ == '__main__':
     # Do some real work
     try:
         for main_input in input_filenames:
     # Do some real work
     try:
         for main_input in input_filenames:

-            if options.verbose:
-                print main_input

             path, fname = os.path.realpath(main_input).rsplit('/', 1)
             provider = DirDocProvider(path)
             path, fname = os.path.realpath(main_input).rsplit('/', 1)
             provider = DirDocProvider(path)

-
-            output_dir = output_file = None
-            if options.output_dir:
-                output_dir = options.output_dir
-            elif options.output_file:
-                output_file = options.output_file
+            if not (options.output_file or options.output_dir):
+                output_file = os.path.splitext(main_input)[0] + '.mobi'

             else:
             else:

-                output_dir = path
+                output_file = None
+
+            doc = WLDocument.from_file(main_input, provider=provider)
+            mobi = doc.as_mobi()

 
 

-            mobi.transform(provider, file_path=main_input, output_dir=output_dir, output_file=output_file, make_dir=options.make_dir)
+            doc.save_output_file(mobi,
+                output_file, options.output_dir, options.make_dir, 'mobi')

     except ParseError, e:
         print '%(file)s:%(name)s:%(message)s' % {
             'file': main_input,
     except ParseError, e:
         print '%(file)s:%(name)s:%(message)s' % {
             'file': main_input,