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

Update smart_file_resolve()

Browse Source
This commit is contained in:
Daniel Rojas 2021-10-02 18:02:16 +02:00
parent 406bdd36f2
commit b2a2770f7a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wireviz/wv_helper.py
View File

@ -137,7 +137,9 @@ def aspect_ratio(image_src):
return 1 # Assume 1:1 when unable to read actual image size return 1 # Assume 1:1 when unable to read actual image size
def smart_file_resolve(filename: str, possible_paths: List[str]) -> Path: def smart_file_resolve(filename: str, possible_paths: (str, List[str])) -> Path:
if not isinstance(possible_paths, List):
possible_paths = [possible_paths]
filename = Path(filename) filename = Path(filename)
if filename.is_absolute(): if filename.is_absolute():
if filename.exists(): if filename.exists():
@ -145,7 +147,7 @@ def smart_file_resolve(filename: str, possible_paths: List[str]) -> Path:
else: else:
raise Exception(f'{filename} does not exist.') raise Exception(f'{filename} does not exist.')
else: # search all possible paths in decreasing order of precedence else: # search all possible paths in decreasing order of precedence
possible_paths = [Path(path).resolve() for path in possible_paths] 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():