-This node is maintained by OpenPype Publisher.
-To remove it use Publisher gui.
-
- """)
- node.addKnob(info_knob)
-
def check_existing_subset(self, subset_name):
"""Make sure subset name is unique.
@@ -153,8 +139,6 @@ class NukeCreator(NewCreator):
created_node = nuke.createNode(node_type)
created_node["name"].setValue(node_name)
- self.add_info_knob(created_node)
-
for key, values in node_knobs.items():
if key in created_node.knobs():
created_node["key"].setValue(values)
diff --git a/openpype/hosts/nuke/api/utils.py b/openpype/hosts/nuke/api/utils.py
index 2b3c35c23a..7b02585892 100644
--- a/openpype/hosts/nuke/api/utils.py
+++ b/openpype/hosts/nuke/api/utils.py
@@ -2,7 +2,7 @@ import os
import nuke
from openpype import resources
-from .lib import maintained_selection
+from qtpy import QtWidgets
def set_context_favorites(favorites=None):
@@ -55,6 +55,7 @@ def bake_gizmos_recursively(in_group=None):
Arguments:
is_group (nuke.Node)[optonal]: group node or all nodes
"""
+ from .lib import maintained_selection
if in_group is None:
in_group = nuke.Root()
# preserve selection after all is done
@@ -129,3 +130,11 @@ def get_colorspace_list(colorspace_knob):
reduced_clrs.append(clrs)
return reduced_clrs
+
+
+def is_headless():
+ """
+ Returns:
+ bool: headless
+ """
+ return QtWidgets.QApplication.instance() is None
diff --git a/openpype/hosts/nuke/api/workfile_template_builder.py b/openpype/hosts/nuke/api/workfile_template_builder.py
index 72d4ffb476..766fb0bc47 100644
--- a/openpype/hosts/nuke/api/workfile_template_builder.py
+++ b/openpype/hosts/nuke/api/workfile_template_builder.py
@@ -25,6 +25,7 @@ from .lib import (
select_nodes,
duplicate_node,
node_tempfile,
+ get_main_window
)
PLACEHOLDER_SET = "PLACEHOLDERS_SET"
@@ -963,8 +964,9 @@ def update_workfile_template(*args):
def create_placeholder(*args):
host = registered_host()
builder = NukeTemplateBuilder(host)
- window = WorkfileBuildPlaceholderDialog(host, builder)
- window.exec_()
+ window = WorkfileBuildPlaceholderDialog(host, builder,
+ parent=get_main_window())
+ window.show()
def update_placeholder(*args):
@@ -988,6 +990,7 @@ def update_placeholder(*args):
raise ValueError("Too many selected nodes")
placeholder_item = placeholder_items[0]
- window = WorkfileBuildPlaceholderDialog(host, builder)
+ window = WorkfileBuildPlaceholderDialog(host, builder,
+ parent=get_main_window())
window.set_update_mode(placeholder_item)
window.exec_()
diff --git a/openpype/hosts/nuke/api/workio.py b/openpype/hosts/nuke/api/workio.py
index 5692f8e63c..8d29e0441f 100644
--- a/openpype/hosts/nuke/api/workio.py
+++ b/openpype/hosts/nuke/api/workio.py
@@ -1,6 +1,7 @@
"""Host API required Work Files tool"""
import os
import nuke
+from .utils import is_headless
def file_extensions():
@@ -25,6 +26,12 @@ def open_file(filepath):
# To remain in the same window, we have to clear the script and read
# in the contents of the workfile.
nuke.scriptClear()
+ if not is_headless():
+ autosave = nuke.toNode("preferences")["AutoSaveName"].evaluate()
+ autosave_prmpt = "Autosave detected.\nWould you like to load the autosave file?" # noqa
+ if os.path.isfile(autosave) and nuke.ask(autosave_prmpt):
+ filepath = autosave
+
nuke.scriptReadFile(filepath)
nuke.Root()["name"].setValue(filepath)
nuke.Root()["project_directory"].setValue(os.path.dirname(filepath))
diff --git a/openpype/hosts/nuke/plugins/create/create_backdrop.py b/openpype/hosts/nuke/plugins/create/create_backdrop.py
index ff415626be..52959bbef2 100644
--- a/openpype/hosts/nuke/plugins/create/create_backdrop.py
+++ b/openpype/hosts/nuke/plugins/create/create_backdrop.py
@@ -36,8 +36,6 @@ class CreateBackdrop(NukeCreator):
created_node["note_font_size"].setValue(24)
created_node["label"].setValue("[{}]".format(node_name))
- self.add_info_knob(created_node)
-
return created_node
def create(self, subset_name, instance_data, pre_create_data):
diff --git a/openpype/hosts/nuke/plugins/create/create_camera.py b/openpype/hosts/nuke/plugins/create/create_camera.py
index 5553645af6..b84280b11b 100644
--- a/openpype/hosts/nuke/plugins/create/create_camera.py
+++ b/openpype/hosts/nuke/plugins/create/create_camera.py
@@ -39,8 +39,6 @@ class CreateCamera(NukeCreator):
created_node["name"].setValue(node_name)
- self.add_info_knob(created_node)
-
return created_node
def create(self, subset_name, instance_data, pre_create_data):
diff --git a/openpype/hosts/nuke/plugins/create/create_gizmo.py b/openpype/hosts/nuke/plugins/create/create_gizmo.py
index e3ce70dd59..cbe2f635c9 100644
--- a/openpype/hosts/nuke/plugins/create/create_gizmo.py
+++ b/openpype/hosts/nuke/plugins/create/create_gizmo.py
@@ -40,8 +40,6 @@ class CreateGizmo(NukeCreator):
created_node["name"].setValue(node_name)
- self.add_info_knob(created_node)
-
return created_node
def create(self, subset_name, instance_data, pre_create_data):
diff --git a/openpype/hosts/nuke/plugins/create/create_model.py b/openpype/hosts/nuke/plugins/create/create_model.py
index 08a53abca2..a94c9f0313 100644
--- a/openpype/hosts/nuke/plugins/create/create_model.py
+++ b/openpype/hosts/nuke/plugins/create/create_model.py
@@ -40,8 +40,6 @@ class CreateModel(NukeCreator):
created_node["name"].setValue(node_name)
- self.add_info_knob(created_node)
-
return created_node
def create(self, subset_name, instance_data, pre_create_data):
diff --git a/openpype/hosts/nuke/plugins/create/create_source.py b/openpype/hosts/nuke/plugins/create/create_source.py
index 57504b5d53..8419c3ef33 100644
--- a/openpype/hosts/nuke/plugins/create/create_source.py
+++ b/openpype/hosts/nuke/plugins/create/create_source.py
@@ -32,7 +32,7 @@ class CreateSource(NukeCreator):
read_node["tile_color"].setValue(
int(self.node_color, 16))
read_node["name"].setValue(node_name)
- self.add_info_knob(read_node)
+
return read_node
def create(self, subset_name, instance_data, pre_create_data):
diff --git a/openpype/hosts/nuke/plugins/create/create_write_image.py b/openpype/hosts/nuke/plugins/create/create_write_image.py
index b74cea5dae..0c8adfb75c 100644
--- a/openpype/hosts/nuke/plugins/create/create_write_image.py
+++ b/openpype/hosts/nuke/plugins/create/create_write_image.py
@@ -86,7 +86,6 @@ class CreateWriteImage(napi.NukeWriteCreator):
"frame": nuke.frame()
}
)
- self.add_info_knob(created_node)
self._add_frame_range_limit(created_node, instance_data)
diff --git a/openpype/hosts/nuke/plugins/create/create_write_prerender.py b/openpype/hosts/nuke/plugins/create/create_write_prerender.py
index 387768b1dd..f46dd2d6d5 100644
--- a/openpype/hosts/nuke/plugins/create/create_write_prerender.py
+++ b/openpype/hosts/nuke/plugins/create/create_write_prerender.py
@@ -74,7 +74,6 @@ class CreateWritePrerender(napi.NukeWriteCreator):
"height": height
}
)
- self.add_info_knob(created_node)
self._add_frame_range_limit(created_node)
diff --git a/openpype/hosts/nuke/plugins/create/create_write_render.py b/openpype/hosts/nuke/plugins/create/create_write_render.py
index 09257f662e..c24405873a 100644
--- a/openpype/hosts/nuke/plugins/create/create_write_render.py
+++ b/openpype/hosts/nuke/plugins/create/create_write_render.py
@@ -66,7 +66,6 @@ class CreateWriteRender(napi.NukeWriteCreator):
"height": height
}
)
- self.add_info_knob(created_node)
self.integrate_links(created_node, outputs=False)
diff --git a/openpype/hosts/nuke/plugins/publish/extract_render_local.py b/openpype/hosts/nuke/plugins/publish/extract_render_local.py
index e5feda4cd8..e2cf2addc5 100644
--- a/openpype/hosts/nuke/plugins/publish/extract_render_local.py
+++ b/openpype/hosts/nuke/plugins/publish/extract_render_local.py
@@ -23,7 +23,7 @@ class NukeRenderLocal(publish.Extractor,
order = pyblish.api.ExtractorOrder
label = "Render Local"
hosts = ["nuke"]
- families = ["render.local", "prerender.local", "still.local"]
+ families = ["render.local", "prerender.local", "image.local"]
def process(self, instance):
child_nodes = (
@@ -136,9 +136,9 @@ class NukeRenderLocal(publish.Extractor,
families.remove('prerender.local')
families.insert(0, "prerender")
instance.data["anatomyData"]["family"] = "prerender"
- elif "still.local" in families:
+ elif "image.local" in families:
instance.data['family'] = 'image'
- families.remove('still.local')
+ families.remove('image.local')
instance.data["anatomyData"]["family"] = "image"
instance.data["families"] = families
diff --git a/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py b/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py
index f391ca1e7c..21eefda249 100644
--- a/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py
+++ b/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py
@@ -5,6 +5,8 @@ import pyblish.api
from openpype.pipeline import publish
from openpype.hosts.nuke import api as napi
+from openpype.hosts.nuke.api.lib import set_node_knobs_from_settings
+
if sys.version_info[0] >= 3:
unicode = str
@@ -28,7 +30,7 @@ class ExtractThumbnail(publish.Extractor):
bake_viewer_process = True
bake_viewer_input_process = True
nodes = {}
-
+ reposition_nodes = None
def process(self, instance):
if instance.data.get("farm"):
@@ -123,18 +125,32 @@ class ExtractThumbnail(publish.Extractor):
temporary_nodes.append(rnode)
previous_node = rnode
- reformat_node = nuke.createNode("Reformat")
- ref_node = self.nodes.get("Reformat", None)
- if ref_node:
- for k, v in ref_node:
- self.log.debug("k, v: {0}:{1}".format(k, v))
- if isinstance(v, unicode):
- v = str(v)
- reformat_node[k].setValue(v)
+ if self.reposition_nodes is None:
+ # [deprecated] create reformat node old way
+ reformat_node = nuke.createNode("Reformat")
+ ref_node = self.nodes.get("Reformat", None)
+ if ref_node:
+ for k, v in ref_node:
+ self.log.debug("k, v: {0}:{1}".format(k, v))
+ if isinstance(v, unicode):
+ v = str(v)
+ reformat_node[k].setValue(v)
- reformat_node.setInput(0, previous_node)
- previous_node = reformat_node
- temporary_nodes.append(reformat_node)
+ reformat_node.setInput(0, previous_node)
+ previous_node = reformat_node
+ temporary_nodes.append(reformat_node)
+ else:
+ # create reformat node new way
+ for repo_node in self.reposition_nodes:
+ node_class = repo_node["node_class"]
+ knobs = repo_node["knobs"]
+ node = nuke.createNode(node_class)
+ set_node_knobs_from_settings(node, knobs)
+
+ # connect in order
+ node.setInput(0, previous_node)
+ previous_node = node
+ temporary_nodes.append(node)
# only create colorspace baking if toggled on
if bake_viewer_process:
diff --git a/openpype/hosts/nuke/startup/__init__.py b/openpype/hosts/nuke/startup/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openpype/hosts/nuke/startup/custom_write_node.py b/openpype/hosts/nuke/startup/custom_write_node.py
new file mode 100644
index 0000000000..ea53725834
--- /dev/null
+++ b/openpype/hosts/nuke/startup/custom_write_node.py
@@ -0,0 +1,151 @@
+""" OpenPype custom script for setting up write nodes for non-publish """
+import os
+import nuke
+import nukescripts
+from openpype.pipeline import Anatomy
+from openpype.hosts.nuke.api.lib import (
+ set_node_knobs_from_settings,
+ get_nuke_imageio_settings
+)
+
+
+temp_rendering_path_template = (
+ "{work}/renders/nuke/{subset}/{subset}.{frame}.{ext}")
+
+knobs_setting = {
+ "knobs": [
+ {
+ "type": "text",
+ "name": "file_type",
+ "value": "exr"
+ },
+ {
+ "type": "text",
+ "name": "datatype",
+ "value": "16 bit half"
+ },
+ {
+ "type": "text",
+ "name": "compression",
+ "value": "Zip (1 scanline)"
+ },
+ {
+ "type": "bool",
+ "name": "autocrop",
+ "value": True
+ },
+ {
+ "type": "color_gui",
+ "name": "tile_color",
+ "value": [
+ 186,
+ 35,
+ 35,
+ 255
+ ]
+ },
+ {
+ "type": "text",
+ "name": "channels",
+ "value": "rgb"
+ },
+ {
+ "type": "bool",
+ "name": "create_directories",
+ "value": True
+ }
+ ]
+}
+
+
+class WriteNodeKnobSettingPanel(nukescripts.PythonPanel):
+ """ Write Node's Knobs Settings Panel """
+ def __init__(self):
+ nukescripts.PythonPanel.__init__(self, "Set Knobs Value(Write Node)")
+
+ preset_name, _ = self.get_node_knobs_setting()
+ # create knobs
+
+ self.selected_preset_name = nuke.Enumeration_Knob(
+ 'preset_selector', 'presets', preset_name)
+ # add knobs to panel
+ self.addKnob(self.selected_preset_name)
+
+ def process(self):
+ """ Process the panel values. """
+ write_selected_nodes = [
+ selected_nodes for selected_nodes in nuke.selectedNodes()
+ if selected_nodes.Class() == "Write"]
+
+ selected_preset = self.selected_preset_name.value()
+ ext = None
+ knobs = knobs_setting["knobs"]
+ preset_name, node_knobs_presets = (
+ self.get_node_knobs_setting(selected_preset)
+ )
+
+ if selected_preset and preset_name:
+ if not node_knobs_presets:
+ nuke.message(
+ "No knobs value found in subset group.."
+ "\nDefault setting will be used..")
+ else:
+ knobs = node_knobs_presets
+
+ ext_knob_list = [knob for knob in knobs if knob["name"] == "file_type"]
+ if not ext_knob_list:
+ nuke.message(
+ "ERROR: No file type found in the subset's knobs."
+ "\nPlease add one to complete setting up the node")
+ return
+ else:
+ for knob in ext_knob_list:
+ ext = knob["value"]
+
+ anatomy = Anatomy()
+
+ frame_padding = int(
+ anatomy.templates["render"].get(
+ "frame_padding"
+ )
+ )
+ for write_node in write_selected_nodes:
+ # data for mapping the path
+ data = {
+ "work": os.getenv("AVALON_WORKDIR"),
+ "subset": write_node["name"].value(),
+ "frame": "#" * frame_padding,
+ "ext": ext
+ }
+ file_path = temp_rendering_path_template.format(**data)
+ file_path = file_path.replace("\\", "/")
+ write_node["file"].setValue(file_path)
+ set_node_knobs_from_settings(write_node, knobs)
+
+ def get_node_knobs_setting(self, selected_preset=None):
+ preset_name = []
+ knobs_nodes = []
+ settings = [
+ node_settings for node_settings
+ in get_nuke_imageio_settings()["nodes"]["overrideNodes"]
+ if node_settings["nukeNodeClass"] == "Write"
+ and node_settings["subsets"]
+ ]
+ if not settings:
+ return
+
+ for i, _ in enumerate(settings):
+ if selected_preset in settings[i]["subsets"]:
+ knobs_nodes = settings[i]["knobs"]
+
+ for setting in settings:
+ for subset in setting["subsets"]:
+ preset_name.append(subset)
+
+ return preset_name, knobs_nodes
+
+
+def main():
+ p_ = WriteNodeKnobSettingPanel()
+ if p_.showModalDialog():
+ print(p_.process())
diff --git a/openpype/hosts/nuke/startup/frame_setting_for_read_nodes.py b/openpype/hosts/nuke/startup/frame_setting_for_read_nodes.py
new file mode 100644
index 0000000000..f0cbabe20f
--- /dev/null
+++ b/openpype/hosts/nuke/startup/frame_setting_for_read_nodes.py
@@ -0,0 +1,47 @@
+""" OpenPype custom script for resetting read nodes start frame values """
+
+import nuke
+import nukescripts
+
+
+class FrameSettingsPanel(nukescripts.PythonPanel):
+ """ Frame Settings Panel """
+ def __init__(self):
+ nukescripts.PythonPanel.__init__(self, "Set Frame Start (Read Node)")
+
+ # create knobs
+ self.frame = nuke.Int_Knob(
+ 'frame', 'Frame Number')
+ self.selected = nuke.Boolean_Knob("selection")
+ # add knobs to panel
+ self.addKnob(self.selected)
+ self.addKnob(self.frame)
+
+ # set values
+ self.selected.setValue(False)
+ self.frame.setValue(nuke.root().firstFrame())
+
+ def process(self):
+ """ Process the panel values. """
+ # get values
+ frame = self.frame.value()
+ if self.selected.value():
+ # selected nodes processing
+ if not nuke.selectedNodes():
+ return
+ for rn_ in nuke.selectedNodes():
+ if rn_.Class() != "Read":
+ continue
+ rn_["frame_mode"].setValue("start_at")
+ rn_["frame"].setValue(str(frame))
+ else:
+ # all nodes processing
+ for rn_ in nuke.allNodes(filter="Read"):
+ rn_["frame_mode"].setValue("start_at")
+ rn_["frame"].setValue(str(frame))
+
+
+def main():
+ p_ = FrameSettingsPanel()
+ if p_.showModalDialog():
+ print(p_.process())
diff --git a/openpype/hosts/resolve/api/__init__.py b/openpype/hosts/resolve/api/__init__.py
index 00a598548e..2b4546f8d6 100644
--- a/openpype/hosts/resolve/api/__init__.py
+++ b/openpype/hosts/resolve/api/__init__.py
@@ -24,6 +24,8 @@ from .lib import (
get_project_manager,
get_current_project,
get_current_timeline,
+ get_any_timeline,
+ get_new_timeline,
create_bin,
get_media_pool_item,
create_media_pool_item,
@@ -95,6 +97,8 @@ __all__ = [
"get_project_manager",
"get_current_project",
"get_current_timeline",
+ "get_any_timeline",
+ "get_new_timeline",
"create_bin",
"get_media_pool_item",
"create_media_pool_item",
diff --git a/openpype/hosts/resolve/api/lib.py b/openpype/hosts/resolve/api/lib.py
index b3ad20df39..a44c527f13 100644
--- a/openpype/hosts/resolve/api/lib.py
+++ b/openpype/hosts/resolve/api/lib.py
@@ -15,6 +15,7 @@ log = Logger.get_logger(__name__)
self = sys.modules[__name__]
self.project_manager = None
self.media_storage = None
+self.current_project = None
# OpenPype sequential rename variables
self.rename_index = 0
@@ -85,22 +86,60 @@ def get_media_storage():
def get_current_project():
- # initialize project manager
- get_project_manager()
+ """Get current project object.
+ """
+ if not self.current_project:
+ self.current_project = get_project_manager().GetCurrentProject()
- return self.project_manager.GetCurrentProject()
+ return self.current_project
def get_current_timeline(new=False):
- # get current project
+ """Get current timeline object.
+
+ Args:
+ new (bool)[optional]: [DEPRECATED] if True it will create
+ new timeline if none exists
+
+ Returns:
+ TODO: will need to reflect future `None`
+ object: resolve.Timeline
+ """
project = get_current_project()
+ timeline = project.GetCurrentTimeline()
+ # return current timeline if any
+ if timeline:
+ return timeline
+
+ # TODO: [deprecated] and will be removed in future
if new:
- media_pool = project.GetMediaPool()
- new_timeline = media_pool.CreateEmptyTimeline(self.pype_timeline_name)
- project.SetCurrentTimeline(new_timeline)
+ return get_new_timeline()
- return project.GetCurrentTimeline()
+
+def get_any_timeline():
+ """Get any timeline object.
+
+ Returns:
+ object | None: resolve.Timeline
+ """
+ project = get_current_project()
+ timeline_count = project.GetTimelineCount()
+ if timeline_count > 0:
+ return project.GetTimelineByIndex(1)
+
+
+def get_new_timeline():
+ """Get new timeline object.
+
+ Returns:
+ object: resolve.Timeline
+ """
+ project = get_current_project()
+ media_pool = project.GetMediaPool()
+ new_timeline = media_pool.CreateEmptyTimeline(self.pype_timeline_name)
+ project.SetCurrentTimeline(new_timeline)
+ return new_timeline
def create_bin(name: str, root: object = None) -> object:
@@ -312,7 +351,13 @@ def get_current_timeline_items(
track_type = track_type or "video"
selecting_color = selecting_color or "Chocolate"
project = get_current_project()
- timeline = get_current_timeline()
+
+ # get timeline anyhow
+ timeline = (
+ get_current_timeline() or
+ get_any_timeline() or
+ get_new_timeline()
+ )
selected_clips = []
# get all tracks count filtered by track type
diff --git a/openpype/hosts/resolve/api/plugin.py b/openpype/hosts/resolve/api/plugin.py
index 609cff60f7..e5846c2fc2 100644
--- a/openpype/hosts/resolve/api/plugin.py
+++ b/openpype/hosts/resolve/api/plugin.py
@@ -327,7 +327,10 @@ class ClipLoader:
self.active_timeline = options["timeline"]
else:
# create new sequence
- self.active_timeline = lib.get_current_timeline(new=True)
+ self.active_timeline = (
+ lib.get_current_timeline() or
+ lib.get_new_timeline()
+ )
else:
self.active_timeline = lib.get_current_timeline()
diff --git a/openpype/hosts/resolve/api/workio.py b/openpype/hosts/resolve/api/workio.py
index 5ce73eea53..5966fa6a43 100644
--- a/openpype/hosts/resolve/api/workio.py
+++ b/openpype/hosts/resolve/api/workio.py
@@ -43,18 +43,22 @@ def open_file(filepath):
"""
Loading project
"""
+
+ from . import bmdvr
+
pm = get_project_manager()
+ page = bmdvr.GetCurrentPage()
+ if page is not None:
+ # Save current project only if Resolve has an active page, otherwise
+ # we consider Resolve being in a pre-launch state (no open UI yet)
+ project = pm.GetCurrentProject()
+ print(f"Saving current project: {project}")
+ pm.SaveProject()
+
file = os.path.basename(filepath)
fname, _ = os.path.splitext(file)
dname, _ = fname.split("_v")
-
- # deal with current project
- project = pm.GetCurrentProject()
- log.info(f"Test `pm`: {pm}")
- pm.SaveProject()
-
try:
- log.info(f"Test `dname`: {dname}")
if not set_project_manager_to_folder_name(dname):
raise
# load project from input path
@@ -72,6 +76,7 @@ def open_file(filepath):
return False
return True
+
def current_file():
pm = get_project_manager()
current_dir = os.getenv("AVALON_WORKDIR")
diff --git a/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py b/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py
new file mode 100644
index 0000000000..0e27ddb8c3
--- /dev/null
+++ b/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py
@@ -0,0 +1,45 @@
+import os
+
+from openpype.lib import PreLaunchHook
+import openpype.hosts.resolve
+
+
+class ResolveLaunchLastWorkfile(PreLaunchHook):
+ """Special hook to open last workfile for Resolve.
+
+ Checks 'start_last_workfile', if set to False, it will not open last
+ workfile. This property is set explicitly in Launcher.
+ """
+
+ # Execute after workfile template copy
+ order = 10
+ app_groups = ["resolve"]
+
+ def execute(self):
+ if not self.data.get("start_last_workfile"):
+ self.log.info("It is set to not start last workfile on start.")
+ return
+
+ last_workfile = self.data.get("last_workfile_path")
+ if not last_workfile:
+ self.log.warning("Last workfile was not collected.")
+ return
+
+ if not os.path.exists(last_workfile):
+ self.log.info("Current context does not have any workfile yet.")
+ return
+
+ # Add path to launch environment for the startup script to pick up
+ self.log.info(f"Setting OPENPYPE_RESOLVE_OPEN_ON_LAUNCH to launch "
+ f"last workfile: {last_workfile}")
+ key = "OPENPYPE_RESOLVE_OPEN_ON_LAUNCH"
+ self.launch_context.env[key] = last_workfile
+
+ # Set the openpype prelaunch startup script path for easy access
+ # in the LUA .scriptlib code
+ op_resolve_root = os.path.dirname(openpype.hosts.resolve.__file__)
+ script_path = os.path.join(op_resolve_root, "startup.py")
+ key = "OPENPYPE_RESOLVE_STARTUP_SCRIPT"
+ self.launch_context.env[key] = script_path
+ self.log.info("Setting OPENPYPE_RESOLVE_STARTUP_SCRIPT to: "
+ f"{script_path}")
diff --git a/openpype/hosts/resolve/hooks/pre_resolve_setup.py b/openpype/hosts/resolve/hooks/pre_resolve_setup.py
index 8574b3ad01..d066fc2da2 100644
--- a/openpype/hosts/resolve/hooks/pre_resolve_setup.py
+++ b/openpype/hosts/resolve/hooks/pre_resolve_setup.py
@@ -1,4 +1,5 @@
import os
+from pathlib import Path
import platform
from openpype.lib import PreLaunchHook
from openpype.hosts.resolve.utils import setup
@@ -6,33 +7,57 @@ from openpype.hosts.resolve.utils import setup
class ResolvePrelaunch(PreLaunchHook):
"""
- This hook will check if current workfile path has Resolve
- project inside. IF not, it initialize it and finally it pass
- path to the project by environment variable to Premiere launcher
- shell script.
+ This hook will set up the Resolve scripting environment as described in
+ Resolve's documentation found with the installed application at
+ {resolve}/Support/Developer/Scripting/README.txt
+
+ Prepares the following environment variables:
+ - `RESOLVE_SCRIPT_API`
+ - `RESOLVE_SCRIPT_LIB`
+
+ It adds $RESOLVE_SCRIPT_API/Modules to PYTHONPATH.
+
+ Additionally it sets up the Python home for Python 3 based on the
+ RESOLVE_PYTHON3_HOME in the environment (usually defined in OpenPype's
+ Application environment for Resolve by the admin). For this it sets
+ PYTHONHOME and PATH variables.
+
+ It also defines:
+ - `RESOLVE_UTILITY_SCRIPTS_DIR`: Destination directory for OpenPype
+ Fusion scripts to be copied to for Resolve to pick them up.
+ - `OPENPYPE_LOG_NO_COLORS` to True to ensure OP doesn't try to
+ use logging with terminal colors as it fails in Resolve.
+
"""
+
app_groups = ["resolve"]
def execute(self):
current_platform = platform.system().lower()
- PROGRAMDATA = self.launch_context.env.get("PROGRAMDATA", "")
- RESOLVE_SCRIPT_API_ = {
+ programdata = self.launch_context.env.get("PROGRAMDATA", "")
+ resolve_script_api_locations = {
"windows": (
- f"{PROGRAMDATA}/Blackmagic Design/"
+ f"{programdata}/Blackmagic Design/"
"DaVinci Resolve/Support/Developer/Scripting"
),
"darwin": (
"/Library/Application Support/Blackmagic Design"
"/DaVinci Resolve/Developer/Scripting"
),
- "linux": "/opt/resolve/Developer/Scripting"
+ "linux": "/opt/resolve/Developer/Scripting",
}
- RESOLVE_SCRIPT_API = os.path.normpath(
- RESOLVE_SCRIPT_API_[current_platform])
- self.launch_context.env["RESOLVE_SCRIPT_API"] = RESOLVE_SCRIPT_API
+ resolve_script_api = Path(
+ resolve_script_api_locations[current_platform]
+ )
+ self.log.info(
+ f"setting RESOLVE_SCRIPT_API variable to {resolve_script_api}"
+ )
+ self.launch_context.env[
+ "RESOLVE_SCRIPT_API"
+ ] = resolve_script_api.as_posix()
- RESOLVE_SCRIPT_LIB_ = {
+ resolve_script_lib_dirs = {
"windows": (
"C:/Program Files/Blackmagic Design"
"/DaVinci Resolve/fusionscript.dll"
@@ -41,61 +66,69 @@ class ResolvePrelaunch(PreLaunchHook):
"/Applications/DaVinci Resolve/DaVinci Resolve.app"
"/Contents/Libraries/Fusion/fusionscript.so"
),
- "linux": "/opt/resolve/libs/Fusion/fusionscript.so"
+ "linux": "/opt/resolve/libs/Fusion/fusionscript.so",
}
- RESOLVE_SCRIPT_LIB = os.path.normpath(
- RESOLVE_SCRIPT_LIB_[current_platform])
- self.launch_context.env["RESOLVE_SCRIPT_LIB"] = RESOLVE_SCRIPT_LIB
+ resolve_script_lib = Path(resolve_script_lib_dirs[current_platform])
+ self.launch_context.env[
+ "RESOLVE_SCRIPT_LIB"
+ ] = resolve_script_lib.as_posix()
+ self.log.info(
+ f"setting RESOLVE_SCRIPT_LIB variable to {resolve_script_lib}"
+ )
- # TODO: add OTIO installation from `openpype/requirements.py`
+ # TODO: add OTIO installation from `openpype/requirements.py`
# making sure python <3.9.* is installed at provided path
- python3_home = os.path.normpath(
- self.launch_context.env.get("RESOLVE_PYTHON3_HOME", ""))
+ python3_home = Path(
+ self.launch_context.env.get("RESOLVE_PYTHON3_HOME", "")
+ )
- assert os.path.isdir(python3_home), (
+ assert python3_home.is_dir(), (
"Python 3 is not installed at the provided folder path. Either "
"make sure the `environments\resolve.json` is having correctly "
"set `RESOLVE_PYTHON3_HOME` or make sure Python 3 is installed "
f"in given path. \nRESOLVE_PYTHON3_HOME: `{python3_home}`"
)
- self.launch_context.env["PYTHONHOME"] = python3_home
- self.log.info(f"Path to Resolve Python folder: `{python3_home}`...")
-
- # add to the python path to path
- env_path = self.launch_context.env["PATH"]
- self.launch_context.env["PATH"] = os.pathsep.join([
- python3_home,
- os.path.join(python3_home, "Scripts")
- ] + env_path.split(os.pathsep))
-
- self.log.debug(f"PATH: {self.launch_context.env['PATH']}")
+ python3_home_str = python3_home.as_posix()
+ self.launch_context.env["PYTHONHOME"] = python3_home_str
+ self.log.info(f"Path to Resolve Python folder: `{python3_home_str}`")
# add to the PYTHONPATH
env_pythonpath = self.launch_context.env["PYTHONPATH"]
- self.launch_context.env["PYTHONPATH"] = os.pathsep.join([
- os.path.join(python3_home, "Lib", "site-packages"),
- os.path.join(RESOLVE_SCRIPT_API, "Modules"),
- ] + env_pythonpath.split(os.pathsep))
+ modules_path = Path(resolve_script_api, "Modules").as_posix()
+ self.launch_context.env[
+ "PYTHONPATH"
+ ] = f"{modules_path}{os.pathsep}{env_pythonpath}"
self.log.debug(f"PYTHONPATH: {self.launch_context.env['PYTHONPATH']}")
- RESOLVE_UTILITY_SCRIPTS_DIR_ = {
+ # add the pythonhome folder to PATH because on Windows
+ # this is needed for Py3 to be correctly detected within Resolve
+ env_path = self.launch_context.env["PATH"]
+ self.log.info(f"Adding `{python3_home_str}` to the PATH variable")
+ self.launch_context.env[
+ "PATH"
+ ] = f"{python3_home_str}{os.pathsep}{env_path}"
+
+ self.log.debug(f"PATH: {self.launch_context.env['PATH']}")
+
+ resolve_utility_scripts_dirs = {
"windows": (
- f"{PROGRAMDATA}/Blackmagic Design"
+ f"{programdata}/Blackmagic Design"
"/DaVinci Resolve/Fusion/Scripts/Comp"
),
"darwin": (
"/Library/Application Support/Blackmagic Design"
"/DaVinci Resolve/Fusion/Scripts/Comp"
),
- "linux": "/opt/resolve/Fusion/Scripts/Comp"
+ "linux": "/opt/resolve/Fusion/Scripts/Comp",
}
- RESOLVE_UTILITY_SCRIPTS_DIR = os.path.normpath(
- RESOLVE_UTILITY_SCRIPTS_DIR_[current_platform]
+ resolve_utility_scripts_dir = Path(
+ resolve_utility_scripts_dirs[current_platform]
)
# setting utility scripts dir for scripts syncing
- self.launch_context.env["RESOLVE_UTILITY_SCRIPTS_DIR"] = (
- RESOLVE_UTILITY_SCRIPTS_DIR)
+ self.launch_context.env[
+ "RESOLVE_UTILITY_SCRIPTS_DIR"
+ ] = resolve_utility_scripts_dir.as_posix()
# remove terminal coloring tags
self.launch_context.env["OPENPYPE_LOG_NO_COLORS"] = "True"
diff --git a/openpype/hosts/resolve/plugins/load/load_clip.py b/openpype/hosts/resolve/plugins/load/load_clip.py
index d30a7ea272..05bfb003d6 100644
--- a/openpype/hosts/resolve/plugins/load/load_clip.py
+++ b/openpype/hosts/resolve/plugins/load/load_clip.py
@@ -19,6 +19,7 @@ from openpype.lib.transcoding import (
IMAGE_EXTENSIONS
)
+
class LoadClip(plugin.TimelineItemLoader):
"""Load a subset to timeline as clip
diff --git a/openpype/hosts/resolve/startup.py b/openpype/hosts/resolve/startup.py
new file mode 100644
index 0000000000..79a64e0fbf
--- /dev/null
+++ b/openpype/hosts/resolve/startup.py
@@ -0,0 +1,62 @@
+"""This script is used as a startup script in Resolve through a .scriptlib file
+
+It triggers directly after the launch of Resolve and it's recommended to keep
+it optimized for fast performance since the Resolve UI is actually interactive
+while this is running. As such, there's nothing ensuring the user isn't
+continuing manually before any of the logic here runs. As such we also try
+to delay any imports as much as possible.
+
+This code runs in a separate process to the main Resolve process.
+
+"""
+import os
+
+import openpype.hosts.resolve.api
+
+
+def ensure_installed_host():
+ """Install resolve host with openpype and return the registered host.
+
+ This function can be called multiple times without triggering an
+ additional install.
+ """
+ from openpype.pipeline import install_host, registered_host
+ host = registered_host()
+ if host:
+ return host
+
+ install_host(openpype.hosts.resolve.api)
+ return registered_host()
+
+
+def launch_menu():
+ print("Launching Resolve OpenPype menu..")
+ ensure_installed_host()
+ openpype.hosts.resolve.api.launch_pype_menu()
+
+
+def open_file(path):
+ # Avoid the need to "install" the host
+ host = ensure_installed_host()
+ host.open_file(path)
+
+
+def main():
+ # Open last workfile
+ workfile_path = os.environ.get("OPENPYPE_RESOLVE_OPEN_ON_LAUNCH")
+ if workfile_path:
+ open_file(workfile_path)
+ else:
+ print("No last workfile set to open. Skipping..")
+
+ # Launch OpenPype menu
+ from openpype.settings import get_project_settings
+ from openpype.pipeline.context_tools import get_current_project_name
+ project_name = get_current_project_name()
+ settings = get_project_settings(project_name)
+ if settings.get("resolve", {}).get("launch_openpype_menu_on_start", True):
+ launch_menu()
+
+
+if __name__ == "__main__":
+ main()
diff --git a/openpype/hosts/resolve/utility_scripts/__OpenPype__Menu__.py b/openpype/hosts/resolve/utility_scripts/OpenPype__Menu.py
similarity index 100%
rename from openpype/hosts/resolve/utility_scripts/__OpenPype__Menu__.py
rename to openpype/hosts/resolve/utility_scripts/OpenPype__Menu.py
diff --git a/openpype/hosts/resolve/utility_scripts/README.markdown b/openpype/hosts/resolve/utility_scripts/README.markdown
deleted file mode 100644
index 8b13789179..0000000000
--- a/openpype/hosts/resolve/utility_scripts/README.markdown
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/openpype/hosts/resolve/utility_scripts/OTIO_export.py b/openpype/hosts/resolve/utility_scripts/develop/OTIO_export.py
similarity index 100%
rename from openpype/hosts/resolve/utility_scripts/OTIO_export.py
rename to openpype/hosts/resolve/utility_scripts/develop/OTIO_export.py
diff --git a/openpype/hosts/resolve/utility_scripts/OTIO_import.py b/openpype/hosts/resolve/utility_scripts/develop/OTIO_import.py
similarity index 100%
rename from openpype/hosts/resolve/utility_scripts/OTIO_import.py
rename to openpype/hosts/resolve/utility_scripts/develop/OTIO_import.py
diff --git a/openpype/hosts/resolve/utility_scripts/OpenPype_sync_util_scripts.py b/openpype/hosts/resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py
similarity index 100%
rename from openpype/hosts/resolve/utility_scripts/OpenPype_sync_util_scripts.py
rename to openpype/hosts/resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py
diff --git a/openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib b/openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib
new file mode 100644
index 0000000000..ec9b30a18d
--- /dev/null
+++ b/openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib
@@ -0,0 +1,21 @@
+-- Run OpenPype's Python launch script for resolve
+function file_exists(name)
+ local f = io.open(name, "r")
+ return f ~= nil and io.close(f)
+end
+
+
+openpype_startup_script = os.getenv("OPENPYPE_RESOLVE_STARTUP_SCRIPT")
+if openpype_startup_script ~= nil then
+ script = fusion:MapPath(openpype_startup_script)
+
+ if file_exists(script) then
+ -- We must use RunScript to ensure it runs in a separate
+ -- process to Resolve itself to avoid a deadlock for
+ -- certain imports of OpenPype libraries or Qt
+ print("Running launch script: " .. script)
+ fusion:RunScript(script)
+ else
+ print("Launch script not found at: " .. script)
+ end
+end
\ No newline at end of file
diff --git a/openpype/hosts/resolve/utility_scripts/tests/testing_timeline_op.py b/openpype/hosts/resolve/utility_scripts/tests/testing_timeline_op.py
new file mode 100644
index 0000000000..8270496f64
--- /dev/null
+++ b/openpype/hosts/resolve/utility_scripts/tests/testing_timeline_op.py
@@ -0,0 +1,13 @@
+#! python3
+from openpype.pipeline import install_host
+from openpype.hosts.resolve import api as bmdvr
+from openpype.hosts.resolve.api.lib import get_current_project
+
+if __name__ == "__main__":
+ install_host(bmdvr)
+ project = get_current_project()
+ timeline_count = project.GetTimelineCount()
+ print(f"Timeline count: {timeline_count}")
+ timeline = project.GetTimelineByIndex(timeline_count)
+ print(f"Timeline name: {timeline.GetName()}")
+ print(timeline.GetTrackCount("video"))
diff --git a/openpype/hosts/resolve/utils.py b/openpype/hosts/resolve/utils.py
index 5881f153ae..5e3003862f 100644
--- a/openpype/hosts/resolve/utils.py
+++ b/openpype/hosts/resolve/utils.py
@@ -1,6 +1,6 @@
import os
import shutil
-from openpype.lib import Logger
+from openpype.lib import Logger, is_running_from_build
RESOLVE_ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -8,30 +8,33 @@ RESOLVE_ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
def setup(env):
log = Logger.get_logger("ResolveSetup")
scripts = {}
- us_env = env.get("RESOLVE_UTILITY_SCRIPTS_SOURCE_DIR")
- us_dir = env["RESOLVE_UTILITY_SCRIPTS_DIR"]
+ util_scripts_env = env.get("RESOLVE_UTILITY_SCRIPTS_SOURCE_DIR")
+ util_scripts_dir = env["RESOLVE_UTILITY_SCRIPTS_DIR"]
- us_paths = [os.path.join(
+ util_scripts_paths = [os.path.join(
RESOLVE_ROOT_DIR,
"utility_scripts"
)]
# collect script dirs
- if us_env:
- log.info("Utility Scripts Env: `{}`".format(us_env))
- us_paths = us_env.split(
- os.pathsep) + us_paths
+ if util_scripts_env:
+ log.info("Utility Scripts Env: `{}`".format(util_scripts_env))
+ util_scripts_paths = util_scripts_env.split(
+ os.pathsep) + util_scripts_paths
# collect scripts from dirs
- for path in us_paths:
+ for path in util_scripts_paths:
scripts.update({path: os.listdir(path)})
- log.info("Utility Scripts Dir: `{}`".format(us_paths))
+ log.info("Utility Scripts Dir: `{}`".format(util_scripts_paths))
log.info("Utility Scripts: `{}`".format(scripts))
+ # Make sure scripts dir exists
+ os.makedirs(util_scripts_dir, exist_ok=True)
+
# make sure no script file is in folder
- for s in os.listdir(us_dir):
- path = os.path.join(us_dir, s)
+ for script in os.listdir(util_scripts_dir):
+ path = os.path.join(util_scripts_dir, script)
log.info("Removing `{}`...".format(path))
if os.path.isdir(path):
shutil.rmtree(path, onerror=None)
@@ -39,12 +42,25 @@ def setup(env):
os.remove(path)
# copy scripts into Resolve's utility scripts dir
- for d, sl in scripts.items():
- # directory and scripts list
- for s in sl:
- # script in script list
- src = os.path.join(d, s)
- dst = os.path.join(us_dir, s)
+ for directory, scripts in scripts.items():
+ for script in scripts:
+ if (
+ is_running_from_build() and
+ script in ["tests", "develop"]
+ ):
+ # only copy those if started from build
+ continue
+
+ src = os.path.join(directory, script)
+ dst = os.path.join(util_scripts_dir, script)
+
+ # TODO: Make this a less hacky workaround
+ if script == "openpype_startup.scriptlib":
+ # Handle special case for scriptlib that needs to be a folder
+ # up from the Comp folder in the Fusion scripts
+ dst = os.path.join(os.path.dirname(util_scripts_dir),
+ script)
+
log.info("Copying `{}` to `{}`...".format(src, dst))
if os.path.isdir(src):
shutil.copytree(
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_context.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_context.py
index 96aaae23dc..8fa53f5f48 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/collect_context.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_context.py
@@ -222,7 +222,6 @@ class CollectContextDataSAPublish(pyblish.api.ContextPlugin):
"label": subset,
"name": subset,
"family": in_data["family"],
- # "version": in_data.get("version", 1),
"frameStart": in_data.get("representations", [None])[0].get(
"frameStart", None
),
@@ -232,6 +231,14 @@ class CollectContextDataSAPublish(pyblish.api.ContextPlugin):
"families": instance_families
}
)
+ # Fill version only if 'use_next_available_version' is disabled
+ # and version is filled in instance data
+ version = in_data.get("version")
+ use_next_available_version = in_data.get(
+ "use_next_available_version", True)
+ if not use_next_available_version and version is not None:
+ instance.data["version"] = version
+
self.log.info("collected instance: {}".format(pformat(instance.data)))
self.log.info("parsing data: {}".format(pformat(in_data)))
diff --git a/openpype/hosts/substancepainter/plugins/publish/save_workfile.py b/openpype/hosts/substancepainter/plugins/publish/save_workfile.py
index 4874b5e5c7..9662f31922 100644
--- a/openpype/hosts/substancepainter/plugins/publish/save_workfile.py
+++ b/openpype/hosts/substancepainter/plugins/publish/save_workfile.py
@@ -16,11 +16,12 @@ class SaveCurrentWorkfile(pyblish.api.ContextPlugin):
def process(self, context):
host = registered_host()
- if context.data["currentFile"] != host.get_current_workfile():
+ current = host.get_current_workfile()
+ if context.data["currentFile"] != current:
raise KnownPublishError("Workfile has changed during publishing!")
if host.has_unsaved_changes():
- self.log.info("Saving current file..")
+ self.log.info("Saving current file: {}".format(current))
host.save_workfile()
else:
self.log.debug("Skipping workfile save because there are no "
diff --git a/openpype/hosts/traypublisher/api/plugin.py b/openpype/hosts/traypublisher/api/plugin.py
index 75930f0f31..36e041a32c 100644
--- a/openpype/hosts/traypublisher/api/plugin.py
+++ b/openpype/hosts/traypublisher/api/plugin.py
@@ -1,4 +1,14 @@
-from openpype.lib.attribute_definitions import FileDef
+from openpype.client import (
+ get_assets,
+ get_subsets,
+ get_last_versions,
+)
+from openpype.lib.attribute_definitions import (
+ FileDef,
+ BoolDef,
+ NumberDef,
+ UISeparatorDef,
+)
from openpype.lib.transcoding import IMAGE_EXTENSIONS, VIDEO_EXTENSIONS
from openpype.pipeline.create import (
Creator,
@@ -94,6 +104,7 @@ class TrayPublishCreator(Creator):
class SettingsCreator(TrayPublishCreator):
create_allow_context_change = True
create_allow_thumbnail = True
+ allow_version_control = False
extensions = []
@@ -101,8 +112,18 @@ class SettingsCreator(TrayPublishCreator):
# Pass precreate data to creator attributes
thumbnail_path = pre_create_data.pop(PRE_CREATE_THUMBNAIL_KEY, None)
+ # Fill 'version_to_use' if version control is enabled
+ if self.allow_version_control:
+ asset_name = data["asset"]
+ subset_docs_by_asset_id = self._prepare_next_versions(
+ [asset_name], [subset_name])
+ version = subset_docs_by_asset_id[asset_name].get(subset_name)
+ pre_create_data["version_to_use"] = version
+ data["_previous_last_version"] = version
+
data["creator_attributes"] = pre_create_data
data["settings_creator"] = True
+
# Create new instance
new_instance = CreatedInstance(self.family, subset_name, data, self)
@@ -111,7 +132,158 @@ class SettingsCreator(TrayPublishCreator):
if thumbnail_path:
self.set_instance_thumbnail_path(new_instance.id, thumbnail_path)
+ def _prepare_next_versions(self, asset_names, subset_names):
+ """Prepare next versions for given asset and subset names.
+
+ Todos:
+ Expect combination of subset names by asset name to avoid
+ unnecessary server calls for unused subsets.
+
+ Args:
+ asset_names (Iterable[str]): Asset names.
+ subset_names (Iterable[str]): Subset names.
+
+ Returns:
+ dict[str, dict[str, int]]: Last versions by asset
+ and subset names.
+ """
+
+ # Prepare all versions for all combinations to '1'
+ subset_docs_by_asset_id = {
+ asset_name: {
+ subset_name: 1
+ for subset_name in subset_names
+ }
+ for asset_name in asset_names
+ }
+ if not asset_names or not subset_names:
+ return subset_docs_by_asset_id
+
+ asset_docs = get_assets(
+ self.project_name,
+ asset_names=asset_names,
+ fields=["_id", "name"]
+ )
+ asset_names_by_id = {
+ asset_doc["_id"]: asset_doc["name"]
+ for asset_doc in asset_docs
+ }
+ subset_docs = list(get_subsets(
+ self.project_name,
+ asset_ids=asset_names_by_id.keys(),
+ subset_names=subset_names,
+ fields=["_id", "name", "parent"]
+ ))
+
+ subset_ids = {subset_doc["_id"] for subset_doc in subset_docs}
+ last_versions = get_last_versions(
+ self.project_name,
+ subset_ids,
+ fields=["name", "parent"])
+
+ for subset_doc in subset_docs:
+ asset_id = subset_doc["parent"]
+ asset_name = asset_names_by_id[asset_id]
+ subset_name = subset_doc["name"]
+ subset_id = subset_doc["_id"]
+ last_version = last_versions.get(subset_id)
+ version = 0
+ if last_version is not None:
+ version = last_version["name"]
+ subset_docs_by_asset_id[asset_name][subset_name] += version
+ return subset_docs_by_asset_id
+
+ def _fill_next_versions(self, instances_data):
+ """Fill next version for instances.
+
+ Instances have also stored previous next version to be able to
+ recognize if user did enter different version. If version was
+ not changed by user, or user set it to '0' the next version will be
+ updated by current database state.
+ """
+
+ filtered_instance_data = []
+ for instance in instances_data:
+ previous_last_version = instance.get("_previous_last_version")
+ creator_attributes = instance["creator_attributes"]
+ use_next_version = creator_attributes.get(
+ "use_next_version", True)
+ version = creator_attributes.get("version_to_use", 0)
+ if (
+ use_next_version
+ or version == 0
+ or version == previous_last_version
+ ):
+ filtered_instance_data.append(instance)
+
+ asset_names = {
+ instance["asset"]
+ for instance in filtered_instance_data}
+ subset_names = {
+ instance["subset"]
+ for instance in filtered_instance_data}
+ subset_docs_by_asset_id = self._prepare_next_versions(
+ asset_names, subset_names
+ )
+ for instance in filtered_instance_data:
+ asset_name = instance["asset"]
+ subset_name = instance["subset"]
+ version = subset_docs_by_asset_id[asset_name][subset_name]
+ instance["creator_attributes"]["version_to_use"] = version
+ instance["_previous_last_version"] = version
+
+ def collect_instances(self):
+ """Collect instances from host.
+
+ Overriden to be able to manage version control attributes. If version
+ control is disabled, the attributes will be removed from instances,
+ and next versions are filled if is version control enabled.
+ """
+
+ instances_by_identifier = cache_and_get_instances(
+ self, SHARED_DATA_KEY, list_instances
+ )
+ instances = instances_by_identifier[self.identifier]
+ if not instances:
+ return
+
+ if self.allow_version_control:
+ self._fill_next_versions(instances)
+
+ for instance_data in instances:
+ # Make sure that there are not data related to version control
+ # if plugin does not support it
+ if not self.allow_version_control:
+ instance_data.pop("_previous_last_version", None)
+ creator_attributes = instance_data["creator_attributes"]
+ creator_attributes.pop("version_to_use", None)
+ creator_attributes.pop("use_next_version", None)
+
+ instance = CreatedInstance.from_existing(instance_data, self)
+ self._add_instance_to_context(instance)
+
def get_instance_attr_defs(self):
+ defs = self.get_pre_create_attr_defs()
+ if self.allow_version_control:
+ defs += [
+ UISeparatorDef(),
+ BoolDef(
+ "use_next_version",
+ default=True,
+ label="Use next version",
+ ),
+ NumberDef(
+ "version_to_use",
+ default=1,
+ minimum=0,
+ maximum=999,
+ label="Version to use",
+ )
+ ]
+ return defs
+
+ def get_pre_create_attr_defs(self):
+ # Use same attributes as for instance attributes
return [
FileDef(
"representation_files",
@@ -132,10 +304,6 @@ class SettingsCreator(TrayPublishCreator):
)
]
- def get_pre_create_attr_defs(self):
- # Use same attributes as for instance attrobites
- return self.get_instance_attr_defs()
-
@classmethod
def from_settings(cls, item_data):
identifier = item_data["identifier"]
@@ -155,6 +323,8 @@ class SettingsCreator(TrayPublishCreator):
"extensions": item_data["extensions"],
"allow_sequences": item_data["allow_sequences"],
"allow_multiple_items": item_data["allow_multiple_items"],
- "default_variants": item_data["default_variants"]
+ "allow_version_control": item_data.get(
+ "allow_version_control", False),
+ "default_variants": item_data["default_variants"],
}
)
diff --git a/openpype/hosts/traypublisher/plugins/create/create_editorial.py b/openpype/hosts/traypublisher/plugins/create/create_editorial.py
index 0630dfb3da..8640500b18 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_editorial.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_editorial.py
@@ -487,7 +487,22 @@ or updating already created. Publishing will create OTIO file.
)
# get video stream data
- video_stream = media_data["streams"][0]
+ video_streams = []
+ audio_streams = []
+ for stream in media_data["streams"]:
+ codec_type = stream.get("codec_type")
+ if codec_type == "audio":
+ audio_streams.append(stream)
+
+ elif codec_type == "video":
+ video_streams.append(stream)
+
+ if not video_streams:
+ raise ValueError(
+ "Could not find video stream in source file."
+ )
+
+ video_stream = video_streams[0]
return_data = {
"video": True,
"start_frame": 0,
@@ -500,12 +515,7 @@ or updating already created. Publishing will create OTIO file.
}
# get audio streams data
- audio_stream = [
- stream for stream in media_data["streams"]
- if stream["codec_type"] == "audio"
- ]
-
- if audio_stream:
+ if audio_streams:
return_data["audio"] = True
except Exception as exc:
diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index c081216481..3fa3c3b8c8 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -47,6 +47,8 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
"Created temp staging directory for instance {}. {}"
).format(instance_label, tmp_folder))
+ self._fill_version(instance, instance_label)
+
# Store filepaths for validation of their existence
source_filepaths = []
# Make sure there are no representations with same name
@@ -93,6 +95,28 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
)
)
+ def _fill_version(self, instance, instance_label):
+ """Fill instance version under which will be instance integrated.
+
+ Instance must have set 'use_next_version' to 'False'
+ and 'version_to_use' to version to use.
+
+ Args:
+ instance (pyblish.api.Instance): Instance to fill version for.
+ instance_label (str): Label of instance to fill version for.
+ """
+
+ creator_attributes = instance.data["creator_attributes"]
+ use_next_version = creator_attributes.get("use_next_version", True)
+ # If 'version_to_use' is '0' it means that next version should be used
+ version_to_use = creator_attributes.get("version_to_use", 0)
+ if use_next_version or not version_to_use:
+ return
+ instance.data["version"] = version_to_use
+ self.log.debug(
+ "Version for instance \"{}\" was set to \"{}\"".format(
+ instance_label, version_to_use))
+
def _create_main_representations(
self,
instance,
diff --git a/openpype/hosts/traypublisher/plugins/publish/help/validate_existing_version.xml b/openpype/hosts/traypublisher/plugins/publish/help/validate_existing_version.xml
new file mode 100644
index 0000000000..8a3b8f4d7d
--- /dev/null
+++ b/openpype/hosts/traypublisher/plugins/publish/help/validate_existing_version.xml
@@ -0,0 +1,16 @@
+
+
