blurry-cli 0.7.1__tar.gz → 0.8.0__tar.gz

{blurry_cli-0.7.1 → blurry_cli-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blurry-cli
-Version: 0.7.1
+Version: 0.8.0
 Summary: A Mistune-based static site generator for Python
 Home-page: https://github.com/blurry-dev/blurry
 License: MIT
@@ -26,6 +26,7 @@ Requires-Dist: Wand (>=0.6.6,<0.7.0)
 Requires-Dist: dpath (>=2.1.6,<3.0.0)
 Requires-Dist: ffmpeg-python (>=0.2.0,<0.3.0)
 Requires-Dist: htmlmin2 (>=0.1.13,<0.2.0)
+Requires-Dist: jinja2-simple-tags (>=0.6.1,<0.7.0)
 Requires-Dist: livereload (>=2.6.3,<3.0.0)
 Requires-Dist: mistune (>=3.0.0rc5,<4.0.0)
 Requires-Dist: pydantic2-schemaorg (>=0.1.1,<0.2.0)

{blurry_cli-0.7.1 → blurry_cli-0.8.0}/blurry/__init__.py

@@ -25,6 +25,7 @@ from blurry.images import generate_images_for_srcset
 from blurry.markdown import convert_markdown_file_to_html
 from blurry.open_graph import open_graph_meta_tags
 from blurry.plugins import discovered_html_plugins
+from blurry.plugins import discovered_jinja_extensions
 from blurry.plugins import discovered_jinja_filter_plugins
 from blurry.schema_validation import validate_front_matter_as_schema
 from blurry.settings import get_build_directory
@@ -69,6 +70,9 @@ def get_jinja_env():
                 }
             )
         ),
+        extensions=[
+            jinja_extension.load() for jinja_extension in discovered_jinja_extensions
+        ],
     )
     for filter_plugin in discovered_jinja_filter_plugins:
         try:
@@ -96,7 +100,6 @@ async def process_non_markdown_file(filepath: Path):
     if mimetype in [
         mimetypes.types_map[".jpg"],
         mimetypes.types_map[".png"],
-        mimetypes.common_types[".webp"],
     ]:
         await generate_images_for_srcset(filepath)
 

{blurry_cli-0.7.1 → blurry_cli-0.8.0}/blurry/cli.py

@@ -2,6 +2,7 @@ from rich.console import Console
 from rich.table import Table
 
 from blurry.plugins import discovered_html_plugins
+from blurry.plugins import discovered_jinja_extensions
 from blurry.plugins import discovered_jinja_filter_plugins
 from blurry.plugins import discovered_markdown_plugins
 
@@ -27,7 +28,10 @@ def print_plugin_table():
     plugin_table.add_row(
         "\n".join([p.name for p in discovered_markdown_plugins]),
         "\n".join([p.name for p in discovered_html_plugins]),
-        "\n".join([p.name for p in discovered_jinja_filter_plugins]),
+        "\n".join(
+            [p.name for p in discovered_jinja_filter_plugins]
+            + [p.name for p in discovered_jinja_extensions]
+        ),
     )
 
     console.print(plugin_table)

{blurry_cli-0.7.1 → blurry_cli-0.8.0}/blurry/markdown/__init__.py

@@ -69,15 +69,24 @@ class BlurryRenderer(mistune.HTMLRenderer):
             attributes["src"] = src
 
             if extension.lower() in SETTINGS.get("VIDEO_EXTENSIONS"):
-                return render_video(src, absolute_path, extension, title=text)
+                return render_video(src, absolute_path, extension, title=title)
 
             # Tailor srcset and sizes to image width
             with Image(filename=str(absolute_path)) as img:
                 image_width = img.width
                 image_height = img.height
+                # The .animated property doesn't always detect animated .webp images
+                # and .webp is optimized enough not to benefit much from .avif
+                image_is_animated = img.animation or extension.lower() == "webp"
                 attributes["width"] = image_width
                 attributes["height"] = image_height
 
+            if image_is_animated:
+                attributes_str = " ".join(
+                    f'{name}="{value}"' for name, value in attributes.items()
+                )
+                return f"<img {attributes_str} >"
+
             image_widths = get_widths_for_image_width(image_width)
 
             attributes["sizes"] = generate_sizes_string(image_widths)

{blurry_cli-0.7.1 → blurry_cli-0.8.0}/blurry/open_graph.py

@@ -4,7 +4,7 @@ from typing import Literal
 from blurry.types import SchemaType
 
 
-META_TAG_TEMPLATE = '<meta property="og:{property}" content="{content}" />'
+META_TAG_TEMPLATE = '<meta property="og:{property}" content="{content}">'
 
 OpenGraphType = Literal["article", "book", "profile", "website"]
 

{blurry_cli-0.7.1 → blurry_cli-0.8.0}/blurry/plugins/__init__.py

@@ -3,3 +3,4 @@ from importlib.metadata import entry_points
 discovered_markdown_plugins = entry_points(group="blurry.markdown_plugins")
 discovered_html_plugins = entry_points(group="blurry.html_plugins")
 discovered_jinja_filter_plugins = entry_points(group="blurry.jinja_filter_plugins")
+discovered_jinja_extensions = entry_points(group="blurry.jinja_extensions")

blurry_cli-0.8.0/blurry/plugins/jinja_plugins/blurry_image_extension.py

@@ -0,0 +1,75 @@
+import mimetypes
+from pathlib import Path
+from urllib.parse import urlparse
+
+from jinja2_simple_tags import StandaloneTag
+from rich.console import Console
+from wand.exceptions import BlobError
+from wand.image import Image
+
+from blurry.images import add_image_width_to_path
+from blurry.settings import get_build_directory
+from blurry.utils import build_path_to_url
+
+warning_console = Console(stderr=True, style="bold yellow")
+
+
+class BlurryImage(StandaloneTag):
+    safe_output = True
+    tags = {"blurry_image"}
+
+    def render(self, *args, **kwargs):
+        (image_url, width) = args
+        image_content_path: str = "." + urlparse(image_url).path
+        image_path = get_build_directory() / image_content_path
+
+        try:
+            with Image(filename=str(image_path)) as image:
+                image_width = image.width
+                image_height = image.height
+                image_mimetype = image.mimetype
+        except BlobError:
+            warning_console.print(f"Could not find image: {image_path}")
+            return ""
+
+        attributes = {
+            "width": image_width,
+            "height": image_height,
+        }
+        for attribute_key in kwargs:
+            if attribute_key in ["width", "height"]:
+                warning_console.print(
+                    f"blurry_image: Received {attribute_key} in template {self.template} but this attribute is dynamic. Skipping."
+                )
+                continue
+            attributes[attribute_key] = kwargs.get(attribute_key)
+
+        if width:
+            image_path = add_image_width_to_path(image_path, width)
+
+        if image_mimetype in [
+            mimetypes.types_map[".jpg"],
+            mimetypes.types_map[".png"],
+        ]:
+            image_path = Path(str(image_path).replace(image_path.suffix, ".avif"))
+
+        if not image_path.exists():
+            warning_console.print(
+                f"blurry_image: Could not find {image_path}. Skipping."
+            )
+            return ""
+
+        attributes["src"] = build_path_to_url(image_path)
+
+        if "alt" not in attributes:
+            warning_console.print(
+                f"blurry_image: alt attribute missing for image in {self.template}. "
+                "This can negatively affect accessibility. "
+                "Use an empty alt tag if an image is only for show."
+            )
+
+        attributes_str = " ".join(
+            f'{name}="{value}"' for name, value in attributes.items()
+        )
+
+        return f"<img {attributes_str}/>"

{blurry_cli-0.7.1 → blurry_cli-0.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "blurry-cli"
-version = "0.7.1"
+version = "0.8.0"
 description = "A Mistune-based static site generator for Python"
 authors = ["John Franey <franey@duck.com>"]
 license = "MIT"
@@ -37,6 +37,7 @@ typer = "^0.6.1"
 htmlmin2 = "^0.1.13"
 pydantic2-schemaorg = "^0.1.1"
 dpath = "^2.1.6"
+jinja2-simple-tags = "^0.6.1"
 
 [tool.poetry.scripts]
 blurry = 'blurry:main'
@@ -70,3 +71,6 @@ python_code = 'blurry.plugins.markdown_plugins.python_code_plugin:python_code'
 python_code_in_list = 'blurry.plugins.markdown_plugins.python_code_plugin:python_code_in_list'
 punctuation = 'blurry.plugins.markdown_plugins.punctuation_plugin:punctuation'
 container = 'blurry.plugins.markdown_plugins.container_plugin:container'
+
+[tool.poetry.plugins."blurry.jinja_extensions"]
+blurry_image = "blurry.plugins.jinja_plugins.blurry_image_extension:BlurryImage"