[Leveler] Fix dep warnings on PIL 9.2 or greater (#177)

Author: aikaterna

leveler/def_imgen_utils.py

@@ -19,6 +19,10 @@
         "Installing-Leveler#my-bot-throws-error-on-load-something-related-to-pillow."
     )
 
+try:
+    from PIL.Image.Resampling import LANCZOS
+except ModuleNotFoundError:
+    from PIL.Image import LANCZOS
 
 try:
     import numpy
@@ -104,7 +108,7 @@ def _humanize_number(self, number):
     # finds the the pixel to center the text
     def _center(self, start, end, text, font):
         dist = end - start
-        width = font.getsize(text)[0]
+        width = self._get_character_pixel_width(font, text)
         start_pos = start + ((dist - width) / 2)
         return int(start_pos)
 
@@ -150,7 +154,7 @@ def _add_corners(self, im, rad, multiplier=6):
         circle = Image.new("L", (raw_length, raw_length), 0)
         draw = ImageDraw.Draw(circle)
         draw.ellipse((0, 0, raw_length, raw_length), fill=255)
-        circle = circle.resize((rad * 2, rad * 2), Image.ANTIALIAS)
+        circle = circle.resize((rad * 2, rad * 2), LANCZOS)
 
         alpha = Image.new("L", im.size, 255)
         w, h = im.size

leveler/image_generators.py

@@ -23,6 +23,11 @@
         "Installing-Leveler#my-bot-throws-error-on-load-something-related-to-pillow."
     )
 
+try:
+    from PIL.Image.Resampling import LANCZOS
+except ModuleNotFoundError:
+    from PIL.Image import LANCZOS
+
 
 log = getLogger("red.fixator10-cogs.leveler")
 
@@ -76,10 +81,10 @@ def _write_unicode(text, init_x, y, font, unicode_font, fill):
                 # if char.isalnum() or char in string.punctuation or char in string.whitespace:
                 if self.char_in_font(char, check_font):
                     draw.text((write_pos, y), "{}".format(char), font=font, fill=fill)
-                    write_pos += font.getsize(char)[0]
+                    write_pos += self._get_character_pixel_width(font, char)
                 else:
                     draw.text((write_pos, y), "{}".format(char), font=unicode_font, fill=fill)
-                    write_pos += unicode_font.getsize(char)[0]
+                    write_pos += self._get_character_pixel_width(unicode_font, char)
             check_font.close()
 
         # set canvas
@@ -96,7 +101,7 @@ def _write_unicode(text, init_x, y, font, unicode_font, fill):
         info_section_process = Image.new("RGBA", (bg_width, height), bg_color)
         # puts in background
         temp = bg_image
-        bg_image = bg_image.resize((width, height), Image.ANTIALIAS)
+        bg_image = bg_image.resize((width, height), LANCZOS)
         temp.close()
         temp = bg_image
         bg_image = bg_image.crop((0, 0, width, height))
@@ -151,9 +156,9 @@ def _write_unicode(text, init_x, y, font, unicode_font, fill):
         draw_lvl_circle.ellipse([0, 0, raw_length, raw_length], fill=(250, 250, 250, 250))
         # put on profile circle background
         temp = lvl_circle
-        lvl_circle = lvl_circle.resize((lvl_circle_dia, lvl_circle_dia), Image.ANTIALIAS)
+        lvl_circle = lvl_circle.resize((lvl_circle_dia, lvl_circle_dia), LANCZOS)
         temp.close()
-        lvl_bar_mask = mask.resize((lvl_circle_dia, lvl_circle_dia), Image.ANTIALIAS)
+        lvl_bar_mask = mask.resize((lvl_circle_dia, lvl_circle_dia), LANCZOS)
         process.paste(lvl_circle, (circle_left, circle_top), lvl_bar_mask)
         lvl_bar_mask.close()
 
@@ -165,13 +170,13 @@ def _write_unicode(text, init_x, y, font, unicode_font, fill):
         # put in profile picture
         output = ImageOps.fit(profile_image, (raw_length, raw_length), centering=(0.5, 0.5))
         temp = output
-        output.resize((profile_size, profile_size), Image.ANTIALIAS)
+        output.resize((profile_size, profile_size), LANCZOS)
         temp.close()
         temp = mask
-        mask = mask.resize((profile_size, profile_size), Image.ANTIALIAS)
+        mask = mask.resize((profile_size, profile_size), LANCZOS)
         temp.close()
         temp = profile_image
-        profile_image = profile_image.resize((profile_size, profile_size), Image.ANTIALIAS)
+        profile_image = profile_image.resize((profile_size, profile_size), LANCZOS)
         temp.close()
         process.paste(profile_image, (circle_left + border, circle_top + border), mask)
 
@@ -310,7 +315,7 @@ def make_levelup_image(
 
         # puts in background
         temp = bg_image
-        bg_image = bg_image.resize((width, height), Image.ANTIALIAS)
+        bg_image = bg_image.resize((width, height), LANCZOS)
         temp.close()
         temp = bg_image
         bg_image = bg_image.crop((0, 0, width, height))
@@ -358,9 +363,9 @@ def make_levelup_image(
         draw_lvl_circle = ImageDraw.Draw(lvl_circle)
         draw_lvl_circle.ellipse([0, 0, raw_length, raw_length], fill=(250, 250, 250, 180))
         temp = lvl_circle
-        lvl_circle = lvl_circle.resize((lvl_circle_dia, lvl_circle_dia), Image.ANTIALIAS)
+        lvl_circle = lvl_circle.resize((lvl_circle_dia, lvl_circle_dia), LANCZOS)
         temp.close()
-        lvl_bar_mask = mask.resize((lvl_circle_dia, lvl_circle_dia), Image.ANTIALIAS)
+        lvl_bar_mask = mask.resize((lvl_circle_dia, lvl_circle_dia), LANCZOS)
         process.paste(lvl_circle, (circle_left, circle_top), lvl_bar_mask)
         lvl_bar_mask.close()
 
@@ -369,13 +374,13 @@ def make_levelup_image(
         # put in profile picture
         output = ImageOps.fit(profile_image, (raw_length, raw_length), centering=(0.5, 0.5))
         temp = output
-        output.resize((profile_size, profile_size), Image.ANTIALIAS)
+        output.resize((profile_size, profile_size), LANCZOS)
         temp.close()
         temp = mask
-        mask = mask.resize((profile_size, profile_size), Image.ANTIALIAS)
+        mask = mask.resize((profile_size, profile_size), LANCZOS)
         temp.close()
         temp = profile_image
-        profile_image = profile_image.resize((profile_size, profile_size), Image.ANTIALIAS)
+        profile_image = profile_image.resize((profile_size, profile_size), LANCZOS)
         temp.close()
         process.paste(profile_image, (circle_left + border, circle_top + border), mask)
 
@@ -449,10 +454,10 @@ def _write_unicode(text, init_x, y, font, unicode_font, fill):
                 # if char.isalnum() or char in string.punctuation or char in string.whitespace:
                 if self.char_in_font(char, check_font):
                     draw.text((write_pos, y), "{}".format(char), font=font, fill=fill)
-                    write_pos += font.getsize(char)[0]
+                    write_pos += self._get_character_pixel_width(font, char)
                 else:
                     draw.text((write_pos, y), "{}".format(char), font=unicode_font, fill=fill)
-                    write_pos += unicode_font.getsize(char)[0]
+                    write_pos += self._get_character_pixel_width(unicode_font, char)
             check_font.close()
 
         # COLORS
@@ -499,7 +504,7 @@ def _write_unicode(text, init_x, y, font, unicode_font, fill):
 
         # puts in background
         temp = bg_image
-        bg_image = bg_image.resize((340, 340), Image.ANTIALIAS)
+        bg_image = bg_image.resize((340, 340), LANCZOS)
         temp.close()
         temp = bg_image
         bg_image = bg_image.crop((0, 0, 340, 305))
@@ -532,9 +537,9 @@ def _write_unicode(text, init_x, y, font, unicode_font, fill):
         )
         # put border
         temp = lvl_circle
-        lvl_circle = lvl_circle.resize((lvl_circle_dia, lvl_circle_dia), Image.ANTIALIAS)
+        lvl_circle = lvl_circle.resize((lvl_circle_dia, lvl_circle_dia), LANCZOS)
         temp.close()
-        lvl_bar_mask = mask.resize((lvl_circle_dia, lvl_circle_dia), Image.ANTIALIAS)
+        lvl_bar_mask = mask.resize((lvl_circle_dia, lvl_circle_dia), LANCZOS)
         process.paste(lvl_circle, (circle_left, circle_top), lvl_bar_mask)
         lvl_bar_mask.close()
 
@@ -543,10 +548,10 @@ def _write_unicode(text, init_x, y, font, unicode_font, fill):
         border = int(total_gap / 2)
         profile_size = lvl_circle_dia - total_gap
         temp = mask
-        mask = mask.resize((profile_size, profile_size), Image.ANTIALIAS)
+        mask = mask.resize((profile_size, profile_size), LANCZOS)
         temp.close()
         temp = profile_image
-        profile_image = profile_image.resize((profile_size, profile_size), Image.ANTIALIAS)
+        profile_image = profile_image.resize((profile_size, profile_size), LANCZOS)
         temp.close()
         process.paste(profile_image, (circle_left + border, circle_top + border), mask)
 
@@ -731,7 +736,7 @@ def _write_unicode(text, init_x, y, font, unicode_font, fill):
                 badge_image = badge_image_original.convert("RGBA")
                 badges_images[num].close()
                 badge_image_original.close()
-                badge_image_resized = badge_image.resize((raw_length, raw_length), Image.ANTIALIAS)
+                badge_image_resized = badge_image.resize((raw_length, raw_length), LANCZOS)
                 badge_image.close()
 
                 # structured like this because if border = 0, still leaves outline.
@@ -740,9 +745,9 @@ def _write_unicode(text, init_x, y, font, unicode_font, fill):
                     # put border on ellipse/circle
                     output = ImageOps.fit(square, (raw_length, raw_length), centering=(0.5, 0.5))
                     temp = output
-                    output = output.resize((size, size), Image.ANTIALIAS)
+                    output = output.resize((size, size), LANCZOS)
                     temp.close()
-                    outer_mask = mask.resize((size, size), Image.ANTIALIAS)
+                    outer_mask = mask.resize((size, size), LANCZOS)
                     process.paste(output, coord, outer_mask)
                     outer_mask.close()
 
@@ -753,9 +758,9 @@ def _write_unicode(text, init_x, y, font, unicode_font, fill):
                         centering=(0.5, 0.5),
                     )
                     temp = output
-                    output = output.resize((size - total_gap, size - total_gap), Image.ANTIALIAS)
+                    output = output.resize((size - total_gap, size - total_gap), LANCZOS)
                     temp.close()
-                    inner_mask = mask.resize((size - total_gap, size - total_gap), Image.ANTIALIAS)
+                    inner_mask = mask.resize((size - total_gap, size - total_gap), LANCZOS)
                     process.paste(
                         output,
                         (coord[0] + border_width, coord[1] + border_width),
@@ -771,9 +776,9 @@ def _write_unicode(text, init_x, y, font, unicode_font, fill):
                         centering=(0.5, 0.5),
                     )
                     temp = output
-                    output = output.resize((size, size), Image.ANTIALIAS)
+                    output = output.resize((size, size), LANCZOS)
                     temp.close()
-                    outer_mask = mask.resize((size, size), Image.ANTIALIAS)
+                    outer_mask = mask.resize((size, size), LANCZOS)
                     process.paste(output, coord, outer_mask)
                     outer_mask.close()
                 badge_image_resized.close()
@@ -808,9 +813,9 @@ def _write_unicode(text, init_x, y, font, unicode_font, fill):
                 # put border on ellipse/circle
                 output = ImageOps.fit(plus_square, (raw_length, raw_length), centering=(0.5, 0.5))
                 temp = output
-                output = output.resize((size, size), Image.ANTIALIAS)
+                output = output.resize((size, size), LANCZOS)
                 temp.close()
-                outer_mask = mask.resize((size, size), Image.ANTIALIAS)
+                outer_mask = mask.resize((size, size), LANCZOS)
                 process.paste(output, coord, outer_mask)
                 outer_mask.close()
                 plus_square.close()

leveler/leveler.py

@@ -29,7 +29,7 @@ class Leveler(
 ):
     """A level up thing with image generation!"""
 
-    __version__ = "3.0.4"
+    __version__ = "3.0.5"
 
     # noinspection PyMissingConstructor
     def __init__(self, bot: Red):

leveler/utils.py

@@ -9,6 +9,16 @@
 
 from .abc import MixinMeta
 
+try:
+    from PIL import ImageFont
+except Exception as e:
+    raise CogLoadError(
+        f"Can't load pillow: {e}\n"
+        "Please follow next steps on wiki: "
+        "https://github.com/fixator10/Fixator10-Cogs/wiki/"
+        "Installing-Leveler#my-bot-throws-error-on-load-something-related-to-pillow."
+    )
+
 
 class Utils(MixinMeta):
     """Utility methods"""
@@ -84,3 +94,12 @@ def _truncate_text(self, text, max_length):
         if len(text) > max_length:
             return text[: max_length - 1] + "…"
         return text
+
+    @staticmethod
+    def _get_character_pixel_width(font: ImageFont.FreeTypeFont, char: str) -> int:
+        """Use getlength over using getsize for character pixel width, if available in PIL."""
+        try:
+            write_pos = int(font.getlength(char))
+        except AttributeError:
+            write_pos = font.getsize(char)[0]
+        return write_pos