[epub, mobi] didaskalia tag rendering improvement

[librarian.git] / librarian / cover.py

diff --git a/librarian/cover.py b/librarian/cover.py
index a37b911..d1b2cc0 100644 (file)
--- a/librarian/cover.py
+++ b/librarian/cover.py
@@ -4,7 +4,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import re
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import re

-import Image, ImageFont, ImageDraw, ImageFilter, ImageEnhance
+from PIL import Image, ImageFont, ImageDraw, ImageFilter, ImageEnhance

 from StringIO import StringIO
 from librarian import get_resource, OutputFile, URLOpener
 
 from StringIO import StringIO
 from librarian import get_resource, OutputFile, URLOpener
 


@@ -125,6 +125,7 @@ class Cover(object):
 
     format = 'JPEG'
     scale = 1
 
     format = 'JPEG'
     scale = 1

+    scale_after = 1

 
     exts = {
         'JPEG': 'jpg',
 
     exts = {
         'JPEG': 'jpg',


@@ -142,8 +143,10 @@ class Cover(object):
         if format is not None:
             self.format = format
         scale = max(float(width or 0) / self.width, float(height or 0) / self.height)
         if format is not None:
             self.format = format
         scale = max(float(width or 0) / self.width, float(height or 0) / self.height)

-        if scale:
+        if scale >= 1:

             self.scale = scale
             self.scale = scale

+        elif scale:
+            self.scale_after = scale

 
     def pretty_author(self):
         """Allows for decorating author's name."""
 
     def pretty_author(self):
         """Allows for decorating author's name."""


@@ -195,6 +198,15 @@ class Cover(object):
 
         return img
 
 
         return img
 

+    def final_image(self):
+        img = self.image()
+        if self.scale_after != 1:
+            img = img.resize((
+                    int(round(img.size[0] * self.scale_after)),
+                    int(round(img.size[1] * self.scale_after))),
+                Image.ANTIALIAS)
+        return img
+

     def mime_type(self):
         return self.mime_types[self.format]
 
     def mime_type(self):
         return self.mime_types[self.format]
 


@@ -202,7 +214,7 @@ class Cover(object):
         return self.exts[self.format]
 
     def save(self, *args, **kwargs):
         return self.exts[self.format]
 
     def save(self, *args, **kwargs):

-        return self.image().save(format=self.format, quality=95, *args, **kwargs)
+        return self.final_image().save(format=self.format, quality=95, *args, **kwargs)

 
     def output_file(self, *args, **kwargs):
         imgstr = StringIO()
 
     def output_file(self, *args, **kwargs):
         imgstr = StringIO()


@@ -211,7 +223,7 @@ class Cover(object):
 
 
 class WLCover(Cover):
 
 
 class WLCover(Cover):

-    """Default Wolne Lektury cover generator."""
+    """Wolne Lektury cover without logos."""

     width = 600
     height = 833
     uses_dc_cover = True
     width = 600
     height = 833
     uses_dc_cover = True


@@ -365,6 +377,53 @@ class WLCover(Cover):
         return img
 
 
         return img
 
 

+class LogoWLCover(WLCover):
+    gradient_height = 90
+    gradient_logo_height = 60
+    gradient_logo_margin_right = 30
+    gradient_logo_spacing = 40
+    gradient_color = '#000'
+    gradient_opacity = .6
+    gradient_logos = [
+        'res/wl-logo-white.png',
+        'res/fnp-logo-white.png',
+    ]
+
+    def image(self):
+        img = super(LogoWLCover, self).image()
+        metr = Metric(self, self.scale)
+        gradient = Image.new('RGBA', (metr.width - metr.bar_width, metr.gradient_height), self.gradient_color)
+        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)
+
+        cursor = metr.width - metr.gradient_logo_margin_right
+        logo_top = metr.height - metr.gradient_height / 2  - metr.gradient_logo_height / 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),
+                Image.ANTIALIAS)
+            cursor -= logo.size[0]
+            img.paste(logo, (cursor, logo_top), mask=logo)
+            cursor -= metr.gradient_logo_spacing
+
+        return img
+
+
+class EbookpointCover(LogoWLCover):
+    gradient_logo_height = 58
+    gradient_logo_spacing = 25
+    gradient_logos = [
+        'res/ebookpoint-logo-white.png',
+        'res/wl-logo-white.png',
+        'res/fnp-logo-white.png',
+    ]
+
+

 class VirtualoCover(Cover):
     width = 600
     height = 730
 class VirtualoCover(Cover):
     width = 600
     height = 730


@@ -436,3 +495,7 @@ class GandalfCover(Cover):
     logo_bottom = 25
     logo_width = 250
     format = 'PNG'
     logo_bottom = 25
     logo_width = 250
     format = 'PNG'

+
+
+DefaultEbookCover = LogoWLCover
+