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

Moved some code into its own function

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-03-14 14:36:33 +01:00
parent 8340df129d
commit 9ceb42af2f
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
blender_asset_tracer/cli/pack.py
View File

@ -49,15 +49,7 @@ def create_packer(args, bpath: pathlib.Path, ppath: pathlib.Path,
if args.noop: if args.noop:
raise ValueError('S3 uploader does not support no-op.') raise ValueError('S3 uploader does not support no-op.')
from blender_asset_tracer.pack import s3 packer = create_s3packer(bpath, ppath, tpath)
# Split the target path into 's3:/', hostname, and actual target path
parts = tpath.parts
endpoint = parts[1]
tpath = pathlib.Path(*tpath.parts[2:])
log.info('Uploading to S3-compatible storage %s at %s', endpoint, tpath)
packer = s3.S3Packer(bpath, ppath, tpath, endpoint=endpoint) # type: pack.Packer
else: else:
packer = pack.Packer(bpath, ppath, tpath, args.noop) packer = pack.Packer(bpath, ppath, tpath, args.noop)
@ -71,6 +63,18 @@ def create_packer(args, bpath: pathlib.Path, ppath: pathlib.Path,
return packer return packer
def create_s3packer(bpath, ppath, tpath) -> pack.Packer:
from blender_asset_tracer.pack import s3
# Split the target path into 's3:/', hostname, and actual target path
parts = tpath.parts
endpoint = parts[1]
tpath = pathlib.Path(*tpath.parts[2:])
log.info('Uploading to S3-compatible storage %s at %s', endpoint, tpath)
return s3.S3Packer(bpath, ppath, tpath, endpoint=endpoint)
def paths_from_cli(args) -> typing.Tuple[pathlib.Path, pathlib.Path, pathlib.Path]: def paths_from_cli(args) -> typing.Tuple[pathlib.Path, pathlib.Path, pathlib.Path]:
"""Return paths to blendfile, project, and pack target. """Return paths to blendfile, project, and pack target.