blurry-cli 0.10.0__tar.gz → 0.12.0__tar.gz

{blurry_cli-0.10.0 → blurry_cli-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blurry-cli
-Version: 0.10.0
+Version: 0.12.0
 Summary: A Mistune-based static site generator for Python
 Home-page: https://github.com/blurry-dev/blurry
 License: MIT
@@ -33,7 +33,7 @@ Requires-Dist: livereload (>=2.7.0,<3.0.0)
 Requires-Dist: mistune (>=3.0.2,<4.0.0)
 Requires-Dist: pydantic2-schemaorg (>=0.2.0,<0.3.0)
 Requires-Dist: rich (>=13.3.3,<14.0.0)
-Requires-Dist: selectolax (>=0.3.6,<0.4.0)
+Requires-Dist: selectolax (>=0.3.27,<0.4.0)
 Requires-Dist: toml (>=0.10.2,<0.11.0)
 Requires-Dist: typer (>=0.6.1,<0.7.0)
 Project-URL: Repository, https://github.com/blurry-dev/blurry

{blurry_cli-0.10.0 → blurry_cli-0.12.0}/blurry/__init__.py

@@ -1,9 +1,12 @@
 import asyncio
 import dataclasses
+import importlib
 import json
 import mimetypes
 import os
+import pkgutil
 import shutil
+import sys
 from collections.abc import Coroutine
 from copy import deepcopy
 from datetime import datetime
@@ -51,7 +54,7 @@ warning_console = Console(stderr=True, style="bold yellow")
 app = AsyncTyper()
 
 
-async def process_non_markdown_file(filepath: Path):
+async def process_non_markdown_file(filepath: Path, file_data_by_directory):
     CONTENT_DIR = get_content_directory()
     mimetype, _ = mimetypes.guess_type(filepath, strict=False)
     relative_filepath = filepath.relative_to(CONTENT_DIR)
@@ -59,6 +62,13 @@ async def process_non_markdown_file(filepath: Path):
     output_file = Path(build_filepath)
     output_file.parent.mkdir(exist_ok=True, parents=True)
 
+    # Process Jinja files
+    if ".jinja" in filepath.suffixes:
+        # Process file
+        jinja_env = get_jinja_env()
+        process_jinja_file(filepath, jinja_env, file_data_by_directory)
+        return
+
     # Copy file to build directory
     shutil.copyfile(filepath, build_filepath)
 
@@ -70,6 +80,27 @@ async def process_non_markdown_file(filepath: Path):
         await generate_images_for_srcset(filepath)
 
 
+def process_jinja_file(filepath: Path, jinja_env: Environment, file_data_by_directory):
+    build_directory = get_build_directory()
+    content_directory = get_content_directory()
+    template = jinja_env.get_template(str(filepath.relative_to(content_directory)))
+    context = {
+        "file_data_by_directory": {
+            str(path): data for path, data in deepcopy(file_data_by_directory).items()
+        },
+        "settings": deepcopy(SETTINGS),
+        "datetime": datetime,
+    }
+    filepath_with_new_extension = filepath.with_suffix(
+        filepath.suffix.replace(".jinja", "")
+    )
+    filepath_in_build = build_directory / filepath_with_new_extension.relative_to(
+        content_directory
+    )
+    html = template.render(dataclasses=dataclasses, **context)
+    filepath_in_build.write_text(html)
+
+
 async def write_html_file(
     file_data: MarkdownFileData,
     file_data_list: list[MarkdownFileData],
@@ -172,14 +203,8 @@ async def build(release=True):
     markdown_tasks: list[Coroutine] = []
     non_markdown_tasks: list[Coroutine] = []
 
-    for filepath in path.glob("**/*.*"):
-        # Handle images and other files
-        if filepath.suffix != ".md":
-            non_markdown_tasks.append(process_non_markdown_file(filepath))
-            continue
-
-        # Handle Markdown files
-
+    # Gather metadata from Markdown files
+    for filepath in path.glob("**/*.md"):
         # Extract filepath for storing context data and writing out
         relative_filepath = filepath.relative_to(CONTENT_DIR)
         directory = relative_filepath.parent
@@ -195,11 +220,19 @@ async def build(release=True):
         )
         file_data_by_directory[directory].append(file_data)
 
-    non_markdown_tasks.append(write_sitemap_file(file_data_by_directory))
+    # Handle images and other files
+    for filepath in path.glob("**/*"):
+        if filepath.suffix == ".md" or filepath.is_dir():
+            continue
+        non_markdown_tasks.append(
+            process_non_markdown_file(filepath, file_data_by_directory)
+        )
 
     # Sort file data by publishedDate/createdDate, descending, if present
     file_data_by_directory = sort_directory_file_data_by_date(file_data_by_directory)
 
+    non_markdown_tasks.append(write_sitemap_file(file_data_by_directory))
+
     for file_data_list in file_data_by_directory.values():
         for file_data in file_data_list:
             markdown_tasks.append(
@@ -231,6 +264,20 @@ async def build_development():
     await build(release=False)
 
 
+async def reload_local_plugins_and_build():
+    """Reloads a project's local modules and performs a dev build"""
+    cwd = str(Path.cwd())
+
+    for _, package_name, _ in pkgutil.iter_modules([cwd]):
+        try:
+            module = sys.modules[package_name]
+        except KeyError:
+            continue
+        importlib.reload(module)
+
+    await build_development()
+
+
 @app.command()
 def runserver():
     """Starts HTTP server with live reloading."""
@@ -251,6 +298,10 @@ def runserver():
         f"{SETTINGS['TEMPLATES_DIRECTORY_NAME']}/**/*",
         lambda: event_loop.create_task(build_development()),
     )
+    livereload_server.watch(
+        "./**/*.py",
+        lambda: event_loop.create_task(reload_local_plugins_and_build()),
+    )
     livereload_server.watch(
         "blurry.toml", lambda: event_loop.create_task(build_development())
     )

{blurry_cli-0.10.0 → blurry_cli-0.12.0}/blurry/templates.py

@@ -5,6 +5,7 @@ from jinja2 import select_autoescape
 
 from blurry.plugins import discovered_jinja_extensions
 from blurry.plugins import discovered_jinja_filter_plugins
+from blurry.settings import get_content_directory
 from blurry.settings import get_templates_directory
 from blurry.settings import SETTINGS
 
@@ -14,16 +15,16 @@ def get_jinja_env() -> Environment:
     Returns a Jinja environment complete with JinjaX and any installed Jinja extensions and filters.
     """
     templates_directory = get_templates_directory()
+    content_directory = get_content_directory()
     jinja_env = Environment(
-        loader=FileSystemLoader(templates_directory),
+        loader=FileSystemLoader([content_directory, templates_directory]),
         autoescape=select_autoescape(
-            list(
+            enabled_extensions=list(
                 {
                     SETTINGS["MARKDOWN_FILE_JINJA_TEMPLATE_EXTENSION"].lstrip("."),
-                    "html",
-                    "xml",
+                    "jinja",
                 }
-            )
+            ),
         ),
         extensions=[
             jinja_extension.load() for jinja_extension in discovered_jinja_extensions

{blurry_cli-0.10.0 → blurry_cli-0.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "blurry-cli"
-version = "0.10.0"
+version = "0.12.0"
 description = "A Mistune-based static site generator for Python"
 authors = ["John Franey <franey@duck.com>"]
 license = "MIT"
@@ -32,7 +32,7 @@ livereload = "^2.7.0"
 mistune = "^3.0.2"
 python = "^3.10"
 rich = "^13.3.3"
-selectolax = "^0.3.6"
+selectolax = "^0.3.27"
 toml = "^0.10.2"
 typer = "^0.6.1"
 htmlmin2 = "^0.1.13"