Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
Milan Kolar 2021-01-06 13:20:55 +01:00
commit c0de00ddee
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pype/modules/ftrack/lib/avalon_sync.py
View file

@ -284,7 +284,7 @@ class SyncEntitiesFactory:
" from Project where full_name is \"{}\""
)
entities_query = (
"select id, name, parent_id, link"
"select id, name, type_id, parent_id, link"
" from TypedContext where project_id is \"{}\""
)
ignore_custom_attr_key = "avalon_ignore_sync"
@ -399,11 +399,6 @@ class SyncEntitiesFactory:
"message": "Synchronization failed"
}
# Find all entities in project
all_project_entities = self.session.query(
self.entities_query.format(ft_project_id)
).all()
# Store entities by `id` and `parent_id`
entities_dict = collections.defaultdict(lambda: {
"children": list(),
@ -417,6 +412,15 @@ class SyncEntitiesFactory:
"tasks": {}
})
# Find all entities in project
all_project_entities = self.session.query(
self.entities_query.format(ft_project_id)
).all()
task_types = self.session.query("select id, name from Type").all()
task_type_names_by_id = {
task_type["id"]: task_type["name"]
for task_type in task_types
}
for entity in all_project_entities:
parent_id = entity["parent_id"]
entity_type = entity.entity_type
@ -426,7 +430,8 @@ class SyncEntitiesFactory:
elif entity_type_low == "task":
# enrich task info with additional metadata
task = {"type": entity["type"]["name"]}
task_type_name = task_type_names_by_id[entity["type_id"]]
task = {"type": task_type_name}
entities_dict[parent_id]["tasks"][entity["name"]] = task
continue