Merged in feature/PYPE-128_templates_from_anatomy_when_sync (pull request #62)

Feature/PYPE-128 templates from anatomy when sync

Approved-by: Milan Kolar <milan@orbi.tools>
This commit is contained in:
Jakub Trllo 2019-02-11 22:23:56 +00:00 committed by Milan Kolar
commit 22fb2df691
2 changed files with 9 additions and 11 deletions

View file

@ -424,14 +424,13 @@ def get_avalon_project_template():
"""
template = Templates(type=["anatomy"])
proj_template = {}
# TODO this down should work but it can't be in default.toml:
# - Raises error when App (e.g. Nuke) is started
# proj_template['workfile'] = template.anatomy.avalon.workfile
# proj_template['work'] = template.anatomy.avalon.work
# proj_template['publish'] = template.anatomy.avalon.publish
proj_template['workfile'] = "{asset[name]}_{task[name]}_v{version:0>3}<_{comment}>"
proj_template['work'] = "{root}/{project}/{hierarchy}/{asset}/work/{task}"
proj_template['publish'] = "{root}/{project}/{hierarchy}/{asset}/publish/{family}/{subset}/v{version}/{projectcode}_{asset}_{subset}_v{version}.{representation}"
proj_template['workfile'] = template.anatomy.avalon.workfile
proj_template['work'] = template.anatomy.avalon.work
proj_template['publish'] = template.anatomy.avalon.publish
# Old - hardcoded = BackUp
# proj_template['workfile'] = "{asset[name]}_{task[name]}_v{version:0>3}<_{comment}>"
# proj_template['work'] = "{root}/{project}/{hierarchy}/{asset}/work/{task}"
# proj_template['publish'] = "{root}/{project}/{hierarchy}/{asset}/publish/{family}/{subset}/v{version}/{projectcode}_{asset}_{subset}_v{version}.{representation}"
return proj_template

View file

@ -268,10 +268,9 @@ def get_workdir_template(data=None):
anatomy = api.Anatomy
try:
anatomy = anatomy.format(data or get_context_data())
work = anatomy.work.format(data or get_context_data())
except Exception as e:
log.error("{0} Error in "
"get_workdir_template(): {1}".format(__name__, e))
return os.path.join(anatomy.work.root,
anatomy.work.folder)
return os.path.join(work.root, work.folder)