From a9329a4a4b7abd2aa39a7d94f4d3b8787c842742 Mon Sep 17 00:00:00 2001 From: Laurier Loiselle Date: Fri, 20 Jan 2023 17:26:02 -0500 Subject: [PATCH] src: wireviz: support sheet count --- src/wireviz/wv_cli.py | 9 +++++++++ src/wireviz/wv_output.py | 11 +++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/wireviz/wv_cli.py b/src/wireviz/wv_cli.py index 7acff8a..2ef922d 100644 --- a/src/wireviz/wv_cli.py +++ b/src/wireviz/wv_cli.py @@ -119,6 +119,7 @@ def wireviz(file, format, prepend, output_dir, output_name, version): else: prepend_input = "" + sheet_current = 1 # run WireVIz on each input file for file in filepaths: file = Path(file) @@ -127,6 +128,13 @@ def wireviz(file, format, prepend, output_dir, output_name, version): if not file.is_file(): raise Exception(f"Path is not a file:\n{file}") + extra_metadata = {} + extra_metadata['name'] = file.stem + extra_metadata['sheet_total'] = len(filepaths) + extra_metadata['sheet_current'] = sheet_current + sheet_current +=1 + + # file_out = file.with_suffix("") if not output_file else output_file _output_dir = file.parent if not output_dir else output_dir _output_name = file.stem if not output_name else output_name @@ -150,6 +158,7 @@ def wireviz(file, format, prepend, output_dir, output_name, version): output_dir=_output_dir, output_name=_output_name, image_paths=list(image_paths), + extra_metadata=extra_metadata, ) print() # blank line after execution diff --git a/src/wireviz/wv_output.py b/src/wireviz/wv_output.py index 2f1cf33..40429eb 100644 --- a/src/wireviz/wv_output.py +++ b/src/wireviz/wv_output.py @@ -121,6 +121,13 @@ def generate_html_output( + "\n" ) + if metadata: + sheet_current = metadata['sheet_current'] + sheet_total = metadata['sheet_total'] + else: + sheet_current = 1 + sheet_total = 1 + # prepare simple replacements replacements = { "": f"{APP_NAME} {__version__} - {APP_URL}", @@ -129,8 +136,8 @@ def generate_html_output( "": svgdata, "": bom_html, "": bom_html_reversed, - "": "1", # TODO: handle multi-page documents - "": "1", # TODO: handle multi-page documents + "": sheet_current, + "": sheet_total, } # prepare metadata replacements