From 7c16976c74e3ec4e9087d4cc40c3ff71ad757086 Mon Sep 17 00:00:00 2001 From: Bart Feenstra Date: Tue, 6 Aug 2024 20:44:47 +0100 Subject: [PATCH] Ensure Jinja2Renderer.render_file() sets the template name based on the file (#1862) --- betty/jinja2/__init__.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/betty/jinja2/__init__.py b/betty/jinja2/__init__.py index 1f87eaa15..d82da369c 100644 --- a/betty/jinja2/__init__.py +++ b/betty/jinja2/__init__.py @@ -16,6 +16,7 @@ select_autoescape, FileSystemLoader, pass_context, + Template, ) from jinja2.runtime import StrictUndefined, Context, DebugUndefined from typing_extensions import override @@ -299,6 +300,20 @@ def __init__( return self._context_class + async def from_file(self, file_path: Path) -> Template: + """ + Create a :py:class:`jinja2.Template` out of the given Jinja2 file path. + + This method is intended for rendering individual files once. It **MUST NOT** + be used for reusable templates. + """ + async with aiofiles.open(file_path) as f: + template_source = await f.read() + template_code = self.compile( + template_source, filename=str(file_path.expanduser().resolve()) + ) + return self.template_class.from_code(self, template_code, self.globals) + @pass_context def _gettext(self, context: Context, message: str) -> str: return context_localizer(context).gettext(message) @@ -397,11 +412,8 @@ async def render_file( ): resource = "/".join(resource_parts[1:]) data["page_resource"] = resource - async with aiofiles.open(file_path) as f: - template_source = await f.read() - rendered = await self._environment.from_string( - template_source, self._environment.globals - ).render_async(data) + template = await self._environment.from_file(file_path) + rendered = await template.render_async(data) async with aiofiles.open(destination_file_path, "w", encoding="utf-8") as f: await f.write(rendered) await aiofiles_os.remove(file_path)