Merge branch 'main' into rss

blog/blog.py

@@ -13,18 +13,14 @@ class Blog:
         self.conf = conf
         self.pages = dict()
 
-    def load_pages(self):
-        """Charge tous les fichiers .md dans le dossier inbox"""
-        files_list = glob.glob(f"{self.conf.inbox}/*.md")
+    def make(self, draft: bool = False):
+        """Convertit les pages en un site html"""
 
         self.pages = dict()
-        for file in files_list:
-            self.pages[Path(file).stem] = Page(Path(file))
+        self._load_pages(self.conf.inbox)
 
-    def make(self):
-        """Convertit les pages en un site html"""
-        if not self.pages:
-            self.load_pages()
+        if draft:
+            self._load_pages(self.conf.draft)
 
         env = Environment(loader=FileSystemLoader(self.conf.theme))
 
@@ -36,6 +32,12 @@ class Blog:
         self._build_index(index_template)
         self._build_rss()
 
+    def _load_pages(self, path: Path):
+        """Charge tous les fichiers .md dans le dossier inbox"""
+        files_list = glob.glob(f"{path}/*.md")
+        for file in files_list:
+            self.pages[Path(file).stem] = Page(Path(file))
+
     def _build_all_pages(self, template: Template):
         """Convertit les pages markdown dans conf.inbox en html dans conf.outbox"""
 
@@ -70,6 +72,7 @@ class Blog:
             feed.write(rss_file, 'utf-8')
 
     def _copy_css(self):
+        """Copie les fichiers CSS du theme vers l'export"""
         css_path = Path(self.conf.theme) / "css"
         dest_path = Path(self.conf.outbox) / "css"
 

blog/config.py

@@ -5,7 +5,15 @@ from pathlib import Path
 class Config:
 
     _conf = dict()
-    _list_valid_parameters = {"inbox", "outbox", "theme", "title", "presentation", "url"}
+    _list_valid_parameters = {
+        "inbox",
+        "outbox",
+        "theme",
+        "title",
+        "presentation",
+        "url",
+        "draft",
+    }
 
     def __init__(self, config_file: Path):
         """Constructeur : charge les paramètres depuis le fichier de configuration"""

blog/page.py

@@ -4,19 +4,16 @@ import yaml
 import jinja2
 import textwrap
 import markdown
-import subprocess
 from pathlib import Path
 from datetime import date
 
-# from bs4 import BeautifulSoup as bs
 
-
-def new_page(title: str):
+def new_page(title: str, path: Path) -> Path:
     """Crée un nouvel article à partir du titre de celui ci."""
 
     today = date.today().strftime("%Y-%m-%d")
 
-    filename = "./inbox/" + re.sub("[^a-zA-Z0-9-]", "_", title) + ".md"
+    filename = path + '/' + re.sub("[^a-zA-Z0-9-]", "_", title) + ".md"
 
     content = textwrap.dedent(
         f"""\
@@ -27,7 +24,6 @@ def new_page(title: str):
     tags:
         -
     ---
-    # {title}
 
     """
     )
@@ -36,7 +32,7 @@ def new_page(title: str):
         with open(filename, "w") as file:
             file.write(content)
 
-    subprocess.run(["nvim", "+normal G$", "+startinsert", filename])
+    return filename
 
 
 class Page:
@@ -63,9 +59,6 @@ class Page:
         if name not in self.meta:
             raise AttributeError(f"L'attribut '{name}' n'existe pas.")
 
-        # if name == date:
-        #     return datetime(self.meta['date'], "%Y-%m-%d")
-
         return self.meta[name]
 
     def _extract_meta_and_markdown(self, content: str) -> list: