From 141003eb42e1f56d24e84ca477ae9a18a98c613b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 28 May 2010 00:43:07 -0600 Subject: [PATCH] EPUB Output: Use correct SVG code when not preserving aspect ratio for covers --- src/calibre/ebooks/oeb/transforms/cover.py | 37 +++++++++++++++++++--- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/src/calibre/ebooks/oeb/transforms/cover.py b/src/calibre/ebooks/oeb/transforms/cover.py index 9aee46c591..bd11a92af8 100644 --- a/src/calibre/ebooks/oeb/transforms/cover.py +++ b/src/calibre/ebooks/oeb/transforms/cover.py @@ -5,10 +5,15 @@ __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import textwrap +import textwrap, cStringIO from urllib import unquote from lxml import etree +try: + from PIL import Image as PILImage + PILImage +except ImportError: + import Image as PILImage from calibre import __appname__, __version__, guess_type @@ -28,9 +33,9 @@ class CoverManager(object): - + @@ -93,7 +98,6 @@ class CoverManager(object): title = unicode(m.title[0]) authors = [unicode(x) for x in m.creator if x.role == 'aut'] - import cStringIO cover_file = cStringIO.StringIO() try: try: @@ -142,6 +146,18 @@ class CoverManager(object): self.log.exception('Failed to generate default cover') return None + def inspect_cover(self, href): + from calibre.ebooks.oeb.base import urlnormalize + for x in self.oeb.manifest: + if x.href == urlnormalize(href): + try: + raw = x.data + f = cStringIO.StringIO(raw) + im = PILImage.open(f) + return im.size + except: + self.log.exception('Failed to read image dimensions') + return None, None def insert_cover(self): from calibre.ebooks.oeb.base import urldefrag @@ -152,6 +168,19 @@ class CoverManager(object): href = g['cover'].href else: href = self.default_cover() + width, height = self.inspect_cover(href) + if width is None or height is None: + self.log.warning('Failed to read cover dimensions') + width, height = 600, 800 + if self.preserve_aspect_ratio: + width, height = 600, 800 + self.svg_template = self.svg_template.replace('__viewbox__', + '0 0 %d %d'%(width, height)) + self.svg_template = self.svg_template.replace('__width__', + str(width)) + self.svg_template = self.svg_template.replace('__height__', + str(height)) + if href is not None: templ = self.non_svg_template if self.no_svg_cover \ else self.svg_template