autour_de_minuit/blender-asset-tracer
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixed issues with relative paths to blend files

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-03-20 17:57:41 +01:00
parent 56fb89da3d
commit cd32442f5a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
blender_asset_tracer/cli/pack.py
View File

@ -106,6 +106,7 @@ def paths_from_cli(args) -> typing.Tuple[pathlib.Path, pathlib.Path, pathlib.Pat
if bpath.is_dir(): if bpath.is_dir():
log.critical('%s is a directory, should be a blend file') log.critical('%s is a directory, should be a blend file')
sys.exit(3) sys.exit(3)
bpath = bpath.absolute().resolve()
tpath = args.target tpath = args.target
if tpath.exists() and not tpath.is_dir(): if tpath.exists() and not tpath.is_dir():
@ -113,22 +114,21 @@ def paths_from_cli(args) -> typing.Tuple[pathlib.Path, pathlib.Path, pathlib.Pat
sys.exit(4) sys.exit(4)
if args.project is None: if args.project is None:
ppath = bpath.absolute().parent ppath = bpath.absolute().parent.resolve()
log.warning('No project path given, using %s', ppath) log.warning('No project path given, using %s', ppath)
else: else:
ppath = args.project ppath = args.project.absolute().resolve()
if not ppath.exists(): if not ppath.exists():
log.critical('Project directory %s does not exist', ppath) log.critical('Project directory %s does not exist', ppath)
sys.exit(5) sys.exit(5)
ppath = ppath.absolute().resolve()
if not ppath.is_dir(): if not ppath.is_dir():
log.warning('Project path %s is not a directory; using the parent %s', ppath, ppath.parent) log.warning('Project path %s is not a directory; using the parent %s', ppath, ppath.parent)
ppath = ppath.parent ppath = ppath.parent
try: try:
bpath.absolute().relative_to(ppath) bpath.relative_to(ppath)
except ValueError: except ValueError:
log.critical('Project directory %s does not contain blend file %s', log.critical('Project directory %s does not contain blend file %s',
args.project, bpath.absolute()) args.project, bpath.absolute())