From: Radek Czajka Date: Wed, 31 Jul 2019 10:22:50 +0000 (+0200) Subject: Add support for addition cover logos. X-Git-Tag: 1.7.3 X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/852a6258b74c3c8dc23b591491eedf74cf86eea5 Add support for addition cover logos. --- diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a3f7a1..c392530 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ This document records all notable changes to Librarian. +## 1.7.3 (2019-07-31) + +### Added +- Support for wl:coverLogoUrl, for adding cover logos. + + ## 1.7.2 (2019-03-12) ### Fixed diff --git a/librarian/cover.py b/librarian/cover.py index c32751d..95c5cdc 100644 --- a/librarian/cover.py +++ b/librarian/cover.py @@ -432,11 +432,16 @@ class LogoWLCover(WLCover): 'res/fnp-logo-white.png', ] - def __init__(self, *args, **kwargs): - super(LogoWLCover, self).__init__(*args, **kwargs) + def __init__(self, book_info, *args, **kwargs): + super(LogoWLCover, self).__init__(book_info, *args, **kwargs) self.gradient_height += self.bleed self.gradient_logo_margin_right += self.bleed + self.additional_cover_logos = [ + BytesIO(URLOpener().open(cover_logo_url).read()) + for cover_logo_url in book_info.cover_logo_urls + ] + def image(self): img = super(LogoWLCover, self).image() metr = Metric(self, self.scale) @@ -451,14 +456,28 @@ class LogoWLCover(WLCover): cursor = metr.width - metr.gradient_logo_margin_right logo_top = int(metr.height - metr.gradient_height / 2 - metr.gradient_logo_height / 2 - metr.bleed / 2) - for logo_path in self.gradient_logos[::-1]: - logo = Image.open(get_resource(logo_path)) + + logos = [get_resource(logo_path) for logo_path in self.gradient_logos[::-1]] + logos = logos + self.additional_cover_logos + logos = [Image.open(logo_bytes).convert('RGBA') for logo_bytes in logos] + + # See if logos fit into the gradient. If not, scale down accordingly. + space_for_logos = metr.width - metr.bar_width - 2 * metr.gradient_logo_margin_right + widths = [logo.size[0] * metr.gradient_logo_height / logo.size[1] for logo in logos] + taken_space = sum(widths) + (len(logos) - 1) * (metr.gradient_logo_spacing) + logo_scale = space_for_logos / taken_space if taken_space > space_for_logos else 1 + logo_top += int(metr.gradient_logo_height * (1 - logo_scale) / 2) + + for i, logo in enumerate(logos): logo = logo.resize( - (int(round(logo.size[0] * metr.gradient_logo_height / logo.size[1])), metr.gradient_logo_height), + ( + int(round(widths[i] * logo_scale)), + int(round(metr.gradient_logo_height * logo_scale)) + ), Image.ANTIALIAS) cursor -= logo.size[0] img.paste(logo, (cursor, logo_top), mask=logo) - cursor -= metr.gradient_logo_spacing + cursor -= int(round(metr.gradient_logo_spacing * logo_scale)) return img diff --git a/librarian/dcparser.py b/librarian/dcparser.py index eeb750a..7a2a69e 100644 --- a/librarian/dcparser.py +++ b/librarian/dcparser.py @@ -468,6 +468,8 @@ class BookInfo(WorkInfo): Field(WLNS('coverBarColor'), 'cover_bar_color', required=False), Field(WLNS('coverBoxPosition'), 'cover_box_position', required=False), Field(WLNS('coverClass'), 'cover_class', default=['default']), + Field(WLNS('coverLogoUrl'), 'cover_logo_urls', multiple=True, required=False), + Field('pdf-id', 'isbn_pdf', required=False), Field('epub-id', 'isbn_epub', required=False), Field('mobi-id', 'isbn_mobi', required=False), diff --git a/setup.py b/setup.py index d1569ce..ff27678 100755 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ def whole_tree(prefix, path): setup( name='librarian', - version='1.7.2', + version='1.7.3', description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats', author="Marek Stępniowski", author_email='marek@stepniowski.com',