Merge pull request #5025 from ynput/bugfix/OP-2865_Loading-maya-reviews-into-resolve

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",

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

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()
 

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
 

openpype/hosts/resolve/utility_scripts/README.markdown

@@ -1 +0,0 @@
-

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"))

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__))
 
@@ -41,6 +41,13 @@ def setup(env):
     # copy scripts into Resolve's utility scripts dir
     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)
             log.info("Copying `{}` to `{}`...".format(src, dst))