Fixes rotated image

[librarian.git] / src / librarian / covers / widgets / background.py

diff --git a/src/librarian/covers/widgets/background.py b/src/librarian/covers/widgets/background.py
index 7836b5c..1f5bf0f 100644 (file)
--- a/src/librarian/covers/widgets/background.py
+++ b/src/librarian/covers/widgets/background.py
@@ -1,13 +1,21 @@
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
+#

 import io
 import time
 from urllib.request import urlopen
 import PIL.Image
 import io
 import time
 from urllib.request import urlopen
 import PIL.Image

+from PIL import ImageOps

 from .base import Widget
 
 
 class Background(Widget):
     transparency = False
 
 from .base import Widget
 
 
 class Background(Widget):
     transparency = False
 

+    def __init__(self, cover, crop_to_square=True):
+        self.crop_to_square = crop_to_square
+        super().__init__(cover)
+

     def setup(self):
         self.img = None
         if self.cover.book_info.cover_url:
     def setup(self):
         self.img = None
         if self.cover.book_info.cover_url:


@@ -20,26 +28,34 @@ class Background(Widget):
                     break
                 
             img = PIL.Image.open(data)
                     break
                 
             img = PIL.Image.open(data)

+            img = ImageOps.exif_transpose(img)

 
 

-            # crop top square.
-            if img.size[1] > img.size[0]:
-                img = img.crop((0, 0, img.size[0], img.size[0]))
-            else:
-                left = round((img.size[0] - img.size[1])/2)
-                img = img.crop((
-                    left,
-                    0,
-                    left + img.size[1],
-                    img.size[1]
-                ))
+            if self.crop_to_square:
+                # crop top square.
+                if img.size[1] > img.size[0]:
+                    img = img.crop((0, 0, img.size[0], img.size[0]))
+                else:
+                    left = round((img.size[0] - img.size[1])/2)
+                    img = img.crop((
+                        left,
+                        0,
+                        left + img.size[1],
+                        img.size[1]
+                    ))

             self.img = img
 
     def build(self, w, h):
         if not self.img:
             return
             self.img = img
 
     def build(self, w, h):
         if not self.img:
             return

-        kwadrat = round(max(w, h))

         img = self.img
         img = self.img

-        img = self.img.resize((kwadrat, kwadrat))
+        scale = max(
+            w / img.size[0],
+            h / img.size[1]
+        )
+        img = self.img.resize((
+            round(scale * img.size[0]),
+            round(scale * img.size[1]),
+        ))

         img = img.crop((
             int((img.size[0] - w) / 2),
             0,
         img = img.crop((
             int((img.size[0] - w) / 2),
             0,