Updates!

Some documentation expansion.
Add {do} support to jinja systems

pixywerk2/__main__.py

@@ -17,7 +17,7 @@ from typing import Dict, List, cast
 from .processchain import ProcessorChains
 from .processors.processors import PassthroughException
 from .metadata import MetaTree
-from .template_tools import file_list, file_name, file_content, file_metadata, time_iso8601, file_raw
+from .template_tools import date_iso8601, file_list, file_name, file_content, file_metadata, time_iso8601, file_raw
 from .pygments import pygments_get_css, pygments_markup_contents_html
 
 logger = logging.getLogger()
@@ -41,7 +41,8 @@ def get_args(args: List[str]) -> argparse.Namespace:
     parser.add_argument("-d", "--dry-run", help="Perform a dry-run.", action="store_true")
     parser.add_argument("-v", "--verbose", help="Output verbosely.", action="store_true")
     parser.add_argument("--processors", help="Specify a path to a processor configuration file.", default=None)
-
+    # parser.add_argument("--prescript", help="Specify one or more prescripts to run (in order specified) with context of the compile.", default=[], action="append")
+    # parser.add_argument("--postscript", help="Specify one or more postsscripts to run (in order specified) with context of the compile.", default=[], action="append")
     result = parser.parse_args(args)
 
     # validate arguments
@@ -93,6 +94,7 @@ def main() -> int:
         "get_raw": file_raw(args.root, file_raw_cache),
         "get_file_metadata": file_metadata(meta_tree),
         "get_time_iso8601": time_iso8601("UTC"),
+        "get_date_iso8601": date_iso8601("UTC"),
         "pygments_get_css": pygments_get_css,
         "pygments_markup_contents_html": pygments_markup_contents_html,
     }

pixywerk2/processors/jinja2.py

@@ -22,7 +22,7 @@ class Jinja2(PassThrough):
             iterable: The post-processed output stream
         """
         ctx = cast(Dict, ctx)
-        template_env = Environment(loader=FileSystemLoader(ctx["templates"]))
+        template_env = Environment(loader=FileSystemLoader(ctx["templates"]), extensions=['jinja2.ext.do'])
         template_env.globals.update(ctx["globals"])
         template_env.filters.update(ctx["filters"])
         tmpl = template_env.from_string("".join([x for x in input_file]))

pixywerk2/processors/jinja2_page_embed.py

@@ -52,7 +52,7 @@ class Jinja2PageEmbed(Processor):
             iterable: The post-processed output stream
         """
         ctx = cast(Dict, ctx)
-        template_env = Environment(loader=FileSystemLoader(ctx["templates"]))
+        template_env = Environment(loader=FileSystemLoader(ctx["templates"]), extensions=['jinja2.ext.do'])
         template_env.globals.update(ctx["globals"])
         template_env.filters.update(ctx["filters"])
         tmpl = template_env.get_template(ctx["template"])

pixywerk2/template_tools.py

@@ -86,3 +86,11 @@ def time_iso8601(timezone: str) -> Callable:
         return datetime.datetime.fromtimestamp(time_t, tz).isoformat("T")
 
     return get_time_iso8601
+
+def date_iso8601(timezone: str) -> Callable:
+    tz = pytz.timezone(timezone)
+
+    def get_date_iso8601(time_t: Union[int, float]) -> str:
+        return datetime.datetime.fromtimestamp(time_t, tz).strftime('%Y-%m-%d')
+
+    return get_date_iso8601