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

Fixed task itteration

Browse source 
From the last PR (https://github.com/ynput/OpenPype/pull/4425) a comment-commit last second messed up and resultet in two lines being the same, crashing the script.
This fixes that.
This commit is contained in:
Jacob Danell 2023-03-06 14:50:00 +01:00 • committed by Milan Kolar
parent 3d933c66ce
commit acbfb5985b
1 changed files with 34 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

55
openpype/modules/kitsu/utils/update_op_with_zou.py
View file

@ -95,7 +95,8 @@ def update_op_assets(
op_asset = create_op_asset(item) op_asset = create_op_asset(item)
insert_result = dbcon.insert_one(op_asset) insert_result = dbcon.insert_one(op_asset)
item_doc = get_asset_by_id( item_doc = get_asset_by_id(
project_name, insert_result.inserted_id) project_name, insert_result.inserted_id
)
# Update asset # Update asset
item_data = deepcopy(item_doc["data"]) item_data = deepcopy(item_doc["data"])
@ -133,39 +134,47 @@ def update_op_assets(
try: try:
fps = float(item_data.get("fps")) fps = float(item_data.get("fps"))
except (TypeError, ValueError): except (TypeError, ValueError):
fps = float(gazu_project.get( fps = float(
"fps", project_doc["data"].get("fps", 25))) gazu_project.get("fps", project_doc["data"].get("fps", 25))
)
item_data["fps"] = fps item_data["fps"] = fps
# Resolution, fall back to project default # Resolution, fall back to project default
match_res = re.match( match_res = re.match(
r"(\d+)x(\d+)", r"(\d+)x(\d+)",
item_data.get("resolution", gazu_project.get("resolution")) item_data.get("resolution", gazu_project.get("resolution")),
) )
if match_res: if match_res:
item_data["resolutionWidth"] = int(match_res.group(1)) item_data["resolutionWidth"] = int(match_res.group(1))
item_data["resolutionHeight"] = int(match_res.group(2)) item_data["resolutionHeight"] = int(match_res.group(2))
else: else:
item_data["resolutionWidth"] = project_doc["data"].get( item_data["resolutionWidth"] = project_doc["data"].get(
"resolutionWidth") "resolutionWidth"
)
item_data["resolutionHeight"] = project_doc["data"].get( item_data["resolutionHeight"] = project_doc["data"].get(
"resolutionHeight") "resolutionHeight"
)
# Properties that doesn't fully exist in Kitsu. # Properties that doesn't fully exist in Kitsu.
# Guessing those property names below: # Guessing those property names below:
# Pixel Aspect Ratio # Pixel Aspect Ratio
item_data["pixelAspect"] = item_data.get( item_data["pixelAspect"] = item_data.get(
"pixel_aspect", project_doc["data"].get("pixelAspect")) "pixel_aspect", project_doc["data"].get("pixelAspect")
)
# Handle Start # Handle Start
item_data["handleStart"] = item_data.get( item_data["handleStart"] = item_data.get(
"handle_start", project_doc["data"].get("handleStart")) "handle_start", project_doc["data"].get("handleStart")
)
# Handle End # Handle End
item_data["handleEnd"] = item_data.get( item_data["handleEnd"] = item_data.get(
"handle_end", project_doc["data"].get("handleEnd")) "handle_end", project_doc["data"].get("handleEnd")
)
# Clip In # Clip In
item_data["clipIn"] = item_data.get( item_data["clipIn"] = item_data.get(
"clip_in", project_doc["data"].get("clipIn")) "clip_in", project_doc["data"].get("clipIn")
)
# Clip Out # Clip Out
item_data["clipOut"] = item_data.get( item_data["clipOut"] = item_data.get(
"clip_out", project_doc["data"].get("clipOut")) "clip_out", project_doc["data"].get("clipOut")
)
# Tasks # Tasks
tasks_list = [] tasks_list = []
@ -175,11 +184,9 @@ def update_op_assets(
elif item_type == "Shot": elif item_type == "Shot":
tasks_list = gazu.task.all_tasks_for_shot(item) tasks_list = gazu.task.all_tasks_for_shot(item)
item_data["tasks"] = { item_data["tasks"] = {
item_data["tasks"] = { t["task_type_name"]: {
t["task_type_name"]: { "type": t["task_type_name"],
"type": t["task_type_name"], "zou": gazu.task.get_task(t["id"]),
"zou": gazu.task.get_task(t["id"]),
}
} }
for t in tasks_list for t in tasks_list
} }
@ -218,7 +225,9 @@ def update_op_assets(
if parent_zou_id_dict is not None: if parent_zou_id_dict is not None:
visual_parent_doc_id = ( visual_parent_doc_id = (
parent_zou_id_dict.get("_id") parent_zou_id_dict.get("_id")
if parent_zou_id_dict else None) if parent_zou_id_dict
else None
)
if visual_parent_doc_id is None: if visual_parent_doc_id is None:
# Find root folder doc ("Assets" or "Shots") # Find root folder doc ("Assets" or "Shots")
@ -345,7 +354,8 @@ def write_project_to_op(project: dict, dbcon: AvalonMongoDB) -> UpdateOne:
def sync_all_projects( def sync_all_projects(
login: str, password: str, ignore_projects: list = None): login: str, password: str, ignore_projects: list = None
):
"""Update all OP projects in DB with Zou data. """Update all OP projects in DB with Zou data.
Args: Args:
@ -390,7 +400,7 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
if not project: if not project:
project = gazu.project.get_project_by_name(project["name"]) project = gazu.project.get_project_by_name(project["name"])
log.info("Synchronizing {}...".format(project['name'])) log.info("Synchronizing {}...".format(project["name"]))
# Get all assets from zou # Get all assets from zou
all_assets = gazu.asset.all_assets_for_project(project) all_assets = gazu.asset.all_assets_for_project(project)
@ -473,8 +483,11 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
[ [
UpdateOne({"_id": id}, update) UpdateOne({"_id": id}, update)
for id, update in update_op_assets( for id, update in update_op_assets(
dbcon, project, project_dict, dbcon,
all_entities, zou_ids_and_asset_docs project,
project_dict,
all_entities,
zou_ids_and_asset_docs,
) )
] ]
) )