crieur 1.2.0__py3-none-any.whl → 1.3.1__py3-none-any.whl

crieur/__init__.py

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

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/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/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,31 @@ 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 = []
+            if not article.authors:
+                continue
+            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/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/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/templates/base.html

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

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>

{crieur-1.2.0.dist-info → crieur-1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crieur
-Version: 1.2.0
+Version: 1.3.1
 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.3.1.dist-info/RECORD

@@ -0,0 +1,18 @@
+crieur/__init__.py,sha256=yOEK782pE6JekTATU6_RAyoO2v5wdzTmwTwYjrsaqco,77
+crieur/__main__.py,sha256=bYt9eEaoRQWdejEHFD8REx9jxVEdZptECFsV7F49Ink,30
+crieur/cli.py,sha256=172Rac-Tjm6idS7Uh3OKdpAJNVieN0ntm9-KdzQA6ao,4984
+crieur/generator.py,sha256=Vc0oOLsQMcKWQLkzHLrJf5f1W_qmoxwYsc_ktHFZjtg,3046
+crieur/models.py,sha256=C3ixU19G-569qv88qJQzcZSuojJezCAjtBjcNn2ksr0,5537
+crieur/utils.py,sha256=kIdxpd5LgVv13Lx2aEXzjQttBDtcppRlwNsH0vwX8f0,1566
+crieur/statics/pico.css,sha256=VdrimW9PLcEIzqJ__s062OrwBj_Jb6jZIwbtdqOtM-w,93407
+crieur/templates/article.html,sha256=4Y1sjBR1nM_ff4yVGgiVlZU1tmnfBMXAjTTSAhqoiA4,1288
+crieur/templates/author.html,sha256=1VHZi6Wld1gWYPfeW3cEJ2ULOKrp9xoCVRhDjPUDdHg,420
+crieur/templates/base.html,sha256=6ih6RryTPXZxR6tqlbRHPpOFUNRu90SPvdfKNLHcRRM,1522
+crieur/templates/homepage.html,sha256=IgYc3cyw-52U3HN1oada0drkzT0fPNyFcdiG6Pwcr9o,3027
+crieur/templates/keyword.html,sha256=Hv3Ep3R6oN5pBw14gfQT-aeqEiuFiatmVZLWn5hR1e4,428
+crieur/templates/numero.html,sha256=b9J6aW_h9ao7XlWA0Xc390ahOH5lHDI8A4iDq6tEZTo,1882
+crieur-1.3.1.dist-info/METADATA,sha256=FjTCJtmcpzthN9ulp96DTnu68qduEQidXFQmmr7nb44,44848
+crieur-1.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+crieur-1.3.1.dist-info/entry_points.txt,sha256=edmbmPxs9QXyvSMpPJBDPGw3vZOJEKqXJhysYNx3QSM,43
+crieur-1.3.1.dist-info/licenses/LICENSE,sha256=F5acw9_laHeyi4wPmQyf_ttyz81VqCIwScwO8C1FhXU,34519
+crieur-1.3.1.dist-info/RECORD,,

crieur-1.2.0.dist-info/RECORD

@@ -1,17 +0,0 @@
-crieur/__init__.py,sha256=vS-uRjCVYd831WrrAwgUW3Tc3G_4y9BRca8t751Zuyg,77
-crieur/__main__.py,sha256=bYt9eEaoRQWdejEHFD8REx9jxVEdZptECFsV7F49Ink,30
-crieur/cli.py,sha256=UZSfoKYQFmrWxZjbLJcGAcXZ6nW_B3FCZxbno4OwQ6A,4862
-crieur/generator.py,sha256=8SZ3A1p3DFQoIg8qbKHF3sfvClI2_QhMAfBclNj0QTs,2651
-crieur/models.py,sha256=5HHA9_e4ijdLTOrx8oKEKG1W8nYq5hnp64qrd8s2hC8,3899
-crieur/utils.py,sha256=kIdxpd5LgVv13Lx2aEXzjQttBDtcppRlwNsH0vwX8f0,1566
-crieur/statics/pico.css,sha256=VdrimW9PLcEIzqJ__s062OrwBj_Jb6jZIwbtdqOtM-w,93407
-crieur/templates/article.html,sha256=BzTXmRxg3_SDSDzPIA_eOKGMa1o1wBAXzLvt3hWbv8w,1149
-crieur/templates/base.html,sha256=PQcEuobOFH-WVJKoiZ97UxSqhkgt-Ey7lO44Z778R_U,1480
-crieur/templates/homepage.html,sha256=NqKCwVcBesl43FKQWkKT4OV-vEnln_pWNVvi2nJD9fU,2458
-crieur/templates/keyword.html,sha256=Hv3Ep3R6oN5pBw14gfQT-aeqEiuFiatmVZLWn5hR1e4,428
-crieur/templates/numero.html,sha256=b9J6aW_h9ao7XlWA0Xc390ahOH5lHDI8A4iDq6tEZTo,1882
-crieur-1.2.0.dist-info/METADATA,sha256=f16Cd73x1hf00qi4pUGbfE0JqE8zpJ0-heyzPR6OYYM,44848
-crieur-1.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-crieur-1.2.0.dist-info/entry_points.txt,sha256=edmbmPxs9QXyvSMpPJBDPGw3vZOJEKqXJhysYNx3QSM,43
-crieur-1.2.0.dist-info/licenses/LICENSE,sha256=F5acw9_laHeyi4wPmQyf_ttyz81VqCIwScwO8C1FhXU,34519
-crieur-1.2.0.dist-info/RECORD,,