Version bump.

[librarian.git] / librarian / mobi.py

diff --git a/librarian/mobi.py b/librarian/mobi.py
index b30c1fe..6f1f5d6 100644 (file)
--- a/librarian/mobi.py
+++ b/librarian/mobi.py
@@ -3,6 +3,7 @@
 # This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

+from __future__ import unicode_literals

 
 from copy import deepcopy
 import os
 
 from copy import deepcopy
 import os


@@ -10,30 +11,27 @@ import subprocess
 from tempfile import NamedTemporaryFile
 
 from librarian import OutputFile
 from tempfile import NamedTemporaryFile
 
 from librarian import OutputFile

-from librarian.cover import DefaultEbookCover
-from librarian import get_resource

 
 
 def transform(wldoc, verbose=False, sample=None, cover=None,
 
 
 def transform(wldoc, verbose=False, sample=None, cover=None,

-              use_kindlegen=False, flags=None):
+              use_kindlegen=False, flags=None, hyphenate=True, ilustr_path='',
+              converter_path=None):

     """ produces a MOBI file
 
     wldoc: a WLDocument
     sample=n: generate sample e-book (with at least n paragraphs)
     cover: a cover.Cover factory overriding default
     flags: less-advertising,
     """ produces a MOBI file
 
     wldoc: a WLDocument
     sample=n: generate sample e-book (with at least n paragraphs)
     cover: a cover.Cover factory overriding default
     flags: less-advertising,

+    converter_path: override path to MOBI converter,
+      either ebook-convert or kindlegen

     """
 
     document = deepcopy(wldoc)
     del wldoc
     """
 
     document = deepcopy(wldoc)
     del wldoc

-    book_info = document.book_info
-
-    if not flags:
-        flags = []
-    flags = list(flags)

 
     epub = document.as_epub(verbose=verbose, sample=sample,
 
     epub = document.as_epub(verbose=verbose, sample=sample,

-                            html_toc=True, cover=True, flags=flags)
+                            html_toc=True, cover=cover or True, flags=flags,
+                            hyphenate=hyphenate, ilustr_path=ilustr_path, output_type='mobi')

     if verbose:
         kwargs = {}
     else:
     if verbose:
         kwargs = {}
     else:


@@ -46,10 +44,12 @@ def transform(wldoc, verbose=False, sample=None, cover=None,
 
     if use_kindlegen:
         output_file_basename = os.path.basename(output_file.name)
 
     if use_kindlegen:
         output_file_basename = os.path.basename(output_file.name)

-        subprocess.check_call(['kindlegen', '-c2', epub.get_filename(),
-                              '-o', output_file_basename], **kwargs)
+        subprocess.check_call([converter_path or 'kindlegen',
+                               '-c2', epub.get_filename(),
+                               '-o', output_file_basename], **kwargs)

     else:
     else:

-        subprocess.check_call(['ebook-convert', epub.get_filename(),
+        subprocess.check_call([converter_path or 'ebook-convert',
+                               epub.get_filename(),

                                output_file.name, '--no-inline-toc',
                                '--mobi-file-type=both',
                                '--mobi-ignore-margins'], **kwargs)
                                output_file.name, '--no-inline-toc',
                                '--mobi-file-type=both',
                                '--mobi-ignore-margins'], **kwargs)