some epub/mobi fixes

diff --git a/librarian/epub.py b/librarian/epub.py
index 58d4bc0..bb3123d 100644 (file)
--- a/librarian/epub.py
+++ b/librarian/epub.py
@@ -311,7 +311,7 @@ def transform(provider, slug=None, file_path=None, output_file=None, output_dir=
 
         # every input file will have a TOC entry,
         # pointing to starting chunk
-        toc = TOC(node_name(input_xml.find('.//'+DCNS('title'))), chunk_counter)
+        toc = TOC(node_name(input_xml.find('.//'+DCNS('title'))), "part%d.html" % chunk_counter)
         chars = set()
         if first:
             # write book title page

diff --git a/librarian/mobi.py b/librarian/mobi.py
index a1f5127..cd894fe 100755 (executable)
--- a/librarian/mobi.py
+++ b/librarian/mobi.py
@@ -7,9 +7,11 @@ import os
 import os.path
 import subprocess
 from tempfile import NamedTemporaryFile
+from lxml import etree
 
 from librarian.cover import WLCover
-from librarian import epub, get_resource
+from librarian import epub, get_resource, NoDublinCore, RDFNS
+from librarian.dcparser import BookInfo
 
 
 def transform(provider, slug=None, file_path=None, output_file=None, output_dir=None, make_dir=False, verbose=False,
@@ -26,6 +28,23 @@ def transform(provider, slug=None, file_path=None, output_file=None, output_dir=
     flags: less-advertising,
     """
 
+    # read metadata from the first file
+    if file_path:
+        if slug:
+            raise ValueError('slug or file_path should be specified, not both')
+        f = open(file_path, 'r')
+        input_xml = etree.parse(f)
+        f.close()
+    else:
+        if not slug:
+            raise ValueError('either slug or file_path should be specified')
+        input_xml = etree.parse(provider[slug])
+
+    metadata = input_xml.find('.//'+RDFNS('Description'))
+    if metadata is None:
+        raise NoDublinCore('Document has no DublinCore - which is required.')
+    book_info = BookInfo.from_element(input_xml)
+
     # if output to dir, create the file
     if output_dir is not None:
         if make_dir:
@@ -43,13 +62,16 @@ def transform(provider, slug=None, file_path=None, output_file=None, output_dir=
     # provide a cover by default
     if not cover:
         cover = WLCover
+    cover_file = NamedTemporaryFile(suffix='.png', delete=False)
+    c = cover(book_info.author.readable(), book_info.title)
+    c.save(cover_file)
 
     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, html_toc=True, cover=cover, flags=flags, style=get_resource('mobi/style.css'))
+              sample=sample, html_toc=True, flags=flags, style=get_resource('mobi/style.css'))
 
     if verbose:
         kwargs = {}
@@ -57,5 +79,6 @@ def transform(provider, slug=None, file_path=None, output_file=None, output_dir=
         devnull = open("/dev/null", 'w')
         kwargs = {"stdout": devnull, "stderr": devnull}
     subprocess.check_call(['ebook-convert', epub_file.name, output_file,
-            '--no-inline-toc'], **kwargs)
+            '--no-inline-toc', '--cover=%s' % cover_file.name], **kwargs)
     os.unlink(epub_file.name)
+    os.unlink(cover_file.name)