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-07 09:15:37 +02:00
parent aa9278da4b
commit a59f96aaa6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wireviz/wv_helper.py
View File

@ -150,7 +150,7 @@ def smart_file_resolve(filename: str, possible_paths: (str, List[str])) -> Path:
possible_paths = [Path(path).resolve() for path in possible_paths if path is not None] possible_paths = [Path(path).resolve() for path in possible_paths if path is not None]
for possible_path in possible_paths: for possible_path in possible_paths:
resolved_path = (possible_path / filename).resolve() resolved_path = (possible_path / filename).resolve()
if (resolved_path).exists(): if resolved_path.exists():
return resolved_path return resolved_path
else: else:
raise Exception(f'{filename} was not found in any of the following locations: \n' + raise Exception(f'{filename} was not found in any of the following locations: \n' +

9
src/wireviz/wv_html.py
View File

@ -12,9 +12,10 @@ from wireviz.wv_gv_html import html_line_breaks
def generate_html_output(filename: Union[str, Path], bom_list: List[List[str]], metadata: Metadata, options: Options): def generate_html_output(filename: Union[str, Path], bom_list: List[List[str]], metadata: Metadata, options: Options):
# load HTML template # load HTML template
if 'name' in metadata.get('template',{}): templatename = metadata.get('template',{}).get('name')
if templatename:
# if relative path to template was provided, check directory of YAML file first, fall back to built-in template directory # if relative path to template was provided, check directory of YAML file first, fall back to built-in template directory
templatefile = smart_file_resolve(f'{metadata["template"]["name"]}.html', [Path(filename).parent, Path(__file__).parent / 'templates']) templatefile = smart_file_resolve(f'{templatename}.html', [Path(filename).parent, Path(__file__).parent / 'templates'])
else: else:
# 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'
@ -49,8 +50,8 @@ def generate_html_output(filename: Union[str, Path], bom_list: List[List[str]],
row_html = f'{row_html} </tr>\n' row_html = f'{row_html} </tr>\n'
bom_contents.append(row_html) bom_contents.append(row_html)
bom_html = '<table>\n' + bom_header_html + ''.join(bom_contents) + '</table>\n' bom_html = '<table class="bom">\n' + bom_header_html + ''.join(bom_contents) + '</table>\n'
bom_html_reversed = '<table>\n' + ''.join(list(reversed(bom_contents))) + bom_header_html + '</table>\n' bom_html_reversed = '<table class="bom">\n' + ''.join(list(reversed(bom_contents))) + bom_header_html + '</table>\n'
# prepare simple replacements # prepare simple replacements
replacements = { replacements = {