Include archived files in archived index

Author: mkaz

hastie/content.py

@@ -111,7 +111,9 @@ def determine_category_from_path(file_parent: Path, content_dir: Path) -> str:
     return category_path.parent.relative_to(content_dir).as_posix()
 
 
-def gather_categories(content_dir: Path, config: dict[str, Any]) -> list[dict[str, Any]]:
+def gather_categories(
+    content_dir: Path, config: dict[str, Any]
+) -> list[dict[str, Any]]:
     """Build list of categories from the filesystem."""
     categories = []
     baseurl = config["site"]["baseurl"]
@@ -173,7 +175,9 @@ def gather_subpages(filepath: Path, config: dict[str, Any]) -> list[dict[str, An
     return subpages
 
 
-def filter_category_pages(category: str, pages: list[dict[str, Any]]) -> list[dict[str, Any]]:
+def filter_category_pages(
+    category: str, pages: list[dict[str, Any]], include_archived: bool = False
+) -> list[dict[str, Any]]:
     category_pages = []
 
     for page in pages:
@@ -183,7 +187,7 @@ def filter_category_pages(category: str, pages: list[dict[str, Any]]) -> list[di
         if "draft" in page:
             continue
 
-        if "archive" in page:
+        if "archive" in page and not include_archived:
             continue
 
         category_pages.append(page)

hastie/main.py

@@ -72,7 +72,11 @@ def main():
             sys.exit()
 
         ## filter pages to those within category
-        category_pages = content.filter_category_pages(page["category"], pages)
+        # If this page is archived or has include_archived: true, include archived pages in the listing
+        include_archived = "archive" in page or page.get("include_archived", False)
+        category_pages = content.filter_category_pages(
+            page["category"], pages, include_archived
+        )
 
         # sort pages
         # human_sort(category_pages, "title")
@@ -115,8 +119,11 @@ def main():
         # remove drafts from category pages
         category_pages = list(filter(lambda p: "draft" not in p, category_pages))
 
-        # remove archived from category pages
-        category_pages = list(filter(lambda p: "archive" not in p, category_pages))
+        # remove archived from category pages (unless this category page itself is archived or has include_archived: true)
+        if "archive" not in cat["page"] and not cat["page"].get(
+            "include_archived", False
+        ):
+            category_pages = list(filter(lambda p: "archive" not in p, category_pages))
 
         # sort by title
         human_sort(category_pages, "name")

hastie/rss.py

@@ -1,4 +1,5 @@
 """RSS Module"""
+
 import operator
 from datetime import datetime
 from email.utils import formatdate

hastie/utils.py

@@ -54,4 +54,4 @@ def timer(st: float = 0, s=""):
     if st == 0:
         return time.time()
 
-    print(f"Elapsed for {s}: {time.time()-st:.1f}")
+    print(f"Elapsed for {s}: {time.time() - st:.1f}")

pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "hastie"
-version = "1.1.0-1"
+version = "1.1.0-b2"
 description = "A static site generator"
 authors = [{name = "Marcus Kazmierczak", email = "marcus@mkaz.com"}]
 license = {text = "MIT"}

tests/test_content.py

@@ -1,4 +1,4 @@
-""" Test module for Hastie resources."""
+"""Test module for Hastie resources."""
 
 from pathlib import Path
 from typing import Dict