crieur 1.3.1__tar.gz → 1.3.2__tar.gz

{crieur-1.3.1 → crieur-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crieur
-Version: 1.3.1
+Version: 1.3.2
 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 → crieur-1.3.2}/crieur/__init__.py

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

{crieur-1.3.1 → crieur-1.3.2}/crieur/cli.py

@@ -101,14 +101,27 @@ def stylo(
                 with httpx.stream("GET", url, timeout=None) as r:
                     for data in r.iter_bytes():
                         fd.write(data)
+        else:
+            print(
+                f"Source already exists: `{zip_path}` (no download). "
+                "Use the `--force` option to download it again"
+            )
 
         target_path = sources_path / f"{i + 1}-{stylo_id}"
         try:
             with zipfile.ZipFile(zip_path, "r") as zip_ref:
                 zip_ref.extractall(target_path)
-            print(f"Data downloaded and extracted to {target_path}")
+            print(f"Data extracted to {target_path}")
         except zipfile.BadZipFile:
+            zip_problematic_path = Path() / f"problematic-export-{i + 1}-{stylo_id}.zip"
+            zip_path.rename(zip_problematic_path)
             print(f"Unable to find corpus with id {stylo_id}!")
+            print(
+                f"Check out the content of {zip_problematic_path} to try to understand."
+            )
+            print(
+                "Either you use a wrong corpus id or there is an issue with the export."
+            )
             return
 
 

{crieur-1.3.1 → crieur-1.3.2}/crieur/models.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 from typing import Optional
 
 from dataclass_wizard import DatePattern, DumpMeta, YAMLWizard
+from dataclass_wizard import errors as dw_errors
 from slugify import slugify
 from yaml.composer import ComposerError
 
@@ -29,11 +30,16 @@ class Numero(YAMLWizard):
             )
             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]
-                )
+                try:
+                    loaded_article = Article.from_yaml_file(article_yaml_path)
+                except ComposerError:
+                    loaded_article = Article.from_yaml(
+                        article_yaml_path.read_text().split("---")[1]
+                    )
+            except dw_errors.ParseError as e:
+                print(f"Metadata error in `{article['article']['title']}`:")
+                print(e)
+                exit(1)
             if not loaded_article.id:
                 loaded_article.id = article_slug
             loaded_article.content_md = (
@@ -46,7 +52,7 @@ class Numero(YAMLWizard):
             )
             loaded_article.numero = self
             loaded_articles.append(loaded_article)
-        self.articles = loaded_articles
+        self.articles = sorted(loaded_articles, reverse=True)
 
 
 @dataclass
@@ -65,6 +71,14 @@ class Article(YAMLWizard):
     def __post_init__(self):
         self.slug = slugify(self.title)
 
+    def __eq__(self, other):
+        return self.id == other.id
+
+    def __lt__(self, other: "Article"):
+        if not isinstance(other, Article):
+            return NotImplemented
+        return self.date < other.date
+
 
 def configure_numero(yaml_path):
     # Preserves abstract_fr key (vs. abstract-fr) when converting to_yaml()