use moved functions in code

openpype/hooks/pre_copy_template_workfile.py

@@ -1,11 +1,11 @@
 import os
 import shutil
-from openpype.lib import (
-    PreLaunchHook,
-    get_custom_workfile_template_by_context,
+from openpype.lib import PreLaunchHook
+from openpype.settings import get_project_settings
+from openpype.pipeline.workfile import (
+    get_custom_workfile_template,
     get_custom_workfile_template_by_string_context
 )
-from openpype.settings import get_project_settings
 
 
 class CopyTemplateWorkfile(PreLaunchHook):
@@ -54,41 +54,22 @@ class CopyTemplateWorkfile(PreLaunchHook):
         project_name = self.data["project_name"]
         asset_name = self.data["asset_name"]
         task_name = self.data["task_name"]
+        host_name = self.application.host_name
 
         project_settings = get_project_settings(project_name)
-        host_settings = project_settings[self.application.host_name]
-
-        workfile_builder_settings = host_settings.get("workfile_builder")
-        if not workfile_builder_settings:
-            # TODO remove warning when deprecated
-            self.log.warning((
-                "Seems like old version of settings is used."
-                " Can't access custom templates in host \"{}\"."
-            ).format(self.application.full_label))
-            return
-
-        if not workfile_builder_settings["create_first_version"]:
-            self.log.info((
-                "Project \"{}\" has turned off to create first workfile for"
-                " application \"{}\""
-            ).format(project_name, self.application.full_label))
-            return
-
-        # Backwards compatibility
-        template_profiles = workfile_builder_settings.get("custom_templates")
-        if not template_profiles:
-            self.log.info(
-                "Custom templates are not filled. Skipping template copy."
-            )
-            return
 
         project_doc = self.data.get("project_doc")
         asset_doc = self.data.get("asset_doc")
         anatomy = self.data.get("anatomy")
         if project_doc and asset_doc:
             self.log.debug("Started filtering of custom template paths.")
-            template_path = get_custom_workfile_template_by_context(
-                template_profiles, project_doc, asset_doc, task_name, anatomy
+            template_path = get_custom_workfile_template(
+                project_doc,
+                asset_doc,
+                task_name,
+                host_name,
+                anatomy,
+                project_settings
             )
 
         else:
@@ -96,10 +77,13 @@ class CopyTemplateWorkfile(PreLaunchHook):
                 "Global data collection probably did not execute."
                 " Using backup solution."
             ))
-            dbcon = self.data.get("dbcon")
             template_path = get_custom_workfile_template_by_string_context(
-                template_profiles, project_name, asset_name, task_name,
-                dbcon, anatomy
+                project_name,
+                asset_name,
+                task_name,
+                host_name,
+                anatomy,
+                project_settings
             )
 
         if not template_path:

openpype/hosts/nuke/api/lib.py

@@ -38,7 +38,10 @@ from openpype.pipeline import (
     legacy_io,
     Anatomy,
 )
-from openpype.pipeline.context_tools import get_current_project_asset
+from openpype.pipeline.context_tools import (
+    get_current_project_asset,
+    get_custom_workfile_template_from_session
+)
 from openpype.pipeline.workfile import BuildWorkfile
 
 from . import gizmo_menu
@@ -2444,15 +2447,12 @@ def _launch_workfile_app():
 
 
 def process_workfile_builder():
-    from openpype.lib import (
-        env_value_to_bool,
-        get_custom_workfile_template
-    )
     # to avoid looping of the callback, remove it!
     nuke.removeOnCreate(process_workfile_builder, nodeClass="Root")
 
     # get state from settings
-    workfile_builder = get_current_project_settings()["nuke"].get(
+    project_settings = get_current_project_settings()
+    workfile_builder = project_settings["nuke"].get(
         "workfile_builder", {})
 
     # get all imortant settings
@@ -2462,7 +2462,6 @@ def process_workfile_builder():
 
     # get settings
     createfv_on = workfile_builder.get("create_first_version") or None
-    custom_templates = workfile_builder.get("custom_templates") or None
     builder_on = workfile_builder.get("builder_on_start") or None
 
     last_workfile_path = os.environ.get("AVALON_LAST_WORKFILE")
@@ -2470,8 +2469,8 @@ def process_workfile_builder():
     # generate first version in file not existing and feature is enabled
     if createfv_on and not os.path.exists(last_workfile_path):
         # get custom template path if any
-        custom_template_path = get_custom_workfile_template(
-            custom_templates
+        custom_template_path = get_custom_workfile_template_from_session(
+            project_settings=project_settings
         )
 
         # if custom template is defined