going back to the previous gravatar directive

Author: jpchauvel

blog/members/hellhound.md

@@ -12,9 +12,7 @@ lanaguage: Español
 ```{gravatar} jean.pierre@chauvel.org
 ---
 width: 200
-style: "margin: 0 auto; display: block;"
-with-circle-clip: true
-with-grayscale: true
+style: "margin: 0 auto; display: block; border-radius: 200px;"
 ---
 ```
 

ext/gravatar.py

@@ -1,40 +1,24 @@
 """A directive to generate an image tag with a Gravatar pic.
 """
 
-import os
-import urllib.request
-from hashlib import sha256
-
-from ablog.commands import find_confdir, read_conf
 from docutils import nodes
 from docutils.parsers.rst import Directive
 from jinja2 import BaseLoader, Environment
 from libgravatar import Gravatar
-from PIL import Image, ImageDraw
 from sphinx.application import Sphinx
 from sphinx.util import logging
 
 logger = logging.getLogger(__name__)
 
 GRAVATAR_TEMPLATE = """
 <div class="{{ klass }}">
-    <img src=/{{ url }}
+    <img src={{ url }}
     {% if align %} align="{{ align }}"{% endif %}
     {% if klass %} class="{{ klass }}"{% endif %}
     {% if style %} style="{{ style }}"{% endif %}
     {% if width %} width="{{ width }}" height="{{ width }}"{% endif %}>
 </div>
 """
-FILENAME_EXT = ".png"
-
-
-class GravatarError(Exception):
-    pass
-
-
-def _to_boolean(argument: str) -> str:
-    # Weird behavior, but true~
-    return argument is None
 
 
 class GravatarImage(Directive):
@@ -46,80 +30,27 @@ class GravatarImage(Directive):
         "class": lambda a: a.strip(),
         "style": lambda a: a.strip(),
         "width": lambda a: a.strip(),
-        "with-circle-clip": _to_boolean,
-        "with-grayscale": _to_boolean,
-        "static-subdir": lambda a: a.strip(),
     }
 
-    def _process_image(
-        self, filepath: str, with_circle_clip: bool, with_grayscale: bool
-    ):
-        original_image = Image.open(filepath)
-
-        if with_grayscale:
-            # Convert the original image to grayscale
-            original_image = original_image.convert("L")
-
-        if with_circle_clip:
-            # Create a mask image with a white circle on a black background
-            mask = Image.new("L", original_image.size, 0)
-            draw = ImageDraw.Draw(mask)
-            width, height = original_image.size
-            draw.ellipse((0, 0, width, height), fill=255)
-
-            # Convert the mask to use an alpha channel
-            result = original_image.copy()
-            result.putalpha(mask)
-        else:
-            result = original_image
-        result.save(filepath)
-
     def run(self):
         email = self.content[0]
         align = self.options.get("align")
         klass = self.options.get("class")
         style = self.options.get("style")
         width = self.options.get("width")
-        with_circle_clip = self.options.get("with-circle-clip")
-        with_grayscale = self.options.get("with-grayscale")
-        static_subdir = self.options.get("static-subdir", "images/gravatar")
-        confdir = find_confdir()
-        conf = read_conf(confdir)
-        html_static_path = getattr(conf, "html_static_path", [])
-
-        if len(html_static_path) == 0:
-            raise GravatarError(
-                "html_static_path should have at least one path configured"
-            )
-
-        # We choose the first path as the default path for the image
-        save_path = os.path.join(html_static_path[0], static_subdir)
 
-        # Try to make the dir if it doesn't exist
-        os.makedirs(save_path, exist_ok=True)
-
-        logger.info(f"Gravatar: Getting Gravatar image for email: {email}")
+        logger.info(f"Getting Gravatar image for email: {email}")
         url = Gravatar(email).get_image()
         if width is not None:
             url = f"{url}?s={width}"
-            logger.info(f"Gravatar: Requesting Gravatar image from URL: {url}")
-
-        filename = sha256(url.encode()).digest().hex()
-        filename = f"{filename}{FILENAME_EXT}"
-        save_path = os.path.join(save_path, filename)
-        urllib.request.urlretrieve(url, save_path)
-        logger.info(f"Gravatar: Retrieving image into: {save_path}")
-
-        if with_circle_clip or with_grayscale:
-            self._process_image(save_path, with_circle_clip, with_grayscale)
-            logger.info("Gravatar: Applying image post-processing")
+        logger.info(f"Got image URL: {url}")
 
         template = Environment(
             loader=BaseLoader, trim_blocks=True, lstrip_blocks=True
         ).from_string(GRAVATAR_TEMPLATE)
 
         out = template.render(
-            url=save_path,
+            url=url,
             align=align,
             klass=klass,
             style=style,

poetry.lock

@@ -19,7 +19,6 @@ sphinx-togglebutton = "^0.3.2"
 sphinx-sitemap = "^2.5.1"
 sphinx-tabs = "^3.4.5"
 libgravatar = "^1.0.4"
-pillow = "^10.3.0"
 sphinxext-opengraph = "^0.9.1"
 matplotlib = "^3.8.4"