blurry-cli 0.16.0__tar.gz → 0.17.0__tar.gz

{blurry_cli-0.16.0 → blurry_cli-0.17.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: blurry-cli
-Version: 0.16.0
+Version: 0.17.0
 Summary: A Mistune-based static site generator for Python
 License: MIT
 Keywords: static-site-generator,seo,pagespeed

{blurry_cli-0.16.0 → blurry_cli-0.17.0}/blurry/__init__.py

@@ -16,7 +16,7 @@ from rich.progress import TaskProgressColumn
 from rich.progress import TextColumn
 
 from blurry.async_typer import AsyncTyper
-from blurry.cli import print_blurry_name
+from blurry.cli import check_avif_support, print_blurry_name
 from blurry.cli import print_plugin_table
 from blurry.commands.clean import clean_build_directory
 from blurry.commands.init import initialize_new_project
@@ -66,6 +66,7 @@ async def build(release=True, clean: bool = False):
         update_settings()
         print_blurry_name()
         print_plugin_table()
+        check_avif_support(console=warning_console)
 
     build_directory = get_build_directory()
 
@@ -164,6 +165,7 @@ def runserver():
     """Starts HTTP server with live reloading."""
     print_blurry_name()
     print_plugin_table()
+    check_avif_support(console=warning_console)
 
     SETTINGS = get_settings()
     os.environ.setdefault(f"{ENV_VAR_PREFIX}BUILD_MODE", "dev")

{blurry_cli-0.16.0 → blurry_cli-0.17.0}/blurry/cli.py

@@ -1,5 +1,6 @@
 from rich.console import Console
 from rich.table import Table
+import wand.version
 
 from blurry.plugins import discovered_html_plugins
 from blurry.plugins import discovered_jinja_extensions
@@ -35,3 +36,11 @@ def print_plugin_table():
     )
 
     console.print(plugin_table)
+
+
+def check_avif_support(console: Console):
+    if "AVIFABC" in wand.version.formats():
+        return
+    console.print(
+        "AVIF support not found. Falling back to WEBP. See https://trac.ffmpeg.org/wiki/Encode/AV1"
+    )

{blurry_cli-0.16.0 → blurry_cli-0.17.0}/blurry/images.py

@@ -3,11 +3,14 @@ from concurrent.futures import Future
 from pathlib import Path
 
 from wand.image import Image
+import wand.version
 
 from blurry.settings import get_build_directory
 from blurry.settings import get_content_directory
 from blurry.settings import get_settings
 
+has_avif_support = "AVIF" in wand.version.formats()
+
 
 def get_target_image_widths():
     SETTINGS = get_settings()
@@ -30,17 +33,20 @@ def add_image_width_to_path(image_path: Path, width: int) -> Path:
     return Path(new_filename)
 
 
-def convert_image_to_avif(image_path: Path, target_path: Path | None = None):
+def convert_image_to_avif_or_webp(image_path: Path, target_path: Path | None = None):
     SETTINGS = get_settings()
-    AVIF_COMPRESSION_QUALITY = SETTINGS["AVIF_COMPRESSION_QUALITY"]
+    IMAGE_COMPRESSION_QUALITY = SETTINGS["IMAGE_COMPRESSION_QUALITY"]
     image_suffix = image_path.suffix
-    avif_filepath = str(target_path or image_path).replace(image_suffix, ".avif")
-    if Path(avif_filepath).exists():
+    new_image_format = "avif" if has_avif_support else "webp"
+    new_filepath = str(target_path or image_path).replace(
+        image_suffix, f".{new_image_format}"
+    )
+    if Path(new_filepath).exists():
         return
     with Image(filename=str(image_path)) as image:
-        image.format = "avif"
-        image.compression_quality = AVIF_COMPRESSION_QUALITY
-        image.save(filename=avif_filepath)
+        image.format = new_image_format
+        image.compression_quality = IMAGE_COMPRESSION_QUALITY
+        image.save(filename=new_filepath)
 
 
 def clone_and_resize_image(
@@ -61,12 +67,12 @@ async def generate_images_for_srcset(image_path: Path):
     build_path = BUILD_DIR / image_path.resolve().relative_to(CONTENT_DIR)
     with concurrent.futures.ThreadPoolExecutor() as executor:
         # Convert original image
-        full_sized_avif_future = executor.submit(
-            convert_image_to_avif, image_path=image_path, target_path=build_path
+        full_sized_image_future = executor.submit(
+            convert_image_to_avif_or_webp, image_path=image_path, target_path=build_path
         )
-        image_futures.append(full_sized_avif_future)
+        image_futures.append(full_sized_image_future)
 
-        # Store resized image futures so AVIF versions can be created once they're done
+        # Store resized image futures so AVIF/WEBP versions can be created once they're done
         resize_future_to_filepath: dict[Future, Path] = {}
 
         width = Image(filename=str(image_path)).width
@@ -82,13 +88,13 @@ async def generate_images_for_srcset(image_path: Path):
                 new_filepath_in_build
             )
 
-        # Create AVIF versions of resized images as they're ready
+        # Create AVIF/WEBP versions of resized images as they're ready
         for future in concurrent.futures.as_completed(resize_future_to_filepath):
             resized_image_filepath = resize_future_to_filepath[future]
-            resized_avif_future = executor.submit(
-                convert_image_to_avif, resized_image_filepath
+            resized_image_future = executor.submit(
+                convert_image_to_avif_or_webp, resized_image_filepath
             )
-            image_futures.append(resized_avif_future)
+            image_futures.append(resized_image_future)
 
         concurrent.futures.wait(image_futures + list(resize_future_to_filepath.keys()))
 

{blurry_cli-0.16.0 → blurry_cli-0.17.0}/blurry/settings.py

@@ -8,7 +8,7 @@ from blurry.constants import SETTINGS_FILENAME
 
 
 class Settings(TypedDict):
-    AVIF_COMPRESSION_QUALITY: int
+    IMAGE_COMPRESSION_QUALITY: int
     BUILD_DIRECTORY_NAME: str
     CONTENT_DIRECTORY_NAME: str
     MARKDOWN_FILE_JINJA_TEMPLATE_EXTENSION: str
@@ -28,7 +28,7 @@ class Settings(TypedDict):
 
 
 SETTINGS: Settings = {
-    "AVIF_COMPRESSION_QUALITY": 90,
+    "IMAGE_COMPRESSION_QUALITY": 90,
     "BUILD_DIRECTORY_NAME": "dist",
     "CONTENT_DIRECTORY_NAME": "content",
     "TEMPLATES_DIRECTORY_NAME": "templates",

{blurry_cli-0.16.0 → blurry_cli-0.17.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "blurry-cli"
-version = "0.16.0"
+version = "0.17.0"
 description = "A Mistune-based static site generator for Python"
 authors = ["John Franey <franey@duck.com>"]
 license = "MIT"