From: Radek Czajka Date: Mon, 3 Feb 2014 09:00:39 +0000 (+0100) Subject: Add support for custom covers (coverBarColor, coverBoxPosition), remove the logo... X-Git-Tag: 1.7~116 X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/db772f02e1800391c1699002e16729ab8872675e?ds=sidebyside;hp=-c Add support for custom covers (coverBarColor, coverBoxPosition), remove the logo-in-white-box option. --- db772f02e1800391c1699002e16729ab8872675e diff --git a/librarian/cover.py b/librarian/cover.py index d1b2cc0..2f3117c 100644 --- a/librarian/cover.py +++ b/librarian/cover.py @@ -248,9 +248,11 @@ class WLCover(Cover): logo_width = 140 bar_width = 35 + bar_color = '#000' + box_position = 'middle' background_color = '#444' author_color = '#444' - default_background = get_resource('res/cover.png') + background_img = get_resource('res/cover.png') format = 'JPEG' epoch_colors = { @@ -266,11 +268,25 @@ class WLCover(Cover): u'Współczesność': '#06393d', } - def __init__(self, book_info, format=None, width=None, height=None, with_logo=False): + kind_box_position = { + u'Liryka': 'top', + u'Epika': 'bottom', + } + + def __init__(self, book_info, format=None, width=None, height=None): super(WLCover, self).__init__(book_info, format=format, width=width, height=height) - self.kind = book_info.kind - self.epoch = book_info.epoch - self.with_logo = with_logo + # Set box position. + self.box_position = book_info.cover_box_position or \ + self.kind_box_position.get(book_info.kind, self.box_position) + # Set bar color. + if book_info.cover_bar_color == 'none': + self.bar_width = 0 + else: + self.bar_color = book_info.cover_bar_color or \ + self.epoch_colors.get(book_info.epoch, self.bar_color) + # Set title color. + self.title_color = self.epoch_colors.get(book_info.epoch, self.title_color) + if book_info.cover_url: url = book_info.cover_url bg_src = None @@ -278,46 +294,17 @@ class WLCover(Cover): bg_src = URLOpener().open(url) self.background_img = StringIO(bg_src.read()) bg_src.close() - else: - self.background_img = self.default_background def pretty_author(self): return self.author.upper() - def image(self): - metr = Metric(self, self.scale) - img = Image.new('RGB', (metr.width, metr.height), self.background_color) - draw = ImageDraw.Draw(img) - - if self.epoch in self.epoch_colors: - epoch_color = self.epoch_colors[self.epoch] - else: - epoch_color = '#000' - draw.rectangle((0, 0, metr.bar_width, metr.height), fill=epoch_color) - - if self.background_img: - src = Image.open(self.background_img) - trg_size = (metr.width - metr.bar_width, metr.height) - if src.size[0] * trg_size[1] < src.size[1] * trg_size[0]: - resized = ( - trg_size[0], - src.size[1] * trg_size[0] / src.size[0] - ) - cut = (resized[1] - trg_size[1]) / 2 - src = src.resize(resized, Image.ANTIALIAS) - src = src.crop((0, cut, src.size[0], src.size[1] - cut)) - else: - resized = ( - src.size[0] * trg_size[1] / src.size[1], - trg_size[1], - ) - cut = (resized[0] - trg_size[0]) / 2 - src = src.resize(resized, Image.ANTIALIAS) - src = src.crop((cut, 0, src.size[0] - cut, src.size[1])) + def add_box(self, img): + if self.box_position == 'none': + return img - img.paste(src, (metr.bar_width, 0)) - del src + metr = Metric(self, self.scale) + # Write author name. box = TextBox(metr.title_box_width, metr.height, padding_y=metr.box_padding_y) author_font = ImageFont.truetype( self.author_font_ttf, metr.author_font_size) @@ -333,46 +320,68 @@ class WLCover(Cover): fill=self.author_color, width=metr.box_line_width) box.skip(metr.box_below_line) + # Write title. title_font = ImageFont.truetype( self.title_font_ttf, metr.title_font_size) box.text(self.pretty_title(), line_height=metr.title_lineskip, font=title_font, - color=epoch_color, + color=self.title_color, shadow_color=self.title_shadow, ) - if self.with_logo: - logo = Image.open(get_resource('res/wl-logo-mono.png')) - logo = logo.resize((metr.logo_width, logo.size[1] * metr.logo_width / logo.size[0]), Image.ANTIALIAS) - alpha = logo.split()[3] - alpha = ImageEnhance.Brightness(alpha).enhance(.75) - logo.putalpha(alpha) - box.skip(metr.logo_top + logo.size[1]) - box_img = box.image() - if self.kind == 'Liryka': - # top + # Find box position. + if self.box_position == 'top': box_top = metr.box_top_margin - elif self.kind == 'Epika': - # bottom + elif self.box_position == 'bottom': box_top = metr.height - metr.box_bottom_margin - box_img.size[1] - else: - # center + else: # Middle. box_top = (metr.height - box_img.size[1]) / 2 box_left = metr.bar_width + (metr.width - metr.bar_width - box_img.size[0]) / 2 - draw.rectangle((box_left, box_top, + + # Draw the white box. + ImageDraw.Draw(img).rectangle((box_left, box_top, box_left + box_img.size[0], box_top + box_img.size[1]), fill='#fff') + # Paste the contents into the white box. img.paste(box_img, (box_left, box_top), box_img) + return img + + def image(self): + metr = Metric(self, self.scale) + img = Image.new('RGB', (metr.width, metr.height), self.background_color) + draw = ImageDraw.Draw(img) + + draw.rectangle((0, 0, metr.bar_width, metr.height), fill=self.bar_color) + + if self.background_img: + src = Image.open(self.background_img) + trg_size = (metr.width - metr.bar_width, metr.height) + if src.size[0] * trg_size[1] < src.size[1] * trg_size[0]: + resized = ( + trg_size[0], + src.size[1] * trg_size[0] / src.size[0] + ) + cut = (resized[1] - trg_size[1]) / 2 + src = src.resize(resized, Image.ANTIALIAS) + src = src.crop((0, cut, src.size[0], src.size[1] - cut)) + else: + resized = ( + src.size[0] * trg_size[1] / src.size[1], + trg_size[1], + ) + cut = (resized[0] - trg_size[0]) / 2 + src = src.resize(resized, Image.ANTIALIAS) + src = src.crop((cut, 0, src.size[0] - cut, src.size[1])) + + img.paste(src, (metr.bar_width, 0)) + del src - if self.with_logo: - img.paste(logo, - (box_left + (box_img.size[0] - logo.size[0]) / 2, - box_top + box_img.size[1] - metr.box_padding_y - logo.size[1]), mask=logo) + img = self.add_box(img) return img diff --git a/librarian/dcparser.py b/librarian/dcparser.py index a7215a1..ab1e714 100644 --- a/librarian/dcparser.py +++ b/librarian/dcparser.py @@ -10,7 +10,7 @@ import re from librarian.util import roman_to_int from librarian import (ValidationError, NoDublinCore, ParseError, DCNS, RDFNS, - XMLNS, WLURI) + XMLNS, WLURI, WLNS) import lxml.etree as etree # ElementTree API using libxml2 from lxml.etree import XMLSyntaxError @@ -448,6 +448,9 @@ class BookInfo(WorkInfo): Field( DCNS('relation.coverImage.url'), 'cover_url', required=False), Field( DCNS('relation.coverImage.attribution'), 'cover_by', required=False), Field( DCNS('relation.coverImage.source'), 'cover_source', required=False), + # WLCover-specific. + Field( WLNS('coverBarColor'), 'cover_bar_color', required=False), + Field( WLNS('coverBoxPosition'), 'cover_box_position', required=False), ) diff --git a/scripts/book2cover b/scripts/book2cover index 758ab0e..444563c 100755 --- a/scripts/book2cover +++ b/scripts/book2cover @@ -20,9 +20,6 @@ class Book2Cover(Book2Anything): help='Set width.'), Option('-H', '--height', action='store', type='int', dest='height', default=None, help='Set height.'), - Option('-l', '--with-logo', dest='with_logo', - action='store_true', default=False, - help='Add WL logo in white box.'), ] @staticmethod