Formatting, alt text, empty string edge case, names

Author: penguinencounter

src/hexdoc/_templates/pages/patchouli/entity.html.jinja

@@ -4,18 +4,20 @@
 {% import "macros/textures.html.jinja" as texture_macros with context %}
 
 {% block body %}
-<h4>
-  {{- page.get_name() -}}
-  {%- if page_anchor_id is defined %}
-    {{- fmt.permalink(page_anchor_id) -}}
-  {% endif -%}
-</h4>
-<p class="image-wrapper">
-  {{ texture_macros.render_texture(
-    name=page.get_name(),
-    texture=page.texture,
-    class_names=["entity-display"]
-  ) }}
-</p>
-{{ fmt.styled(page.text) }}
+  <h4>
+    {{- page.name -}}
+    {%- if page_anchor_id is defined %}
+      {{- fmt.permalink(page_anchor_id) -}}
+    {% endif -%}
+  </h4>
+  {% block image %}
+    <p class="image-wrapper">
+      {{ texture_macros.render_texture(
+        name=page.entity_name,
+        texture=page.texture,
+        class_names=["entity-display"]
+      ) }}
+    </p>
+  {% endblock image %}
+  {{ fmt.styled(page.text) }}
 {% endblock %}

src/hexdoc/patchouli/page/pages.py

@@ -53,20 +53,25 @@ class EmptyPage(Page, type="patchouli:empty", template_type="patchouli:page"):
 
 
 class EntityPage(PageWithText, type="patchouli:entity"):
-    _default_name: LocalizedStr = PrivateAttr()
+    _entity_name: LocalizedStr = PrivateAttr()
     _texture: PNGTexture = PrivateAttr()
 
     entity: Entity
     scale: float = 1
     offset: float = 0
     rotate: bool = True
     default_rotation: float = -45
-    name: LocalizedStr | None = None
+    name_field: LocalizedStr | None = Field(default=None, serialization_alias="name")
 
-    def get_name(self):
-        if self.name is None:
-            return self._default_name
-        return self.name
+    @property
+    def entity_name(self):
+        return self._entity_name
+
+    @property
+    def name(self):
+        if self.name_field is None or not self.name_field.value:
+            return self._entity_name
+        return self.name_field
 
     @property
     def texture(self):
@@ -78,7 +83,7 @@ def _get_texture(self, info: ValidationInfo) -> Self:
         # causes circular references with the PNGTexture
         assert info.context is not None
         i18n = I18n.of(info)
-        self._default_name = i18n.localize_entity(self.entity.id)
+        self._entity_name = i18n.localize_entity(self.entity.id)
         self._texture = PNGTexture.load_id(
             id="textures/entities" / self.entity.id + ".png", context=info.context
         )