crieur 1.4.0__tar.gz → 1.6.0__tar.gz

{crieur-1.4.0 → crieur-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crieur
-Version: 1.4.0
+Version: 1.6.0
 Summary: A Static Revue Generator.
 Project-URL: Homepage, https://gitlab.huma-num.fr/ecrinum/crieur
 Project-URL: Issues, https://gitlab.huma-num.fr/ecrinum/crieur/-/issues
@@ -689,6 +689,7 @@ Requires-Dist: httpx
 Requires-Dist: jinja2
 Requires-Dist: minicli
 Requires-Dist: mistune
+Requires-Dist: pillow
 Requires-Dist: python-slugify
 Requires-Dist: pytz>=2025.2
 Requires-Dist: pyyaml>=6.0.2
@@ -754,6 +755,7 @@ cog.out(f"```\n{help}\n```")
                        [--extra-vars EXTRA_VARS] [--target-path TARGET_PATH]
                        [--source-path SOURCE_PATH]
                        [--templates-path TEMPLATES_PATH] [--without-statics]
+                       [--feed-limit FEED_LIMIT]
 
 options:
   -h, --help            show this help message and exit
@@ -768,6 +770,8 @@ options:
                         /sources/).
   --templates-path TEMPLATES_PATH
   --without-statics     Do not copy statics if True (default: False).
+  --feed-limit FEED_LIMIT
+                        Number of max items in the feed (default: 10).
 
 ```
 <!-- [[[end]]] -->

{crieur-1.4.0 → crieur-1.6.0}/README.md

@@ -49,6 +49,7 @@ cog.out(f"```\n{help}\n```")
                        [--extra-vars EXTRA_VARS] [--target-path TARGET_PATH]
                        [--source-path SOURCE_PATH]
                        [--templates-path TEMPLATES_PATH] [--without-statics]
+                       [--feed-limit FEED_LIMIT]
 
 options:
   -h, --help            show this help message and exit
@@ -63,6 +64,8 @@ options:
                         /sources/).
   --templates-path TEMPLATES_PATH
   --without-statics     Do not copy statics if True (default: False).
+  --feed-limit FEED_LIMIT
+                        Number of max items in the feed (default: 10).
 
 ```
 <!-- [[[end]]] -->

{crieur-1.4.0 → crieur-1.6.0}/crieur/__init__.py

@@ -1,4 +1,4 @@
 from pathlib import Path
 
-VERSION = "1.4.0"
+VERSION = "1.6.0"
 ROOT_DIR = Path(__file__).parent

{crieur-1.4.0 → crieur-1.6.0}/crieur/cli.py

@@ -29,6 +29,7 @@ def generate(
     source_path: Path = Path() / "sources",
     templates_path: Path = Path(__file__).parent / "templates",
     without_statics: bool = False,
+    feed_limit: int = 10,
 ):
     """Generate a new revue website.
 
@@ -39,11 +40,12 @@ def generate(
     :source_path: Path where stylo source were downloaded (default: /sources/).
     :template_path: Path where templates are located (default: @crieur/templates/).
     :without_statics: Do not copy statics if True (default: False).
+    :feed_limit: Number of max items in the feed (default: 10).
     """
     numeros = []
     for numero in each_folder_from(source_path):
         for corpus_yaml in each_file_from(numero, pattern="*.yaml"):
-            numero = configure_numero(corpus_yaml)
+            numero = configure_numero(corpus_yaml, base_url)
             numeros.append(numero)
 
     keywords = collect_keywords(numeros)
@@ -58,9 +60,7 @@ def generate(
         target_path,
         templates_path,
     )
-    generate_feed(
-        title, base_url, numeros, extra_vars, target_path, number=10, lang="fr"
-    )
+    generate_feed(title, base_url, numeros, extra_vars, target_path, number=feed_limit)
 
     if not without_statics:
         static_path_local = Path(__file__).parent / "statics"

{crieur-1.4.0 → crieur-1.6.0}/crieur/generator.py

@@ -87,9 +87,7 @@ def generate_html(
         (author_folder / "index.html").write_text(content)
 
 
-def generate_feed(
-    title, base_url, numeros, extra_vars, target_path, number=10, lang="fr"
-):
+def generate_feed(title, base_url, numeros, extra_vars, target_path, number, lang="fr"):
     feed = FeedGenerator()
     feed.id(base_url)
     feed.title(title)
@@ -115,7 +113,7 @@ def generate_feed(
         )
         for author in article.authors:
             feed_entry.author(name=str(author))
-        feed_entry.summary(summary=md(article.content_md), type="html")
+        feed_entry.summary(summary=article.content_html, type="html")
         if article.keywords:
             for keyword in article.keywords:
                 feed_entry.category(term=keyword.name)

{crieur-1.4.0 → crieur-1.6.0}/crieur/models.py

@@ -1,12 +1,67 @@
 from dataclasses import dataclass
+from datetime import datetime
+from textwrap import dedent
 from typing import Optional
 
+import mistune
 from dataclass_wizard import DatePattern, DumpMeta, YAMLWizard
 from dataclass_wizard import errors as dw_errors
+from PIL import Image, UnidentifiedImageError
 from slugify import slugify
 from yaml.composer import ComposerError
 
 
+class ImgsWithSizesRenderer(mistune.HTMLRenderer):
+    """Renders images as <figure>s and add sizes."""
+
+    def __init__(
+        self,
+        escape=True,
+        allow_harmful_protocols=None,
+        base_url=None,
+        article=None,
+    ):
+        super().__init__()
+        self._base_url = base_url
+        self._article = article
+
+    def paragraph(self, text):
+        # In case of a figure, we do not want the (non-standard) paragraph.
+        if text.strip().startswith("<figure>"):
+            return text
+        return super().paragraph(text)
+
+    def image(self, alt, url):
+        if self._article.images_path is None:
+            print(f"Image with URL `{url}` is discarded.")
+            return ""
+        full_path = self._article.images_path.resolve().parent / url
+        try:
+            image = Image.open(full_path)
+        except (IsADirectoryError, FileNotFoundError, UnidentifiedImageError):
+            print(f"`{full_path}` is not a valid image.")
+            return ""
+        width, height = image.size
+        caption = f"<figcaption>{alt}</figcaption>" if alt else ""
+        full_url = f"{self._base_url}{self._article.url}{url}"
+        return dedent(
+            f"""\
+            <figure>
+                <a href="{full_url}"
+                    title="Cliquer pour une version haute résolution">
+                    <img
+                        src="{full_url}"
+                        width="{width}" height="{height}"
+                        loading="lazy"
+                        decoding="async"
+                        alt="{alt}">
+                </a>
+                {caption}
+            </figure>
+            """
+        )
+
+
 @dataclass
 class Numero(YAMLWizard):
     _id: str
@@ -18,7 +73,7 @@ class Numero(YAMLWizard):
     def __post_init__(self):
         self.slug = slugify(self.name)
 
-    def configure_articles(self, yaml_path):
+    def configure_articles(self, yaml_path, base_url):
         # Preserves abstract_fr key (vs. abstract-fr) when converting to_yaml()
         DumpMeta(key_transform="SNAKE").bind_to(Article)
 
@@ -40,6 +95,15 @@ class Numero(YAMLWizard):
                 print(f"Metadata error in `{article['article']['title']}`:")
                 print(e)
                 exit(1)
+            if not loaded_article.date:
+                print(f"Article `{loaded_article.title}` skipped (no date).")
+                continue
+            if loaded_article.date > datetime.today().date():
+                print(
+                    f"Article `{loaded_article.title}` skipped "
+                    f"(future date: {loaded_article.date})."
+                )
+                continue
             if not loaded_article.id:
                 loaded_article.id = article_slug
             loaded_article.content_md = (
@@ -51,6 +115,15 @@ class Numero(YAMLWizard):
                 else None
             )
             loaded_article.numero = self
+            md = mistune.create_markdown(
+                renderer=ImgsWithSizesRenderer(
+                    escape=False,
+                    base_url=base_url,
+                    article=loaded_article,
+                ),
+                plugins=["footnotes", "superscript"],
+            )
+            loaded_article.content_html = md(loaded_article.content_md)
             loaded_articles.append(loaded_article)
         self.articles = sorted(loaded_articles, reverse=True)
 
@@ -84,7 +157,7 @@ class Article(YAMLWizard):
         return f"numero/{self.numero.slug}/article/{self.id}/"
 
 
-def configure_numero(yaml_path):
+def configure_numero(yaml_path, base_url):
     # Preserves abstract_fr key (vs. abstract-fr) when converting to_yaml()
     DumpMeta(key_transform="SNAKE").bind_to(Numero)
 
@@ -93,7 +166,7 @@ def configure_numero(yaml_path):
     except ComposerError:
         numero = Numero.from_yaml(yaml_path.read_text().split("---")[1])
 
-    numero.configure_articles(yaml_path)
+    numero.configure_articles(yaml_path, base_url)
     return numero
 
 

{crieur-1.4.0 → crieur-1.6.0}/crieur/templates/article.html

@@ -34,7 +34,7 @@
         {% endfor %}
       {% endif %}
 
-      {{ article.content_md|markdown }}
+      {{ article.content_html }}
     </div>
   </article>
 {% endblock content %}

{crieur-1.4.0 → crieur-1.6.0}/pyproject.toml

@@ -16,6 +16,7 @@ dependencies = [
   "Jinja2",
   "minicli",
   "mistune",
+  "pillow",
   "python-slugify",
   "unidecode",
   "tzdata>=2025.2",