epub/mobi fixes

[librarian.git] / librarian / mobi.py

diff --git a/librarian/mobi.py b/librarian/mobi.py
index 62b275c..a1f5127 100755 (executable)
--- a/librarian/mobi.py
+++ b/librarian/mobi.py
@@ -3,23 +3,13 @@
 # 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 with_statement
-

 import os
 import os.path
 import subprocess
 import os
 import os.path
 import subprocess

-from StringIO import StringIO
-from copy import deepcopy
-from lxml import etree
-import zipfile

 from tempfile import NamedTemporaryFile
 from tempfile import NamedTemporaryFile

-from shutil import rmtree
-
-import sys

 
 

-from librarian import epub
-
-from librarian import functions, get_resource
+from librarian.cover import WLCover
+from librarian import epub, get_resource

 
 
 def transform(provider, slug=None, file_path=None, output_file=None, output_dir=None, make_dir=False, verbose=False,
 
 
 def transform(provider, slug=None, file_path=None, output_file=None, output_dir=None, make_dir=False, verbose=False,


@@ -30,7 +20,7 @@ def transform(provider, slug=None, file_path=None, output_file=None, output_dir=
     slug: slug of file to process, available by provider
     output_file: path to output file
     output_dir: path to directory to save output file to; either this or output_file must be present
     slug: slug of file to process, available by provider
     output_file: path to output file
     output_dir: path to directory to save output file to; either this or output_file must be present

-    make_dir: writes output to <output_dir>/<author>/<slug>.epub instead of <output_dir>/<slug>.epub
+    make_dir: writes output to <output_dir>/<author>/<slug>.mobi instead of <output_dir>/<slug>.mobi

     sample=n: generate sample e-book (with at least n paragraphs)
     cover: a cover.Cover object
     flags: less-advertising,
     sample=n: generate sample e-book (with at least n paragraphs)
     cover: a cover.Cover object
     flags: less-advertising,


@@ -50,11 +40,22 @@ def transform(provider, slug=None, file_path=None, output_file=None, output_dir=
         else:
             output_file = os.path.join(output_dir, os.path.splitext(os.path.basename(file_path))[0] + '.mobi')
 
         else:
             output_file = os.path.join(output_dir, os.path.splitext(os.path.basename(file_path))[0] + '.mobi')
 

+    # provide a cover by default
+    if not cover:
+        cover = WLCover
+

     epub_file = NamedTemporaryFile(suffix='.epub', delete=False)
     if not flags:
         flags = []
     flags = list(flags) + ['without-fonts']
     epub.transform(provider, file_path=file_path, output_file=epub_file, verbose=verbose,
     epub_file = NamedTemporaryFile(suffix='.epub', delete=False)
     if not flags:
         flags = []
     flags = list(flags) + ['without-fonts']
     epub.transform(provider, file_path=file_path, output_file=epub_file, verbose=verbose,

-              sample=sample, cover=None, flags=flags, style=get_resource('mobi/style.css'))
-    subprocess.check_call(['ebook-convert', epub_file.name, output_file])
+              sample=sample, html_toc=True, cover=cover, flags=flags, style=get_resource('mobi/style.css'))
+
+    if verbose:
+        kwargs = {}
+    else:
+        devnull = open("/dev/null", 'w')
+        kwargs = {"stdout": devnull, "stderr": devnull}
+    subprocess.check_call(['ebook-convert', epub_file.name, output_file,
+            '--no-inline-toc'], **kwargs)

     os.unlink(epub_file.name)
     os.unlink(epub_file.name)