removed the annoying morefloats notice,

[librarian.git] / scripts / book2epub

diff --git a/scripts/book2epub b/scripts/book2epub
index 8e713b9..ea87483 100755 (executable)
--- a/scripts/book2epub
+++ b/scripts/book2epub
@@ -7,13 +7,13 @@
 import os.path
 import optparse
 
 import os.path
 import optparse
 

-from librarian import epub, DirDocProvider
+from librarian import epub, DirDocProvider, ParseError

 
 
 if __name__ == '__main__':
     # Parse commandline arguments
 
 
 if __name__ == '__main__':
     # Parse commandline arguments

-    usage = """Usage: %prog [options] SOURCE
-    Convert SOURCE file to EPUB format."""
+    usage = """Usage: %prog [options] SOURCE [SOURCE...]
+    Convert SOURCE files to EPUB format."""

 
     parser = optparse.OptionParser(usage=usage)
 
 
     parser = optparse.OptionParser(usage=usage)
 


@@ -21,18 +21,38 @@ if __name__ == '__main__':
         help='print status messages to stdout')
     parser.add_option('-d', '--make-dir', action='store_true', dest='make_dir', default=False,
                       help='create a directory for author and put the PDF in it')
         help='print status messages to stdout')
     parser.add_option('-d', '--make-dir', action='store_true', dest='make_dir', default=False,
                       help='create a directory for author and put the PDF in it')

+    parser.add_option('-o', '--output-file', dest='output_file', metavar='FILE',
+                      help='specifies the output file')
+    parser.add_option('-O', '--output-dir', dest='output_dir', metavar='DIR',
+                      help='specifies the directory for output')

 
     options, input_filenames = parser.parse_args()
 
 
     options, input_filenames = parser.parse_args()
 

-    if len(input_filenames) != 1:
+    if len(input_filenames) < 1:

         parser.print_help()
         exit(1)
 
     # Do some real work
         parser.print_help()
         exit(1)
 
     # Do some real work

-    main_input = input_filenames[0]
-    if options.verbose:
-        print main_input
-    basepath, ext = os.path.splitext(main_input)
-    path, slug = os.path.realpath(basepath).rsplit('/', 1)
-    provider = DirDocProvider(path)
-    epub.transform(provider, slug, output_dir=path, make_dir=options.make_dir)
+    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)
+
+            output_dir = output_file = None
+            if options.output_dir:
+                output_dir = options.output_dir
+            elif options.output_file:
+                output_file = options.output_file
+            else:
+                output_dir = path
+
+            epub.transform(provider, file_path=main_input, output_dir=output_dir, output_file=output_file, make_dir=options.make_dir)
+    except ParseError, e:
+        print '%(file)s:%(name)s:%(message)s' % {
+            'file': main_input,
+            'name': e.__class__.__name__,
+            'message': e.message
+        }
+            
\ No newline at end of file