crieur 1.2.0__tar.gz → 1.3.0__tar.gz

{crieur-1.2.0 → crieur-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crieur
-Version: 1.2.0
+Version: 1.3.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

{crieur-1.2.0 → crieur-1.3.0}/crieur/__init__.py

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

{crieur-1.2.0 → crieur-1.3.0}/crieur/cli.py

@@ -10,7 +10,7 @@ from minicli import cli, run
 
 from . import VERSION
 from .generator import generate_html
-from .models import collect_keywords, configure_numero
+from .models import collect_authors, collect_keywords, configure_numero
 from .utils import each_file_from, each_folder_from
 
 
@@ -47,8 +47,16 @@ def generate(
             numeros.append(numero)
 
     keywords = collect_keywords(numeros)
+    authors = collect_authors(numeros)
     generate_html(
-        title, base_url, numeros, keywords, extra_vars, target_path, templates_path
+        title,
+        base_url,
+        numeros,
+        keywords,
+        authors,
+        extra_vars,
+        target_path,
+        templates_path,
     )
 
     if not without_statics:

{crieur-1.2.0 → crieur-1.3.0}/crieur/generator.py

@@ -23,7 +23,7 @@ def markdown(value):
 
 
 def generate_html(
-    title, base_url, numeros, keywords, extra_vars, target_path, templates_path
+    title, base_url, numeros, keywords, authors, extra_vars, target_path, templates_path
 ):
     environment = Env(loader=FileSystemLoader(str(templates_path)))
     environment.filters["slugify"] = slugify_
@@ -36,6 +36,7 @@ def generate_html(
         "base_url": base_url,
         "numeros": numeros,
         "keywords": keywords,
+        "authors": authors,
         "crieur_version": VERSION,
         **extra_vars,
     }
@@ -75,3 +76,10 @@ def generate_html(
         keyword_folder = target_path / "mot-clef" / keyword.slug
         keyword_folder.mkdir(parents=True, exist_ok=True)
         (keyword_folder / "index.html").write_text(content)
+
+    for slug, author in authors.items():
+        template_author = environment.get_template("author.html")
+        content = template_author.render(author=author, **common_params)
+        author_folder = target_path / "auteur" / author.slug
+        author_folder.mkdir(parents=True, exist_ok=True)
+        (author_folder / "index.html").write_text(content)

{crieur-1.2.0 → crieur-1.3.0}/crieur/models.py

@@ -98,6 +98,29 @@ class Keyword:
         return len_self < len_other
 
 
+@dataclass
+class Author:
+    slug: str
+    forname: str
+    surname: str
+    articles: list
+
+    def __str__(self):
+        return f"{self.forname} {self.surname}"
+
+    def __eq__(self, other):
+        return self.slug == other.slug
+
+    def __lt__(self, other: "Author"):
+        if not isinstance(other, Author):
+            return NotImplemented
+        len_self = len(self.articles)
+        len_other = len(other.articles)
+        if len_self == len_other:
+            return self.slug > other.slug
+        return len_self < len_other
+
+
 def collect_keywords(numeros):
     keywords = {}
     for numero in numeros:
@@ -118,3 +141,29 @@ def collect_keywords(numeros):
                         article_keywords.append(kw)
             article.keywords = article_keywords
     return dict(sorted(keywords.items(), key=lambda item: item[1], reverse=True))
+
+
+def collect_authors(numeros):
+    authors = {}
+    for numero in numeros:
+        for article in numero.articles:
+            article_authors = []
+            for athr in article.authors:
+                author_forname = athr["forname"]
+                author_surname = athr["surname"]
+                author_name = f"{author_forname} {author_surname}"
+                author_slug = slugify(author_name)
+                if author_slug in authors:
+                    authors[author_slug].articles.append(article)
+                    kw = authors[author_slug]
+                else:
+                    kw = Author(
+                        slug=author_slug,
+                        forname=author_forname,
+                        surname=author_surname,
+                        articles=[article],
+                    )
+                    authors[author_slug] = kw
+                article_authors.append(kw)
+            article.authors = article_authors
+    return dict(sorted(authors.items(), key=lambda item: item[1], reverse=True))

{crieur-1.2.0 → crieur-1.3.0}/crieur/templates/article.html

@@ -14,6 +14,7 @@
             <details>
               <summary role="button"><em>{{ author.forname }} {{ author.surname }}</em></summary>
               {{ author.biography|markdown }}
+              <a href="{{ base_url }}auteur/{{ author.slug }}/" role="button" class="secondary">Autres articles de l’auteur·ice →</a>
             </details>
           {% endfor %}
         </div>

crieur-1.3.0/crieur/templates/author.html

@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+
+{% block content %}
+  <article>
+    <header>
+      <h2>{{ author }} ({{ author.articles|length }})</h2>
+    </header>
+
+    <div>
+      <ul>
+        {% for article in author.articles %}
+          <li><a href="{{ base_url }}numero/{{ article.numero.slug }}/article/{{ article.id }}/">{{ article.title_f }}</a></li>
+        {% endfor %}
+      </ul>
+    </div>
+  </article>
+{% endblock content %}

{crieur-1.2.0 → crieur-1.3.0}/crieur/templates/base.html

@@ -21,6 +21,9 @@
     h1 {
         text-align: center;
     }
+    dt {
+        font-weight: bold;
+    }
   </style>
   {% block extra_head %}
   {% endblock extra_head %}

{crieur-1.2.0 → crieur-1.3.0}/crieur/templates/homepage.html

@@ -57,19 +57,35 @@
 {% endblock extra_head %}
 
 {% block content %}
-  {% for slug, keyword in keywords.items() %}
-    {% if loop.index < 20 %}
-      <a href="{{ base_url }}mot-clef/{{ keyword.slug }}/">#{{ keyword.name }}</a>({{ keyword.articles|length }}){%- if not loop.last -%}, {% endif %}
-    {% endif %}
-  {% endfor %}…
-  <details>
-    <summary role="button">Voir plus de mot-clés :</summary>
-    {% for slug, keyword in keywords.items() %}
-      {% if loop.index >= 20 %}
-        <a href="{{ base_url }}mot-clef/{{ keyword.slug }}/">#{{ keyword.name }}</a>({{ keyword.articles|length }}){%- if not loop.last -%}, {% endif %}
-      {% endif %}
-    {% endfor %}
-  </details>
+  <article>
+    <dl>
+      <dt>Mots-clefs :</dt>
+      <dd>
+        {% for slug, keyword in keywords.items() %}
+          {% if loop.index < 20 %}
+            <a href="{{ base_url }}mot-clef/{{ keyword.slug }}/">#{{ keyword.name }}</a>({{ keyword.articles|length }}){%- if not loop.last -%}, {% endif %}
+          {% endif %}
+        {% endfor %}{% if keywords|length >= 20 %}…
+          <details>
+            <summary role="button">Voir plus de mot-clés :</summary>
+            {% for slug, keyword in keywords.items() %}
+              {% if loop.index >= 20 %}
+                <a href="{{ base_url }}mot-clef/{{ keyword.slug }}/">#{{ keyword.name }}</a>({{ keyword.articles|length }}){%- if not loop.last -%}, {% endif %}
+              {% endif %}
+            {% endfor %}
+          </details>
+        {% endif %}
+      </dd>
+      <dt>Auteur·ices :</dt>
+      <dd>
+        {% for slug, author in authors.items() %}
+          {% if loop.index < 20 %}
+            <a href="{{ base_url }}auteur/{{ author.slug }}/">#{{ author }}</a>({{ author.articles|length }}){%- if not loop.last -%}, {% endif %}
+          {% endif %}
+        {% endfor %}
+      </dd>
+    </dl>
+  </article>
   <div class="grid">
   {% for numero in numeros %}
     <article>