Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4153 from pypeclub/bugfix/ftrack_sync_parents_issue

Browse source 
Ftrack: Fix occational double parents issue
This commit is contained in:
Jakub Trllo 2022-12-01 16:18:04 +01:00 • committed by GitHub
commit 4705e6a63d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
openpype/modules/ftrack/lib/avalon_sync.py
View file

@ -1556,7 +1556,7 @@ class SyncEntitiesFactory:
deleted_entities.append(mongo_id) deleted_entities.append(mongo_id)
av_ent = self.avalon_ents_by_id[mongo_id] av_ent = self.avalon_ents_by_id[mongo_id]
av_ent_path_items = [p for p in av_ent["data"]["parents"]] av_ent_path_items = list(av_ent["data"]["parents"])
av_ent_path_items.append(av_ent["name"]) av_ent_path_items.append(av_ent["name"])
self.log.debug("Deleted <{}>".format("/".join(av_ent_path_items))) self.log.debug("Deleted <{}>".format("/".join(av_ent_path_items)))
@ -1855,7 +1855,7 @@ class SyncEntitiesFactory:
_vis_par = _avalon_ent["data"]["visualParent"] _vis_par = _avalon_ent["data"]["visualParent"]
_name = _avalon_ent["name"] _name = _avalon_ent["name"]
if _name in self.all_ftrack_names: if _name in self.all_ftrack_names:
av_ent_path_items = _avalon_ent["data"]["parents"] av_ent_path_items = list(_avalon_ent["data"]["parents"])
av_ent_path_items.append(_name) av_ent_path_items.append(_name)
av_ent_path = "/".join(av_ent_path_items) av_ent_path = "/".join(av_ent_path_items)
# TODO report # TODO report
@ -1997,7 +1997,7 @@ class SyncEntitiesFactory:
{"_id": mongo_id}, {"_id": mongo_id},
item item
)) ))
av_ent_path_items = item["data"]["parents"] av_ent_path_items = list(item["data"]["parents"])
av_ent_path_items.append(item["name"]) av_ent_path_items.append(item["name"])
av_ent_path = "/".join(av_ent_path_items) av_ent_path = "/".join(av_ent_path_items)
self.log.debug( self.log.debug(
@ -2110,6 +2110,7 @@ class SyncEntitiesFactory:
entity_dict = self.entities_dict[ftrack_id] entity_dict = self.entities_dict[ftrack_id]
final_parents = entity_dict["final_entity"]["data"]["parents"]
if archived_by_id: if archived_by_id:
# if is changeable then unarchive (nothing to check here) # if is changeable then unarchive (nothing to check here)
if self.changeability_by_mongo_id[mongo_id]: if self.changeability_by_mongo_id[mongo_id]:
@ -2123,10 +2124,8 @@ class SyncEntitiesFactory:
archived_name = archived_by_id["name"] archived_name = archived_by_id["name"]
if ( if (
archived_name != entity_dict["name"] or archived_name != entity_dict["name"]
archived_parents != entity_dict["final_entity"]["data"][ or archived_parents != final_parents
"parents"
]
): ):
return None return None
@ -2136,11 +2135,7 @@ class SyncEntitiesFactory:
for archived in archived_by_name: for archived in archived_by_name:
mongo_id = str(archived["_id"]) mongo_id = str(archived["_id"])
archived_parents = archived.get("data", {}).get("parents") archived_parents = archived.get("data", {}).get("parents")
if ( if archived_parents == final_parents:
archived_parents == entity_dict["final_entity"]["data"][
"parents"
]
):
return mongo_id return mongo_id
# Secondly try to find more close to current ftrack entity # Secondly try to find more close to current ftrack entity
@ -2350,8 +2345,7 @@ class SyncEntitiesFactory:
continue continue
changed = True changed = True
parents = [par for par in _parents] parents = list(_parents)
hierarchy = "/".join(parents)
self.entities_dict[ftrack_id][ self.entities_dict[ftrack_id][
"final_entity"]["data"]["parents"] = parents "final_entity"]["data"]["parents"] = parents