Paragraphs formatting improvements

[librarian.git] / librarian / mobi.py

diff --git a/librarian/mobi.py b/librarian/mobi.py
old mode 100755 (executable)
new mode 100644 (file)
index a93315e..74018b3
--- a/librarian/mobi.py
+++ b/librarian/mobi.py
@@ -3,12 +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 copy import deepcopy

 import os
 import subprocess
 from tempfile import NamedTemporaryFile
 
 from librarian import OutputFile
 import os
 import subprocess
 from tempfile import NamedTemporaryFile
 
 from librarian import OutputFile

-from librarian.cover import WLCover
+from librarian.cover import DefaultEbookCover

 from librarian import get_resource
 
 
 from librarian import get_resource
 
 


@@ -18,23 +19,31 @@ def transform(wldoc, verbose=False,
 
     wldoc: a WLDocument
     sample=n: generate sample e-book (with at least n paragraphs)
 
     wldoc: a WLDocument
     sample=n: generate sample e-book (with at least n paragraphs)

-    cover: a cover.Cover object
+    cover: a cover.Cover factory overriding default

     flags: less-advertising,
     """
 
     flags: less-advertising,
     """
 

-    book_info = wldoc.book_info
+    document = deepcopy(wldoc)
+    del wldoc
+    book_info = document.book_info

 
     # provide a cover by default
     if not cover:
 
     # provide a cover by default
     if not cover:

-        cover = WLCover
+        cover = DefaultEbookCover

     cover_file = NamedTemporaryFile(suffix='.png', delete=False)
     cover_file = NamedTemporaryFile(suffix='.png', delete=False)

-    c = cover(book_info.author.readable(), book_info.title)
-    c.save(cover_file)
+    bound_cover = cover(book_info)
+    bound_cover.save(cover_file)
+
+    if bound_cover.uses_dc_cover:
+        if document.book_info.cover_by:
+            document.edoc.getroot().set('data-cover-by', document.book_info.cover_by)
+        if document.book_info.cover_source:
+            document.edoc.getroot().set('data-cover-source', document.book_info.cover_source)

 
     if not flags:
         flags = []
     flags = list(flags) + ['without-fonts']
 
     if not flags:
         flags = []
     flags = list(flags) + ['without-fonts']

-    epub = wldoc.as_epub(verbose=verbose, sample=sample, html_toc=True,
+    epub = document.as_epub(verbose=verbose, sample=sample, html_toc=True,

             flags=flags, style=get_resource('mobi/style.css'))
 
     if verbose:
             flags=flags, style=get_resource('mobi/style.css'))
 
     if verbose:


@@ -48,4 +57,4 @@ def transform(wldoc, verbose=False,
     subprocess.check_call(['ebook-convert', epub.get_filename(), output_file.name,
             '--no-inline-toc', '--cover=%s' % cover_file.name], **kwargs)
     os.unlink(cover_file.name)
     subprocess.check_call(['ebook-convert', epub.get_filename(), output_file.name,
             '--no-inline-toc', '--cover=%s' % cover_file.name], **kwargs)
     os.unlink(cover_file.name)

-    return OutputFile.from_filename(output_file.name)
\ No newline at end of file
+    return OutputFile.from_filename(output_file.name)