reuse already available variables

This commit is contained in:
iLLiCiTiT 2021-11-29 13:09:00 +01:00
parent 41a02fddc4
commit 41c1f6a2d1
2 changed files with 14 additions and 15 deletions

View file

@ -479,16 +479,17 @@ def get_workdir_data(project_doc, asset_doc, task_name, host_name):
Returns:
dict: Data prepared for filling workdir template.
"""
hierarchy = "/".join(asset_doc["data"]["parents"])
task_type = asset_doc['data']['tasks'].get(task_name, {}).get('type')
project_task_types = project_doc["config"]["tasks"]
task_code = project_task_types.get(task_type, {}).get("short_name")
parent = project_doc["name"]
if len(asset_doc["data"]["parents"]) != 0:
parent = asset_doc["data"]["parents"][-1]
asset_parents = asset_doc["data"]["parents"]
hierarchy = "/".join(asset_parents)
parent_name = project_doc["name"]
if asset_parents:
parent_name = asset_parents[-1]
data = {
"project": {
@ -501,7 +502,7 @@ def get_workdir_data(project_doc, asset_doc, task_name, host_name):
"short": task_code,
},
"asset": asset_doc["name"],
"parent": parent,
"parent": parent_name,
"app": host_name,
"user": getpass.getuser(),
"hierarchy": hierarchy,

View file

@ -49,20 +49,18 @@ class CollectAnatomyContextData(pyblish.api.ContextPlugin):
project_entity = context.data["projectEntity"]
asset_entity = context.data["assetEntity"]
hierarchy_items = asset_entity["data"]["parents"]
hierarchy = ""
if hierarchy_items:
hierarchy = os.path.join(*hierarchy_items)
asset_tasks = asset_entity["data"]["tasks"]
task_type = asset_tasks.get(task_name, {}).get("type")
project_task_types = project_entity["config"]["tasks"]
task_code = project_task_types.get(task_type, {}).get("short_name")
parent = project_entity["name"]
if len(asset_entity["data"]["parents"]) != 0:
parent = asset_entity["data"]["parents"][-1]
asset_parents = asset_entity["data"]["parents"]
hierarchy = "/".join(asset_parents)
parent_name = project_entity["name"]
if asset_parents:
parent_name = asset_parents[-1]
context_data = {
"project": {
@ -70,7 +68,7 @@ class CollectAnatomyContextData(pyblish.api.ContextPlugin):
"code": project_entity["data"].get("code")
},
"asset": asset_entity["name"],
"parent": parent,
"parent": parent_name,
"hierarchy": hierarchy.replace("\\", "/"),
"task": {
"name": task_name,