X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/ebe02c4c8c6e0bb91fe6a31b1648fab17f23d097..8fefa7358bf9f799c8a7d700b58a00362b26419e:/librarian/cover.py?ds=sidebyside diff --git a/librarian/cover.py b/librarian/cover.py index 21eedc3..c32751d 100644 --- a/librarian/cover.py +++ b/librarian/cover.py @@ -3,9 +3,11 @@ # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from __future__ import unicode_literals + import re -from PIL import Image, ImageFont, ImageDraw, ImageFilter, ImageEnhance -from StringIO import StringIO +from PIL import Image, ImageFont, ImageDraw, ImageFilter +from six import BytesIO from librarian import get_resource, OutputFile, URLOpener @@ -18,8 +20,9 @@ class Metric(object): def __getattr__(self, name): src = getattr(self._obj, name) if src and self._scale: - src = type(src)(self._scale * src) - return src + return type(src)(self._scale * src) + else: + return src class TextBox(object): @@ -68,7 +71,7 @@ class TextBox(object): line_width = self.draw.textsize(line, font=font)[0] line = line.strip() + ' ' - pos_x = (self.max_width - line_width) / 2 + pos_x = (self.max_width - line_width) // 2 if shadow_color: self.shadow_draw.text( @@ -142,6 +145,8 @@ class Cover(object): self.title = book_info.title if format is not None: self.format = format + if width and height: + self.height = int(round(height * self.width / width)) scale = max(float(width or 0) / self.width, float(height or 0) / self.height) if scale >= 1: self.scale = scale @@ -168,8 +173,8 @@ class Cover(object): # WL logo if metr.logo_width: logo = Image.open(get_resource('res/wl-logo.png')) - logo = logo.resize((metr.logo_width, logo.size[1] * metr.logo_width / logo.size[0])) - img.paste(logo, ((metr.width - metr.logo_width) / 2, img.size[1] - logo.size[1] - metr.logo_bottom)) + logo = logo.resize((metr.logo_width, int(round(logo.size[1] * metr.logo_width / logo.size[0])))) + img.paste(logo, ((metr.width - metr.logo_width) // 2, img.size[1] - logo.size[1] - metr.logo_bottom)) top = metr.author_top tbox = TextBox( @@ -179,8 +184,7 @@ class Cover(object): author_font = ImageFont.truetype( self.author_font_ttf, metr.author_font_size) - tbox.text(self.pretty_author(), self.author_color, author_font, - metr.author_lineskip, self.author_shadow) + tbox.text(self.pretty_author(), self.author_color, author_font, metr.author_lineskip, self.author_shadow) text_img = tbox.image() img.paste(text_img, (metr.author_margin_left, top), text_img) @@ -191,8 +195,7 @@ class Cover(object): ) title_font = ImageFont.truetype( self.title_font_ttf, metr.title_font_size) - tbox.text(self.pretty_title(), self.title_color, title_font, - metr.title_lineskip, self.title_shadow) + tbox.text(self.pretty_title(), self.title_color, title_font, metr.title_lineskip, self.title_shadow) text_img = tbox.image() img.paste(text_img, (metr.title_margin_left, top), text_img) @@ -222,9 +225,9 @@ class Cover(object): return self.final_image().save(*args, **default_kwargs) def output_file(self, *args, **kwargs): - imgstr = StringIO() + imgstr = BytesIO() self.save(imgstr, *args, **kwargs) - return OutputFile.from_string(imgstr.getvalue()) + return OutputFile.from_bytes(imgstr.getvalue()) class WLCover(Cover): @@ -239,7 +242,7 @@ class WLCover(Cover): title_font_size = 30 title_lineskip = 40 title_box_width = 350 - + box_top_margin = 100 box_bottom_margin = 100 box_padding_y = 20 @@ -278,7 +281,7 @@ class WLCover(Cover): u'Epika': 'bottom', } - def __init__(self, book_info, format=None, width=None, height=None): + def __init__(self, book_info, format=None, width=None, height=None, bleed=0): super(WLCover, self).__init__(book_info, format=format, width=width, height=height) # Set box position. self.box_position = book_info.cover_box_position or \ @@ -292,12 +295,17 @@ class WLCover(Cover): # Set title color. self.title_color = self.epoch_colors.get(book_info.epoch, self.title_color) + self.bleed = bleed + self.box_top_margin += bleed + self.box_bottom_margin += bleed + self.bar_width += bleed + if book_info.cover_url: url = book_info.cover_url bg_src = None if bg_src is None: bg_src = URLOpener().open(url) - self.background_img = StringIO(bg_src.read()) + self.background_img = BytesIO(bg_src.read()) bg_src.close() def pretty_author(self): @@ -317,12 +325,11 @@ class WLCover(Cover): font=author_font, line_height=metr.author_lineskip, color=self.author_color, - shadow_color=self.author_shadow, - ) + shadow_color=self.author_shadow) box.skip(metr.box_above_line) box.draw.line((metr.box_line_left, box.height, metr.box_line_right, box.height), - fill=self.author_color, width=metr.box_line_width) + fill=self.author_color, width=metr.box_line_width) box.skip(metr.box_below_line) # Write title. @@ -332,8 +339,7 @@ class WLCover(Cover): line_height=metr.title_lineskip, font=title_font, color=self.title_color, - shadow_color=self.title_shadow, - ) + shadow_color=self.title_shadow) box_img = box.image() @@ -343,19 +349,35 @@ class WLCover(Cover): elif self.box_position == 'bottom': box_top = metr.height - metr.box_bottom_margin - box_img.size[1] else: # Middle. - box_top = (metr.height - box_img.size[1]) / 2 + box_top = (metr.height - box_img.size[1]) // 2 - box_left = metr.bar_width + (metr.width - metr.bar_width - - box_img.size[0]) / 2 + box_left = metr.bar_width + (metr.width - metr.bar_width - box_img.size[0]) // 2 # 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') + 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 add_cut_lines(self, img): + line_ratio = 0.5 + if self.bleed == 0: + return img + metr = Metric(self, self.scale) + draw = ImageDraw.Draw(img) + for corner_x, corner_y in ((0, 0), (metr.width, 0), (0, metr.height), (metr.width, metr.height)): + dir_x = 1 if corner_x == 0 else -1 + dir_y = 1 if corner_y == 0 else -1 + for offset in (-1, 0, 1): + draw.line((corner_x, corner_y + dir_y * metr.bleed + offset, + corner_x + dir_x * metr.bleed * line_ratio, corner_y + dir_y * metr.bleed + offset), + fill='black' if offset == 0 else 'white', width=1) + draw.line((corner_x + dir_x * metr.bleed + offset, corner_y, + corner_x + dir_x * metr.bleed + offset, corner_y + dir_y * metr.bleed * line_ratio), + fill='black' if offset == 0 else 'white', width=1) + return img + def image(self): metr = Metric(self, self.scale) img = Image.new('RGB', (metr.width, metr.height), self.background_color) @@ -369,17 +391,17 @@ class WLCover(Cover): 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] + int(round(src.size[1] * trg_size[0] / src.size[0])) ) - cut = (resized[1] - trg_size[1]) / 2 + 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], + int(round(src.size[0] * trg_size[1] / src.size[1])), trg_size[1], ) - cut = (resized[0] - trg_size[0]) / 2 + 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])) @@ -388,6 +410,13 @@ class WLCover(Cover): img = self.add_box(img) + # img = self.add_cut_lines(img) + + return img + + +class WLNoBoxCover(WLCover): + def add_box(self, img): return img @@ -403,6 +432,11 @@ class LogoWLCover(WLCover): 'res/fnp-logo-white.png', ] + def __init__(self, *args, **kwargs): + super(LogoWLCover, self).__init__(*args, **kwargs) + self.gradient_height += self.bleed + self.gradient_logo_margin_right += self.bleed + def image(self): img = super(LogoWLCover, self).image() metr = Metric(self, self.scale) @@ -410,16 +444,17 @@ class LogoWLCover(WLCover): gradient_mask = Image.new('L', (metr.width - metr.bar_width, metr.gradient_height)) draw = ImageDraw.Draw(gradient_mask) for line in range(0, metr.gradient_height): - draw.line((0, line, metr.width - metr.bar_width, line), fill=int(255 * self.gradient_opacity * line / metr.gradient_height)) - img.paste(gradient, - (metr.bar_width, metr.height - metr.gradient_height), mask=gradient_mask) + draw.line( + (0, line, metr.width - metr.bar_width, line), + fill=int(255 * self.gradient_opacity * line / metr.gradient_height)) + img.paste(gradient, (metr.bar_width, metr.height - metr.gradient_height), mask=gradient_mask) cursor = metr.width - metr.gradient_logo_margin_right - logo_top = metr.height - metr.gradient_height / 2 - metr.gradient_logo_height / 2 + 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)) logo = logo.resize( - (logo.size[0] * metr.gradient_logo_height / logo.size[1], metr.gradient_logo_height), + (int(round(logo.size[0] * metr.gradient_logo_height / logo.size[1])), metr.gradient_logo_height), Image.ANTIALIAS) cursor -= logo.size[0] img.paste(logo, (cursor, logo_top), mask=logo) @@ -511,5 +546,48 @@ class GandalfCover(Cover): format = 'PNG' -DefaultEbookCover = LogoWLCover +class KMLUCover(LogoWLCover): + gradient_logo_height = 58 + gradient_logo_spacing = 25 + gradient_logos = [ + 'res/kmlu-logo-white.png', + 'res/wl-logo-white.png', + 'res/fnp-logo-white.png', + ] + + +class MPWCover(LogoWLCover): + gradient_logo_height = 58 + gradient_logo_spacing = 25 + gradient_logos = [ + 'res/mpw-logo-white.png', + 'res/wl-logo-white.png', + 'res/fnp-logo-white.png', + ] + + +class AtriumCover(LogoWLCover): + gradient_logo_height = 58 + gradient_logo_spacing = 25 + gradient_logos = [ + 'res/atrium-logo.png', + 'res/wl-logo-white.png', + 'res/fnp-logo-white.png', + ] + + +COVER_CLASSES = { + 'default': LogoWLCover, + 'kmlu': KMLUCover, + 'mpw': MPWCover, + 'atrium': AtriumCover, +} + +def make_cover(book_info, *args, **kwargs): + if 'cover_class' in kwargs: + cover_class_name = kwargs.pop('cover_class') + else: + cover_class_name = book_info.cover_class + cover_class = COVER_CLASSES[cover_class_name] + return cover_class(book_info, *args, **kwargs)