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

Apply suggestions from code review

Browse Source 
Co-authored-by: kvid <kvid@users.noreply.github.com>
This commit is contained in:
Daniel Rojas 2021-10-02 18:07:25 +02:00
parent b2a2770f7a
commit aa9278da4b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wireviz/wv_html.py
View File

@ -24,11 +24,10 @@ def generate_html_output(filename: Union[str, Path], bom_list: List[List[str]],
# embed SVG diagram # embed SVG diagram
with open_file_read(f'{filename}.svg') as file: with open_file_read(f'{filename}.svg') as file:
svgdata = file.read()
svgdata = re.sub( svgdata = re.sub(
'^<[?]xml [^?>]*[?]>[^<]*<!DOCTYPE [^>]*>', '^<[?]xml [^?>]*[?]>[^<]*<!DOCTYPE [^>]*>',
'<!-- XML and DOCTYPE declarations from SVG file removed -->', '<!-- XML and DOCTYPE declarations from SVG file removed -->',
svgdata, 1) file.read(), 1)
# generate BOM table # generate BOM table
bom = flatten2d(bom_list) bom = flatten2d(bom_list)
@ -57,7 +56,7 @@ def generate_html_output(filename: Union[str, Path], bom_list: List[List[str]],
replacements = { replacements = {
'<!-- %generator% -->': f'{APP_NAME} {__version__} - {APP_URL}', '<!-- %generator% -->': f'{APP_NAME} {__version__} - {APP_URL}',
'<!-- %fontname% -->': options.fontname, '<!-- %fontname% -->': options.fontname,
'<!-- %bgcolor% -->': options.bgcolor, # TODO: currently not working, requires translation from 2-char color code to HTML '<!-- %bgcolor% -->': wv_colors.translate_color(options.bgcolor, "hex"),
'<!-- %diagram% -->': svgdata, '<!-- %diagram% -->': svgdata,
'<!-- %bom% -->': bom_html, '<!-- %bom% -->': bom_html,
'<!-- %bom_reversed% -->': bom_html_reversed, '<!-- %bom_reversed% -->': bom_html_reversed,