crieur 1.0.3__tar.gz → 1.0.5__tar.gz

{crieur-1.0.3 → crieur-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crieur
-Version: 1.0.3
+Version: 1.0.5
 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
@@ -730,7 +730,7 @@ options:
   -h, --help  Show this help message and exit
 
 Available commands:
-
+  
     version   Return the current version.
     generate  Generate a new revue website.
     stylo     Initialize a new revue to current directory from Stylo.
@@ -750,11 +750,12 @@ help = output.decode().split("\n", 1)[1]  # Remove Pandoc version.
 cog.out(f"```\n{help}\n```")
 ]]] -->
 ```
-                       [--source-path SOURCE_PATH]
+                       [--target-path TARGET_PATH] [--source-path SOURCE_PATH]
 
 options:
   -h, --help            show this help message and exit
   --title, -t TITLE     Title of the website (default: Crieur).
+  --base-url BASE_URL   Base URL of the website, ending with / (default: /).
   --target-path TARGET_PATH
                         Path where site is built (default: /public/).
   --source-path SOURCE_PATH

{crieur-1.0.3 → crieur-1.0.5}/README.md

@@ -26,7 +26,7 @@ options:
   -h, --help  Show this help message and exit
 
 Available commands:
-
+  
     version   Return the current version.
     generate  Generate a new revue website.
     stylo     Initialize a new revue to current directory from Stylo.
@@ -46,11 +46,12 @@ help = output.decode().split("\n", 1)[1]  # Remove Pandoc version.
 cog.out(f"```\n{help}\n```")
 ]]] -->
 ```
-                       [--source-path SOURCE_PATH]
+                       [--target-path TARGET_PATH] [--source-path SOURCE_PATH]
 
 options:
   -h, --help            show this help message and exit
   --title, -t TITLE     Title of the website (default: Crieur).
+  --base-url BASE_URL   Base URL of the website, ending with / (default: /).
   --target-path TARGET_PATH
                         Path where site is built (default: /public/).
   --source-path SOURCE_PATH

{crieur-1.0.3 → crieur-1.0.5}/crieur/__init__.py

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

{crieur-1.0.3 → crieur-1.0.5}/crieur/cli.py

@@ -23,12 +23,14 @@ def version():
 @cli
 def generate(
     title="Crieur",
+    base_url="/",
     target_path: Path = Path() / "public",
     source_path: Path = Path() / "sources",
 ):
     """Generate a new revue website.
 
     :title: Title of the website (default: Crieur).
+    :base_url: Base URL of the website, ending with / (default: /).
     :target_path: Path where site is built (default: /public/).
     :source_path: Path where stylo source were downloaded (default: /sources/).
     """
@@ -39,7 +41,7 @@ def generate(
             numeros.append(numero)
 
     keywords = collect_keywords(numeros)
-    generate_html(title, numeros, keywords, target_path)
+    generate_html(title, base_url, numeros, keywords, target_path)
 
     static_path_local = Path(__file__).parent / "statics"
     shutil.copytree(static_path_local, target_path / "statics", dirs_exist_ok=True)

{crieur-1.0.3 → crieur-1.0.5}/crieur/generator.py

@@ -29,11 +29,12 @@ def markdown(value):
 environment.filters["markdown"] = markdown
 
 
-def generate_html(title, numeros, keywords, target_path):
+def generate_html(title, base_url, numeros, keywords, target_path):
     common_params = {
+        "title": title,
+        "base_url": base_url,
         "numeros": numeros,
         "keywords": keywords,
-        "title": title,
     }
 
     template_homepage = environment.get_template("homepage.html")

{crieur-1.0.3 → crieur-1.0.5}/crieur/models.py

@@ -20,19 +20,21 @@ class Numero(YAMLWizard):
 
         loaded_articles = []
         for article in self.articles:
+            article_slug = slugify(article["article"]["title"])
             article_folder = (
-                yaml_path.parent
-                / f"{article['article']['title']}-{article['article']['_id']}"
+                yaml_path.parent / f"{article_slug}-{article['article']['_id']}"
             )
-            article_yaml_path = article_folder / f"{article['article']['title']}.yaml"
+            article_yaml_path = article_folder / f"{article_slug}.yaml"
             try:
                 loaded_article = Article.from_yaml_file(article_yaml_path)
             except ComposerError:
                 loaded_article = Article.from_yaml(
                     article_yaml_path.read_text().split("---")[1]
                 )
+            if not loaded_article.id:
+                loaded_article.id = article_slug
             loaded_article.content_md = (
-                article_folder / f"{article['article']['title']}.md"
+                article_folder / f"{article_slug}.md"
             ).read_text()
             loaded_article.images_path = (
                 article_folder / "images"
@@ -46,10 +48,10 @@ class Numero(YAMLWizard):
 
 @dataclass
 class Article(YAMLWizard):
-    id: str
     title: str
     title_f: str
     date: Optional[DatePattern["%Y/%m/%d"]]  # noqa: F722
+    id: str = ""
     subtitle: str = ""
     subtitle_f: str = ""
     content_md: str = ""

{crieur-1.0.3 → crieur-1.0.5}/crieur/templates/article.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-  <h2><a href="../..">{{ numero.name }}</a></h2>
+  <h2><a href="{{ base_url }}numeros/{{ numero.name }}">{{ numero.name }}</a></h2>
 
   <article>
     <header>
@@ -20,7 +20,7 @@
       {% endif %}
 
       {% for keyword in article.keywords %}
-        <a href="/mot-clef/{{ keyword.slug }}/">#{{ keyword.name }}</a>({{ keyword.articles|length }}){%- if not loop.last -%}, {% endif %}
+        <a href="{{ base_url }}mot-clef/{{ keyword.slug }}/">#{{ keyword.name }}</a>({{ keyword.articles|length }}){%- if not loop.last -%}, {% endif %}
       {% endfor %}
     </header>
 

{crieur-1.0.3 → crieur-1.0.5}/crieur/templates/base.html

@@ -15,7 +15,7 @@
   <!-- Lightest blank gif, avoids an extra query to the server. -->
   <link rel="icon" href="data:;base64,iVBORw0KGgo=" />
   <link rel="stylesheet"
-        href="/statics/pico.css" />
+        href="{{ base_url }}statics/pico.css" />
   <style>
     h1 {
         text-align: center;
@@ -27,7 +27,7 @@
   <body>
     <main class="container">
       <div class="content">
-        <h1><a href="/">{{ title }}</a></h1>
+        <h1><a href="{{ base_url }}">{{ title }}</a></h1>
         {% block content %}
         {% endblock content %}
       </div>

{crieur-1.0.3 → crieur-1.0.5}/crieur/templates/homepage.html

@@ -59,14 +59,14 @@
 {% block content %}
   {% for slug, keyword in keywords.items() %}
     {% if loop.index < 20 %}
-      <a href="/mot-clef/{{ keyword.slug }}/">#{{ keyword.name }}</a>({{ keyword.articles|length }}){%- if not loop.last -%}, {% endif %}
+      <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="/mot-clef/{{ keyword.slug }}/">#{{ keyword.name }}</a>({{ keyword.articles|length }}){%- if not loop.last -%}, {% endif %}
+        <a href="{{ base_url }}mot-clef/{{ keyword.slug }}/">#{{ keyword.name }}</a>({{ keyword.articles|length }}){%- if not loop.last -%}, {% endif %}
       {% endif %}
     {% endfor %}
   </details>
@@ -75,13 +75,13 @@
     <article>
       <header>
         <hgroup>
-          <h2><a href="/numero/{{ numero.name }}/">{{ numero.name }}</a></h2>
+          <h2><a href="{{ base_url }}numero/{{ numero.name }}/">{{ numero.name }}</a></h2>
           <p>Le {{ numero.articles.0.date.strftime('%d %B %Y') }}</p>
         </hgroup>
       </header>
       <ul>
         {% for article in numero.articles %}
-          <li><a href="/numero/{{ numero.name }}/article/{{ article.id }}/">{{ article.title_f }}</a></li>
+          <li><a href="{{ base_url }}numero/{{ numero.name }}/article/{{ article.id }}/">{{ article.title_f }}</a></li>
         {% endfor %}
       </ul>
     </article>

{crieur-1.0.3 → crieur-1.0.5}/crieur/templates/keyword.html

@@ -9,7 +9,7 @@
     <div>
       <ul>
         {% for article in keyword.articles %}
-          <li><a href="/numero/{{ article.numero.name }}/article/{{ article.id }}/">{{ article.title_f }}</a></li>
+          <li><a href="{{ base_url }}numero/{{ article.numero.name }}/article/{{ article.id }}/">{{ article.title_f }}</a></li>
         {% endfor %}
       </ul>
     </div>

{crieur-1.0.3 → crieur-1.0.5}/crieur/templates/numero.html

@@ -59,7 +59,7 @@
   {% for article in numero.articles %}
     <article>
       <header>
-        <h3><a href="/numero/{{ numero.name }}/article/{{ article.id }}/">{{ article.title_f }}</a></h3>
+        <h3><a href="{{ base_url }}numero/{{ numero.name }}/article/{{ article.id }}/">{{ article.title_f }}</a></h3>
       </header>
       {{ article.subtitle_f|markdown }}
       {% if article.authors %}