warehack.ing/WireViz
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add small fixes

Browse Source
This commit is contained in:
Daniel Rojas 2021-03-29 14:14:40 +02:00
parent 616cbb815e
commit 6f56fcda99
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wireviz/wv_html.py
View File

@ -20,11 +20,11 @@ def generate_html_output(filename: Union[str, Path], bom_list: List[List[str]],
# fall back to built-in simple template if no template was provided # fall back to built-in simple template if no template was provided
templatefile = Path(__file__).parent / 'templates/simple.html' templatefile = Path(__file__).parent / 'templates/simple.html'
with open(templatefile, 'r') as file: with open_file_read(templatefile) as file:
html = file.read() html = file.read()
# embed SVG diagram # embed SVG diagram
with open(f'{filename}.svg') as file: with open_file_read(f'{filename}.svg') as file:
svgdata = file.read() svgdata = file.read()
svgdata = re.sub( svgdata = re.sub(
'^<[?]xml [^?>]*[?]>[^<]*<!DOCTYPE [^>]*>', '^<[?]xml [^?>]*[?]>[^<]*<!DOCTYPE [^>]*>',
@ -74,7 +74,7 @@ def generate_html_output(filename: Union[str, Path], bom_list: List[List[str]],
# fill out other generic metadata # fill out other generic metadata
for item, contents in metadata.items(): for item, contents in metadata.items():
if isinstance(contents, (str, int, float)): if isinstance(contents, (str, int, float)):
html = html.replace(f'<!-- %{item}% -->', html_line_breaks(contents)) html = html.replace(f'<!-- %{item}% -->', html_line_breaks(str(contents)))
elif isinstance(contents, Dict): # useful for authors, revisions elif isinstance(contents, Dict): # useful for authors, revisions
for index, (category, entry) in enumerate(contents.items()): for index, (category, entry) in enumerate(contents.items()):
if isinstance(entry, Dict): if isinstance(entry, Dict):
@ -83,5 +83,5 @@ def generate_html_output(filename: Union[str, Path], bom_list: List[List[str]],
html = html.replace(f'<!-- %{item}_{index+1}_{entry_key}% -->', html_line_breaks(str(entry_value))) html = html.replace(f'<!-- %{item}_{index+1}_{entry_key}% -->', html_line_breaks(str(entry_value)))
with open(f'{filename}.html','w') as file: with open_file_write(f'{filename}.html') as file:
file.write(html) file.write(html)