content

[librarian.git] / src / librarian / cover.py

diff --git a/src/librarian/cover.py b/src/librarian/cover.py
index 8f7b656..3581f59 100644 (file)
--- a/src/librarian/cover.py
+++ b/src/librarian/cover.py
@@ -1,17 +1,13 @@
-# -*- coding: utf-8 -*-
-#

 # This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
 # This file is part of Librarian, licensed under GNU Affero GPLv3 or later.

-# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.

 #
 #

-from __future__ import unicode_literals
-

 import re
 from PIL import Image, ImageFont, ImageDraw, ImageFilter
 import re
 from PIL import Image, ImageFont, ImageDraw, ImageFilter

-from six import BytesIO
+from io import BytesIO

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

-class Metric(object):
+class Metric:

     """Gets metrics from an object, scaling it by a factor."""
     def __init__(self, obj, scale):
         self._obj = obj
     """Gets metrics from an object, scaling it by a factor."""
     def __init__(self, obj, scale):
         self._obj = obj


@@ -25,21 +21,24 @@ class Metric(object):
             return src
 
 
             return src
 
 

-class TextBox(object):
+class TextBox:

     """Creates an Image with a series of centered strings."""
 
     SHADOW_X = 3
     SHADOW_Y = 3
     SHADOW_BLUR = 3
 
     """Creates an Image with a series of centered strings."""
 
     SHADOW_X = 3
     SHADOW_Y = 3
     SHADOW_BLUR = 3
 

-    def __init__(self, max_width, max_height, padding_x=None, padding_y=None):
+    def __init__(self, max_width, max_height, padding_x=None, padding_y=None, bar_width=0, bar_color=None):

         if padding_x is None:
             padding_x = self.SHADOW_X + self.SHADOW_BLUR
         if padding_y is None:
             padding_y = self.SHADOW_Y + self.SHADOW_BLUR
 
         self.max_width = max_width
         if padding_x is None:
             padding_x = self.SHADOW_X + self.SHADOW_BLUR
         if padding_y is None:
             padding_y = self.SHADOW_Y + self.SHADOW_BLUR
 
         self.max_width = max_width

-        self.max_text_width = max_width - 2 * padding_x
+        self.bar_width = bar_width
+        self.bar_color = bar_color
+        self.max_text_width = max_width - 2 * padding_x - bar_width
+        self.padding_x = padding_x

         self.padding_y = padding_y
         self.height = padding_y
         self.img = Image.new('RGBA', (max_width, max_height))
         self.padding_y = padding_y
         self.height = padding_y
         self.img = Image.new('RGBA', (max_width, max_height))


@@ -52,7 +51,7 @@ class TextBox(object):
         self.height += height
 
     def text(self, text, color='#000', font=None, line_height=20,
         self.height += height
 
     def text(self, text, color='#000', font=None, line_height=20,

-             shadow_color=None):
+             shadow_color=None, centering=True):

         """Writes some centered text."""
         text = re.sub(r'\s+', ' ', text)
         if shadow_color:
         """Writes some centered text."""
         text = re.sub(r'\s+', ' ', text)
         if shadow_color:


@@ -69,13 +68,16 @@ class TextBox(object):
                     break
                 line = parts[0]
 
                     break
                 line = parts[0]
 

-                if line[-2] == ' ':
+                if len(line) > 2 and line[-2] == ' ':

                     line = line[:-2]
 
                 line_width = self.draw.textsize(line, font=font)[0]
             line = line.strip() + ' '
 
                     line = line[:-2]
 
                 line_width = self.draw.textsize(line, font=font)[0]
             line = line.strip() + ' '
 

-            pos_x = (self.max_width - line_width) // 2
+            if centering:
+                pos_x = (self.max_width - line_width) // 2
+            else:
+                pos_x = self.bar_width + self.padding_x

 
             if shadow_color:
                 self.shadow_draw.text(
 
             if shadow_color:
                 self.shadow_draw.text(


@@ -91,7 +93,8 @@ class TextBox(object):
     def image(self):
         """Creates the actual Image object."""
         image = Image.new('RGBA', (self.max_width,
     def image(self):
         """Creates the actual Image object."""
         image = Image.new('RGBA', (self.max_width,

-                                   self.height + self.padding_y))
+                                   int(round(self.height + self.padding_y))))
+

         if self.shadow_img:
             shadow = self.shadow_img.filter(ImageFilter.BLUR)
             image.paste(shadow, (0, 0), shadow)
         if self.shadow_img:
             shadow = self.shadow_img.filter(ImageFilter.BLUR)
             image.paste(shadow, (0, 0), shadow)


@@ -101,7 +104,7 @@ class TextBox(object):
         return image
 
 
         return image
 
 

-class Cover(object):
+class Cover:

     """Abstract base class for cover images generator."""
     width = 600
     height = 800
     """Abstract base class for cover images generator."""
     width = 600
     height = 800


@@ -144,11 +147,25 @@ class Cover(object):
         'PNG': 'image/png',
         }
 
         'PNG': 'image/png',
         }
 

-    def __init__(self, book_info, format=None, width=None, height=None):
+    def __init__(self, book_info, format=None, width=None, height=None, cover_logo=None):
+        self.book_info = book_info
+
+        self.predesigned = False
+        if book_info.cover_class == 'image':
+            self.predesigned = True
+
+        # TODO: deprecated
+        if book_info.cover_box_position == 'none':
+            self.predesigned = True
+

         self.authors = [auth.readable() for auth in book_info.authors]
         self.title = book_info.title
         if format is not None:
             self.format = format
         self.authors = [auth.readable() for auth in book_info.authors]
         self.title = book_info.title
         if format is not None:
             self.format = format

+        self.set_size(width, height)
+        self.cover_logo = cover_logo
+
+    def set_size(self, width, height):

         if width and height:
             self.height = int(round(height * self.width / width))
         scale = max(float(width or 0) / self.width,
         if width and height:
             self.height = int(round(height * self.width / width))
         scale = max(float(width or 0) / self.width,


@@ -160,7 +177,7 @@ class Cover(object):
 
     def pretty_authors(self):
         """Allows for decorating authors' names."""
 
     def pretty_authors(self):
         """Allows for decorating authors' names."""

-        return [self.authors]
+        return self.authors

 
     def pretty_title(self):
         """Allows for decorating title."""
 
     def pretty_title(self):
         """Allows for decorating title."""


@@ -196,7 +213,7 @@ class Cover(object):
 
         author_font = ImageFont.truetype(
             self.author_font_ttf, metr.author_font_size,
 
         author_font = ImageFont.truetype(
             self.author_font_ttf, metr.author_font_size,

-            layout_engine=ImageFont.LAYOUT_BASIC)
+            layout_engine=ImageFont.Layout.BASIC)

         for pa in self.pretty_authors():
             tbox.text(pa, self.author_color, author_font, metr.author_lineskip,
                       self.author_shadow)
         for pa in self.pretty_authors():
             tbox.text(pa, self.author_color, author_font, metr.author_lineskip,
                       self.author_shadow)


@@ -210,7 +227,7 @@ class Cover(object):
             )
         title_font = ImageFont.truetype(
             self.title_font_ttf, metr.title_font_size,
             )
         title_font = ImageFont.truetype(
             self.title_font_ttf, metr.title_font_size,

-            layout_engine=ImageFont.LAYOUT_BASIC)
+            layout_engine=ImageFont.Layout.BASIC)

         tbox.text(self.pretty_title(), self.title_color, title_font,
                   metr.title_lineskip, self.title_shadow)
         text_img = tbox.image()
         tbox.text(self.pretty_title(), self.title_color, title_font,
                   metr.title_lineskip, self.title_shadow)
         text_img = tbox.image()


@@ -224,7 +241,7 @@ class Cover(object):
             img = img.resize((
                     int(round(img.size[0] * self.scale_after)),
                     int(round(img.size[1] * self.scale_after))),
             img = img.resize((
                     int(round(img.size[0] * self.scale_after)),
                     int(round(img.size[1] * self.scale_after))),

-                Image.ANTIALIAS)
+                Image.Resampling.LANCZOS)

         return img
 
     def mime_type(self):
         return img
 
     def mime_type(self):


@@ -255,10 +272,12 @@ class WLCover(Cover):
     author_font_ttf = get_resource('fonts/JunicodeWL-Regular.ttf')
     author_font_size = 20
     author_lineskip = 30
     author_font_ttf = get_resource('fonts/JunicodeWL-Regular.ttf')
     author_font_size = 20
     author_lineskip = 30

+    author_centering = True

     title_font_ttf = get_resource('fonts/DejaVuSerif-Bold.ttf')
     title_font_size = 30
     title_lineskip = 40
     title_box_width = 350
     title_font_ttf = get_resource('fonts/DejaVuSerif-Bold.ttf')
     title_font_size = 30
     title_lineskip = 40
     title_box_width = 350

+    title_centering = True

 
     box_top_margin = 100
     box_bottom_margin = 100
 
     box_top_margin = 100
     box_bottom_margin = 100


@@ -268,6 +287,8 @@ class WLCover(Cover):
     box_line_left = 75
     box_line_right = 275
     box_line_width = 2
     box_line_left = 75
     box_line_right = 275
     box_line_width = 2

+    box_padding_x = 0
+    box_bar_width = 0

 
     logo_top = 15
     logo_width = 140
 
     logo_top = 15
     logo_width = 140


@@ -278,30 +299,34 @@ class WLCover(Cover):
     background_color = '#444'
     author_color = '#444'
     background_img = get_resource('res/cover.png')
     background_color = '#444'
     author_color = '#444'
     background_img = get_resource('res/cover.png')

+    background_top = False

     format = 'JPEG'
 
     epoch_colors = {
     format = 'JPEG'
 
     epoch_colors = {

-        u'Starożytność': '#9e3610',
-        u'Średniowiecze': '#564c09',
-        u'Renesans': '#8ca629',
-        u'Barok': '#a6820a',
-        u'Oświecenie': '#f2802e',
-        u'Romantyzm': '#db4b16',
-        u'Pozytywizm': '#961060',
-        u'Modernizm': '#7784e0',
-        u'Dwudziestolecie międzywojenne': '#3044cf',
-        u'Współczesność': '#06393d',
+        'Starożytność': '#9e3610',
+        'Średniowiecze': '#564c09',
+        'Renesans': '#8ca629',
+        'Barok': '#a6820a',
+        'Oświecenie': '#f2802e',
+        'Romantyzm': '#db4b16',
+        'Pozytywizm': '#961060',
+        'Modernizm': '#7784e0',
+        'Dwudziestolecie międzywojenne': '#3044cf',
+        'Współczesność': '#06393d',

     }
     }

+    set_title_color = True

 
     kind_box_position = {
 
     kind_box_position = {

-        u'Liryka': 'top',
-        u'Epika': 'bottom',
+        'Liryka': 'top',
+        '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):
+                 bleed=0, cover_logo=None):

         super(WLCover, self).__init__(book_info, format=format, width=width,
                                       height=height)
         super(WLCover, self).__init__(book_info, format=format, width=width,
                                       height=height)

+
+        self.slug = book_info.url.slug

         # Set box position.
         self.box_position = book_info.cover_box_position or \
             self.kind_box_position.get(book_info.kind, self.box_position)
         # Set box position.
         self.box_position = book_info.cover_box_position or \
             self.kind_box_position.get(book_info.kind, self.box_position)


@@ -310,10 +335,10 @@ class WLCover(Cover):
             self.bar_width = 0
         else:
             self.bar_color = book_info.cover_bar_color or \
             self.bar_width = 0
         else:
             self.bar_color = book_info.cover_bar_color or \

-                self.epoch_colors.get(book_info.epoch, self.bar_color)
+                self.get_variable_color(book_info) or self.bar_color

         # Set title color.
         # Set title color.

-        self.title_color = self.epoch_colors.get(book_info.epoch,
-                                                 self.title_color)
+        if self.set_title_color:
+            self.title_color = self.get_variable_color(book_info) or self.title_color

 
         self.bleed = bleed
         self.box_top_margin += bleed
 
         self.bleed = bleed
         self.box_top_margin += bleed


@@ -323,10 +348,23 @@ class WLCover(Cover):
         if book_info.cover_url:
             url = book_info.cover_url
             bg_src = None
         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 = BytesIO(bg_src.read())
-            bg_src.close()
+            while True:
+                try:
+                    if bg_src is None:
+                        import requests
+                        bg_src = requests.get(url, timeout=5)
+                    self.background_img = BytesIO(bg_src.content)
+                    bg_src.close()
+                except Exception as e:
+                    bg_src = None
+                    print(e)
+                    import time
+                    time.sleep(1)
+                else:
+                    break
+
+    def get_variable_color(self, book_info):
+        return self.epoch_colors.get(book_info.epoch, None)

 
     def pretty_authors(self):
         return [a.upper() for a in self.authors]
 
     def pretty_authors(self):
         return [a.upper() for a in self.authors]


@@ -338,14 +376,20 @@ class WLCover(Cover):
         metr = Metric(self, self.scale)
 
         # Write author name.
         metr = Metric(self, self.scale)
 
         # Write author name.

-        box = TextBox(metr.title_box_width, metr.height,
-                      padding_y=metr.box_padding_y)
+        box = TextBox(metr.title_box_width - 2 * self.bleed, metr.height,
+                      padding_y=metr.box_padding_y,
+                      padding_x=metr.box_padding_x,
+                      bar_width=metr.box_bar_width,
+                      bar_color=self.bar_color,
+                      )

         author_font = ImageFont.truetype(
             self.author_font_ttf, metr.author_font_size,
         author_font = ImageFont.truetype(
             self.author_font_ttf, metr.author_font_size,

-            layout_engine=ImageFont.LAYOUT_BASIC)
+            layout_engine=ImageFont.Layout.BASIC)

         for pa in self.pretty_authors():
             box.text(pa, font=author_font, line_height=metr.author_lineskip,
         for pa in self.pretty_authors():
             box.text(pa, font=author_font, line_height=metr.author_lineskip,

-                     color=self.author_color, shadow_color=self.author_shadow)
+                     color=self.author_color, shadow_color=self.author_shadow,
+                     centering=self.author_centering
+                     )

 
         box.skip(metr.box_above_line)
         box.draw.line(
 
         box.skip(metr.box_above_line)
         box.draw.line(


@@ -357,12 +401,14 @@ class WLCover(Cover):
         # Write title.
         title_font = ImageFont.truetype(
             self.title_font_ttf, metr.title_font_size,
         # Write title.
         title_font = ImageFont.truetype(
             self.title_font_ttf, metr.title_font_size,

-            layout_engine=ImageFont.LAYOUT_BASIC)
+            layout_engine=ImageFont.Layout.BASIC)

         box.text(self.pretty_title(),
                  line_height=metr.title_lineskip,
                  font=title_font,
                  color=self.title_color,
         box.text(self.pretty_title(),
                  line_height=metr.title_lineskip,
                  font=title_font,
                  color=self.title_color,

-                 shadow_color=self.title_shadow)
+                 shadow_color=self.title_shadow,
+                 centering=self.title_centering
+                 )

 
         box_img = box.image()
 
 
         box_img = box.image()
 


@@ -375,11 +421,12 @@ class WLCover(Cover):
             box_top = (metr.height - box_img.size[1]) // 2
 
         box_left = metr.bar_width + (
             box_top = (metr.height - box_img.size[1]) // 2
 
         box_left = metr.bar_width + (

-            metr.width - metr.bar_width - box_img.size[0]
+            metr.width - metr.bar_width - box_img.size[0] - self.bleed

         ) // 2
 
         # Draw the white box.
         ) // 2
 
         # Draw the white box.

-        ImageDraw.Draw(img).rectangle(
+        img_draw = ImageDraw.Draw(img)
+        img_draw.rectangle(

             (
                 box_left,
                 box_top,
             (
                 box_left,
                 box_top,


@@ -390,6 +437,16 @@ class WLCover(Cover):
         )
         # Paste the contents into the white box.
         img.paste(box_img, (box_left, box_top), box_img)
         )
         # Paste the contents into the white box.
         img.paste(box_img, (box_left, box_top), box_img)

+        if self.box_bar_width:
+            img_draw.rectangle(
+                (
+                    box_left,
+                    box_top,
+                    box_left + metr.box_bar_width,
+                    box_top + box_img.size[1]
+                ),
+                fill=self.bar_color
+            )

         return img
 
     def add_cut_lines(self, img):
         return img
 
     def add_cut_lines(self, img):


@@ -444,8 +501,11 @@ class WLCover(Cover):
                     trg_size[0],
                     int(round(src.size[1] * trg_size[0] / src.size[0]))
                 )
                     trg_size[0],
                     int(round(src.size[1] * trg_size[0] / src.size[0]))
                 )

-                cut = (resized[1] - trg_size[1]) // 2
-                src = src.resize(resized, Image.ANTIALIAS)
+                if self.background_top:
+                    cut = 0
+                else:
+                    cut = (resized[1] - trg_size[1]) // 2
+                src = src.resize(resized, Image.Resampling.LANCZOS)

                 src = src.crop((0, cut, src.size[0], src.size[1] - cut))
             else:
                 resized = (
                 src = src.crop((0, cut, src.size[0], src.size[1] - cut))
             else:
                 resized = (


@@ -453,7 +513,7 @@ class WLCover(Cover):
                     trg_size[1],
                 )
                 cut = (resized[0] - trg_size[0]) // 2
                     trg_size[1],
                 )
                 cut = (resized[0] - trg_size[0]) // 2

-                src = src.resize(resized, Image.ANTIALIAS)
+                src = src.resize(resized, Image.Resampling.LANCZOS)

                 src = src.crop((cut, 0, src.size[0] - cut, src.size[1]))
 
             img.paste(src, (metr.bar_width, 0))
                 src = src.crop((cut, 0, src.size[0] - cut, src.size[1]))
 
             img.paste(src, (metr.bar_width, 0))


@@ -473,8 +533,9 @@ class WLNoBoxCover(WLCover):
 
 class LogoWLCover(WLCover):
     gradient_height = 90
 
 class LogoWLCover(WLCover):
     gradient_height = 90

-    gradient_logo_height = 60
-    gradient_logo_max_width = 1000
+    gradient_easing = 90
+    gradient_logo_height = 57
+    gradient_logo_max_width = 200

     gradient_logo_margin_right = 30
     gradient_logo_spacing = 40
     gradient_color = '#000'
     gradient_logo_margin_right = 30
     gradient_logo_spacing = 40
     gradient_color = '#000'


@@ -486,7 +547,13 @@ class LogoWLCover(WLCover):
     annotation = None
     annotation_height = 10
 
     annotation = None
     annotation_height = 10
 

-    def __init__(self, book_info, *args, **kwargs):
+    logos_right = True
+    gradient_logo_centering = False
+
+    qrcode = None
+
+
+    def __init__(self, book_info, *args, cover_logo=None, **kwargs):

         super(LogoWLCover, self).__init__(book_info, *args, **kwargs)
         self.gradient_height += self.bleed
         self.gradient_logo_margin_right += self.bleed
         super(LogoWLCover, self).__init__(book_info, *args, **kwargs)
         self.gradient_height += self.bleed
         self.gradient_logo_margin_right += self.bleed


@@ -495,10 +562,17 @@ class LogoWLCover(WLCover):
             BytesIO(URLOpener().open(cover_logo_url).read())
             for cover_logo_url in book_info.cover_logo_urls
         ]
             BytesIO(URLOpener().open(cover_logo_url).read())
             for cover_logo_url in book_info.cover_logo_urls
         ]

+        self.end_cover_logos = []
+        if cover_logo:
+            self.additional_cover_logos.append(
+                    open(cover_logo, 'rb')
+                    )

 
 

-    def image(self):
-        img = super(LogoWLCover, self).image()
-        metr = Metric(self, self.scale)
+    @property
+    def has_gradient_logos(self):
+        return self.gradient_logos or self.additional_cover_logos or self.end_cover_logos or self.annotation or self.qrcode is not None
+
+    def add_gradient_logos(self, img, metr):

         gradient = Image.new(
             'RGBA',
             (metr.width - metr.bar_width, metr.gradient_height),
         gradient = Image.new(
             'RGBA',
             (metr.width - metr.bar_width, metr.gradient_height),


@@ -509,39 +583,57 @@ class LogoWLCover(WLCover):
             (metr.width - metr.bar_width, metr.gradient_height)
         )
         draw = ImageDraw.Draw(gradient_mask)
             (metr.width - metr.bar_width, metr.gradient_height)
         )
         draw = ImageDraw.Draw(gradient_mask)

-        for line in range(0, metr.gradient_height):
+        for line in range(0, metr.gradient_easing):

             draw.line(
                 (0, line, metr.width - metr.bar_width, line),
                 fill=int(
             draw.line(
                 (0, line, metr.width - metr.bar_width, line),
                 fill=int(

-                    255 * self.gradient_opacity * line / metr.gradient_height
+                    255 * self.gradient_opacity * line / metr.gradient_easing

                 )
             )
                 )
             )

+        draw.rectangle((
+            0, metr.gradient_easing,
+            metr.width - metr.bar_width, metr.gradient_height
+        ), fill=int(255 * self.gradient_opacity))
+            
+            

         img.paste(gradient,
                   (metr.bar_width, metr.height - metr.gradient_height),
                   mask=gradient_mask)
 
         img.paste(gradient,
                   (metr.bar_width, metr.height - metr.gradient_height),
                   mask=gradient_mask)
 

-        cursor = metr.width - metr.gradient_logo_margin_right
+        if self.logos_right:
+            cursor = metr.width - metr.gradient_logo_margin_right
+        else:
+            cursor = metr.gradient_logo_margin_right

         logo_top = int(
             metr.height
             - metr.gradient_height / 2
         logo_top = int(
             metr.height
             - metr.gradient_height / 2

-            - metr.gradient_logo_height / 2 - metr.bleed / 2
+            - metr.gradient_logo_height / 2 - metr.bleed

         )
 
         logos = [
             get_resource(logo_path)
         )
 
         logos = [
             get_resource(logo_path)

-            for logo_path in self.gradient_logos[::-1]
+            for logo_path in self.gradient_logos

         ]
         ]

-        logos = logos + self.additional_cover_logos
+
+        logos = self.additional_cover_logos + logos + self.end_cover_logos
+

         logos = [
             Image.open(logo_bytes).convert('RGBA')
             for logo_bytes in logos
         ]
 
         logos = [
             Image.open(logo_bytes).convert('RGBA')
             for logo_bytes in logos
         ]
 

+        if self.qrcode is not None:
+            import qrcode
+            logos.append(qrcode.make(f'https://wolnelektury.pl/katalog/lektura/{self.slug}/?{self.qrcode}'))
+
+        if self.logos_right:
+            logos.reverse()
+

         # See if logos fit into the gradient. If not, scale down accordingly.
         space_for_logos = (
             metr.width
             - metr.bar_width
         # 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
+            - 2 * metr.gradient_logo_margin_right + self.bleed

         )
         widths = [
             min(
         )
         widths = [
             min(


@@ -549,42 +641,57 @@ class LogoWLCover(WLCover):
                 logo.size[0] * metr.gradient_logo_height / logo.size[1]
             )
             for logo in logos]
                 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)
-        )
+        taken_space = sum(widths) + (len(logos) - 1) * metr.gradient_logo_spacing
+        if taken_space > space_for_logos:
+            logo_scale = space_for_logos / taken_space
+        else:
+            logo_scale = 1
+            if self.gradient_logo_centering:
+                cursor += int((space_for_logos - taken_space) / 2)

         logo_scale = (
             space_for_logos / taken_space
             if taken_space > space_for_logos else 1
         )
         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)
+        #logo_top += int(metr.gradient_logo_height * (1 - logo_scale) / 2)

 
         for i, logo in enumerate(logos):
 
         for i, logo in enumerate(logos):

+            if i == -1:
+                L_scale = 1
+            else:
+                L_scale = logo_scale
+            L_top = logo_top + int(metr.gradient_logo_height * (1 - L_scale) / 2)
+

             logo = logo.resize(
                 (
             logo = logo.resize(
                 (

-                    int(round(widths[i] * logo_scale)),
+                    int(round(widths[i] * L_scale)),

                     int(round(
                     int(round(

-                        logo.size[1] * widths[i] / logo.size[0] * logo_scale
+                        logo.size[1] * widths[i] / logo.size[0] * L_scale

                     ))
                 ),
                     ))
                 ),

-                Image.ANTIALIAS)
-            cursor -= logo.size[0]
+                Image.Resampling.LANCZOS)
+            if self.logos_right:
+                cursor -= logo.size[0]
+

             img.paste(
                 logo,
                 (
                     cursor,
             img.paste(
                 logo,
                 (
                     cursor,

-                    int(round(logo_top + (metr.gradient_logo_height - logo.size[1]) * logo_scale / 2))
+                    L_top
+                    #int(round(logo_top + (metr.gradient_logo_height - logo.size[1]) * L_scale / 2))

                 ),
                 mask=logo
             )
                 ),
                 mask=logo
             )

-            cursor -= int(round(metr.gradient_logo_spacing * logo_scale))
+            if self.logos_right:
+                cursor -= int(round(metr.gradient_logo_spacing * logo_scale))
+            else:
+                cursor += int(round(metr.gradient_logo_spacing * logo_scale)) + logo.size[0]

 
         if self.annotation:
             img2 = Image.new('RGBA', (metr.height, metr.height), color=None)
             draw = ImageDraw.Draw(img2)
             author_font = ImageFont.truetype(
                 self.author_font_ttf, metr.annotation_height,
 
         if self.annotation:
             img2 = Image.new('RGBA', (metr.height, metr.height), color=None)
             draw = ImageDraw.Draw(img2)
             author_font = ImageFont.truetype(
                 self.author_font_ttf, metr.annotation_height,

-                layout_engine=ImageFont.LAYOUT_BASIC)
+                layout_engine=ImageFont.Layout.BASIC)

             draw.text((self.annotation_height, self.annotation_height), self.annotation, font=author_font, fill='#FFFFFF')
             img2.show()
             img2 = img2.rotate(90)
             draw.text((self.annotation_height, self.annotation_height), self.annotation, font=author_font, fill='#FFFFFF')
             img2.show()
             img2 = img2.rotate(90)


@@ -594,6 +701,141 @@ class LogoWLCover(WLCover):
             img = img.convert('RGB')
 
         return img
             img = img.convert('RGB')
 
         return img

+    
+    def image(self):
+        img = super(LogoWLCover, self).image()
+        metr = Metric(self, self.scale)
+        if self.has_gradient_logos:
+            img = self.add_gradient_logos(img, metr)
+        return img
+
+
+class LegimiCover(LogoWLCover):
+    width = 210
+    height = 297
+    bar_width = 0
+    # Other bar
+
+    author_font_ttf = get_resource('fonts/Lora-Regular.ttf')
+    author_font_size = 15
+    author_lineskip = 19.5
+    author_centering = False
+    title_font_ttf = get_resource('fonts/Lora-Bold.ttf')
+    title_font_size = 15
+    title_lineskip = 19.5
+    title_centering = False
+    
+    title_box_width = 210
+
+    box_bottom_margin = 20
+    box_padding_x = 20
+    box_padding_y = 10   # do baseline
+    box_above_line = 6
+    box_below_line = 0
+    box_line_left = 0
+    box_line_right = 0
+
+    box_line_width = 0
+
+    box_bar_width = 20
+
+    #logo_top = 15
+    #logo_width = 140
+
+    bar_color = '#000'
+    box_position = 'bottom'
+    background_color = '#444'
+    author_color = '#000'
+    title_color = '#000'
+    set_title_color = False
+
+    kind_box_position = {}
+
+    box_bottom_margin_logos_add = 10
+    gradient_height = 30
+    gradient_easing = 0
+    gradient_logo_height = 20
+    gradient_logo_max_width = 200
+    gradient_logo_margin_right = 10
+    gradient_logo_spacing = 20
+    gradient_color = '#000'
+    gradient_opacity = .5
+    gradient_logos = [
+        'res/wl-logo-white.png',
+    ]
+    logos_right = False
+    gradient_logo_centering = True
+    background_top = True
+
+    genre_colors = {
+        'Artykuł': '#bf001a',
+        'Artykuł naukowy': '#bf001a',
+        'Dziennik': '#bf001a',
+        'Esej': '#bf001a',
+        'Felieton': '#bf001a',
+        'Kronika': '#bf001a',
+        'List': '#bf001a',
+        'Manifest': '#bf001a',
+        'Odczyt': '#bf001a',
+        'Pamiętnik': '#bf001a',
+        'Poradnik': '#bf001a',
+        'Praca naukowa': '#bf001a',
+        'Publicystyka': '#bf001a',
+        'Reportaż': '#bf001a',
+        'Reportaż podróżniczy': '#bf001a',
+        'Rozprawa': '#bf001a',
+        'Rozprawa polityczna': '#bf001a',
+        'Traktat': '#bf001a',
+    }
+    kind_colors = {
+        'Epika': '#9bbb2b',
+        'Liryka': '#3e626f',
+        'Dramat': '#ecbe00',
+    }
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.has_gradient_logos:
+            self.box_bottom_margin += self.box_bottom_margin_logos_add
+
+    def pretty_authors(self):
+        return self.authors
+
+    def get_variable_color(self, book_info):
+        for genre in book_info.genres:
+            if genre in self.genre_colors:
+                return self.genre_colors[genre]
+        for kind in book_info.kinds:
+            if kind in self.kind_colors:
+                return self.kind_colors[kind]
+
+class LegimiCornerCover(LegimiCover):
+    gradient_logos = []
+    corner_width = 120
+    corner_image = get_resource('res/book-band.png')
+    
+    def image(self):
+        image = super().image()
+        metr = Metric(self, self.scale)
+
+        if self.corner_image:
+            corner = Image.open(self.corner_image).convert('RGBA')
+            corner = corner.resize(
+                (
+                    int(round(metr.corner_width)),
+                    int(round(corner.size[1] / corner.size[0] * metr.corner_width))
+                )
+            )
+            image.paste(corner, (
+                metr.width - int(round(metr.corner_width)),
+                0,
+            ), corner)
+        return image
+
+class LegimiAudiobookCover(LegimiCornerCover):
+    corner_width = 82.5
+    corner_image = get_resource('res/audiobook-sticker.png')
+    height = 210

 
 
 class EbookpointCover(LogoWLCover):
 
 
 class EbookpointCover(LogoWLCover):


@@ -639,7 +881,7 @@ class PrestigioCover(Cover):
     title_font_size = 50
 
     def pretty_title(self):
     title_font_size = 50
 
     def pretty_title(self):

-        return u"„%s”" % self.title
+        return "„%s”" % self.title

 
 
 class BookotekaCover(Cover):
 
 
 class BookotekaCover(Cover):


@@ -690,7 +932,7 @@ class KMLUCover(LogoWLCover):
 
 
 class MPWCover(LogoWLCover):
 
 
 class MPWCover(LogoWLCover):

-    gradient_logo_height = 58
+    gradient_logo_height = 57

     gradient_logo_spacing = 25
     gradient_logos = [
         'res/mpw-logo-white.png',
     gradient_logo_spacing = 25
     gradient_logos = [
         'res/mpw-logo-white.png',


@@ -719,19 +961,60 @@ class BNCover(LogoWLCover):
 #    annotation = 'Zadanie „Udostępnienie publikacji w formatach cyfrowych” w ramach Narodowego Programu Rozwoju Czytelnictwa. Dofinansowano ze środków Ministra Kultury, Dziedzictwa Narodowego i Sportu.'
 
 
 #    annotation = 'Zadanie „Udostępnienie publikacji w formatach cyfrowych” w ramach Narodowego Programu Rozwoju Czytelnictwa. Dofinansowano ze środków Ministra Kultury, Dziedzictwa Narodowego i Sportu.'
 
 

+class FactoryCover(LogoWLCover):
+    gradient_logos = [
+        'res/factory.jpg',
+        'res/wl-logo-white.png',
+    ]
+    qrcode = 'pk_campaign=factory22'
+    format = 'PNG'
+
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault('bleed', 10)
+        return super().__init__(*args, **kwargs)
+
+    def ext(self):
+        return 'pdf'
+
+    def output_file(self, *args, **kwargs):
+        imgfile = super().output_file(*args, **kwargs)
+        import subprocess
+        import tempfile
+        with tempfile.TemporaryDirectory(prefix='factory-', dir='.') as d:
+            import os
+            import shutil
+            with open(d + '/cover.png', 'wb') as f:
+                f.write(imgfile.get_bytes())
+            shutil.copy(get_resource('res/factory-cover.svg'), d)
+            subprocess.call(['inkscape', f'--export-filename={d}/cover.pdf', d + '/factory-cover.svg'])
+            with open(d + '/cover.pdf', 'rb') as f:
+                return OutputFile.from_bytes(f.read())
+
+
+
+from librarian.covers.marquise import MarquiseCover, LabelMarquiseCover
+

 COVER_CLASSES = {
 COVER_CLASSES = {

-    'default': LogoWLCover,
+    'legacy': LogoWLCover,

     'kmlu': KMLUCover,
     'mpw': MPWCover,
     'atrium': AtriumCover,
     'bn': BNCover,
     'kmlu': KMLUCover,
     'mpw': MPWCover,
     'atrium': AtriumCover,
     'bn': BNCover,

+    'legimi': LegimiCover,
+    'legimi-corner': LegimiCornerCover,
+    'legimi-audiobook': LegimiAudiobookCover,
+    'factory': FactoryCover,
+    'm': MarquiseCover,
+    'm-label': LabelMarquiseCover,
+    'default': MarquiseCover,

 }
 
 
 def make_cover(book_info, *args, **kwargs):
 }
 
 
 def make_cover(book_info, *args, **kwargs):

+    cover_class_name = None

     if 'cover_class' in kwargs:
         cover_class_name = kwargs.pop('cover_class')
     if 'cover_class' in kwargs:
         cover_class_name = kwargs.pop('cover_class')

-    else:
-        cover_class_name = book_info.cover_class
+    if not cover_class_name:
+        cover_class_name = 'default'

     cover_class = COVER_CLASSES[cover_class_name]
     return cover_class(book_info, *args, **kwargs)
     cover_class = COVER_CLASSES[cover_class_name]
     return cover_class(book_info, *args, **kwargs)