Version bump.

[librarian.git] / librarian / cover.py

diff --git a/librarian/cover.py b/librarian/cover.py
index c32751d..0f38ec3 100644 (file)
--- a/librarian/cover.py
+++ b/librarian/cover.py
@@ -141,7 +141,7 @@ class Cover(object):
         }
 
     def __init__(self, book_info, format=None, width=None, height=None):
         }
 
     def __init__(self, book_info, format=None, width=None, height=None):

-        self.author = ", ".join(auth.readable() for auth in book_info.authors)
+        self.authors = [auth.readable() for auth in book_info.authors]

         self.title = book_info.title
         if format is not None:
             self.format = format
         self.title = book_info.title
         if format is not None:
             self.format = format


@@ -153,9 +153,9 @@ class Cover(object):
         elif scale:
             self.scale_after = scale
 
         elif scale:
             self.scale_after = scale
 

-    def pretty_author(self):
-        """Allows for decorating author's name."""
-        return self.author
+    def pretty_authors(self):
+        """Allows for decorating authors' names."""
+        return [self.authors]

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


@@ -184,7 +184,8 @@ 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)

-        tbox.text(self.pretty_author(), 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)

         text_img = tbox.image()
         img.paste(text_img, (metr.author_margin_left, top), text_img)
 
         text_img = tbox.image()
         img.paste(text_img, (metr.author_margin_left, top), text_img)
 


@@ -308,8 +309,8 @@ class WLCover(Cover):
             self.background_img = BytesIO(bg_src.read())
             bg_src.close()
 
             self.background_img = BytesIO(bg_src.read())
             bg_src.close()
 

-    def pretty_author(self):
-        return self.author.upper()
+    def pretty_authors(self):
+        return [a.upper() for a in self.authors]

 
     def add_box(self, img):
         if self.box_position == 'none':
 
     def add_box(self, img):
         if self.box_position == 'none':


@@ -321,7 +322,8 @@ class WLCover(Cover):
         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)
         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)

-        box.text(self.pretty_author(),
+        for pa in self.pretty_authors():
+            box.text(pa,

                  font=author_font,
                  line_height=metr.author_lineskip,
                  color=self.author_color,
                  font=author_font,
                  line_height=metr.author_lineskip,
                  color=self.author_color,


@@ -432,11 +434,16 @@ class LogoWLCover(WLCover):
         'res/fnp-logo-white.png',
     ]
 
         '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.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)
     def image(self):
         img = super(LogoWLCover, self).image()
         metr = Metric(self, self.scale)


@@ -451,14 +458,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)
 
         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(
             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)
                 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
 
 
         return img