diff --git a/client/ayon_traypublisher/plugins/create/create_editorial.py b/client/ayon_traypublisher/plugins/create/create_editorial.py index 1be0140..e2cda49 100644 --- a/client/ayon_traypublisher/plugins/create/create_editorial.py +++ b/client/ayon_traypublisher/plugins/create/create_editorial.py @@ -35,25 +35,55 @@ {"value": 24, "label": "24"}, {"value": 25, "label": "25"}, {"value": 29.97, "label": "29.97"}, - {"value": 30, "label": "30"} + {"value": 30, "label": "30"}, ], - label="FPS" + label="FPS", ), + NumberDef("workfile_start_frame", default=1001, label="Workfile start frame"), + NumberDef("handle_start", default=0, label="Handle start"), + NumberDef("handle_end", default=0, label="Handle end"), NumberDef( - "workfile_start_frame", - default=1001, - label="Workfile start frame" + "frameStart", + default=0, + label="Frame start", + disabled=True, + ), + NumberDef( + "frameEnd", + default=0, + label="Frame end", + disabled=True, + ), + NumberDef( + "clipIn", + default=0, + label="Clip in", + disabled=True, + ), + NumberDef( + "clipOut", + default=0, + label="Clip out", + disabled=True, ), NumberDef( - "handle_start", + "clipDuration", default=0, - label="Handle start" + label="Clip duration", + disabled=True, ), NumberDef( - "handle_end", + "sourceIn", default=0, - label="Handle end" - ) + label="Media source in", + disabled=True, + ), + NumberDef( + "sourceOut", + default=0, + label="Media source out", + disabled=True, + ), ] @@ -79,7 +109,12 @@ def get_instance_attr_defs(self): "add_review_family", default=True, label="Review" - ) + ), + TextDef( + "parent_instance", + label="Linked to", + disabled=True + ), ] @@ -96,7 +131,8 @@ def get_instance_attr_defs(self): instance_attributes = [ TextDef( "folderPath", - label="Folder path" + label="Folder path", + disabled=True, ) ] instance_attributes.extend(CLIP_ATTR_DEFS) @@ -318,7 +354,6 @@ def _get_path_from_file_data(self, file_path_data, multi=False): """ return_path_list = [] - if isinstance(file_path_data, list): return_path_list = [ os.path.join(f["directory"], f["filenames"][0]) diff --git a/client/ayon_traypublisher/plugins/publish/collect_shot_instances.py b/client/ayon_traypublisher/plugins/publish/collect_shot_instances.py index 4bcdc75..f354cc8 100644 --- a/client/ayon_traypublisher/plugins/publish/collect_shot_instances.py +++ b/client/ayon_traypublisher/plugins/publish/collect_shot_instances.py @@ -132,6 +132,7 @@ def _solve_inputs_to_data(self, instance): "sourceOut": _cr_attrs["sourceOut"], "workfileFrameStart": workfile_start_frame, "folderPath": _cr_attrs["folderPath"], + "integrate": False, } def _solve_hierarchy_context(self, instance):