From 33f83f587d05bbd259bdb6979c1f9a2ae88d8063 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Fri, 23 Jun 2023 16:26:14 +0200 Subject: [PATCH 01/18] progress of workfile save file in resolve --- openpype/hosts/resolve/api/workio.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/openpype/hosts/resolve/api/workio.py b/openpype/hosts/resolve/api/workio.py index 5966fa6a43..58f9e44e60 100644 --- a/openpype/hosts/resolve/api/workio.py +++ b/openpype/hosts/resolve/api/workio.py @@ -30,13 +30,22 @@ def save_file(filepath): project = get_current_project() name = project.GetName() - if "Untitled Project" not in name: - log.info("Saving project: `{}` as '{}'".format(name, file)) - pm.ExportProject(name, filepath) - else: + log.info("name: `{}`, file: '{}'".format(name, file)) + log.info("fname: `{}`, filepath: '{}'".format(fname, filepath)) + + if "Untitled Project" in name: log.info("Creating new project...") - pm.CreateProject(fname) - pm.ExportProject(name, filepath) + response = pm.CreateProject(fname) + log.info("New project created: {}".format(response)) + else: + log.info("Saving project: `{}` as '{}'".format(name, file)) + response = project.SetName(fname) + log.info("Project renamed: {}".format(response)) + + if response: + # only export if project was saved or renamed + exported = pm.ExportProject(fname, filepath) + log.info("Project exported: {}".format(exported)) def open_file(filepath): From baf88f1358828a0386e0bd1e592d85cab70ccb18 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 26 Jun 2023 11:46:27 +0200 Subject: [PATCH 02/18] fixing exporting new project --- openpype/hosts/resolve/api/lib.py | 8 +++++++- openpype/hosts/resolve/api/workio.py | 11 +++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/resolve/api/lib.py b/openpype/hosts/resolve/api/lib.py index a44c527f13..396d2234bb 100644 --- a/openpype/hosts/resolve/api/lib.py +++ b/openpype/hosts/resolve/api/lib.py @@ -89,11 +89,17 @@ def get_current_project(): """Get current project object. """ if not self.current_project: - self.current_project = get_project_manager().GetCurrentProject() + set_current_project() return self.current_project +def set_current_project(): + """Set current project object. + """ + self.current_project = get_project_manager().GetCurrentProject() + + def get_current_timeline(new=False): """Get current timeline object. diff --git a/openpype/hosts/resolve/api/workio.py b/openpype/hosts/resolve/api/workio.py index 58f9e44e60..5de6b251af 100644 --- a/openpype/hosts/resolve/api/workio.py +++ b/openpype/hosts/resolve/api/workio.py @@ -5,6 +5,7 @@ from openpype.lib import Logger from .lib import ( get_project_manager, get_current_project, + set_current_project, set_project_manager_to_folder_name ) @@ -33,12 +34,14 @@ def save_file(filepath): log.info("name: `{}`, file: '{}'".format(name, file)) log.info("fname: `{}`, filepath: '{}'".format(fname, filepath)) - if "Untitled Project" in name: - log.info("Creating new project...") + response = False + if name == "Untitled Project": response = pm.CreateProject(fname) + # re-cash new current project after renaming + set_current_project() log.info("New project created: {}".format(response)) - else: - log.info("Saving project: `{}` as '{}'".format(name, file)) + pm.SaveProject() + elif name != fname: response = project.SetName(fname) log.info("Project renamed: {}".format(response)) From 14e7a914cecce47c30e268f115e3db82eb09cb51 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 26 Jun 2023 15:37:22 +0200 Subject: [PATCH 03/18] ensure startup.py will by always added to environment --- .../hosts/resolve/hooks/pre_resolve_launch_last_workfile.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py b/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py index 0e27ddb8c3..94c123e6f9 100644 --- a/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py +++ b/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py @@ -16,6 +16,8 @@ class ResolveLaunchLastWorkfile(PreLaunchHook): app_groups = ["resolve"] def execute(self): + self.set_startup_script() + if not self.data.get("start_last_workfile"): self.log.info("It is set to not start last workfile on start.") return @@ -35,6 +37,7 @@ class ResolveLaunchLastWorkfile(PreLaunchHook): key = "OPENPYPE_RESOLVE_OPEN_ON_LAUNCH" self.launch_context.env[key] = last_workfile + def set_startup_script(self): # 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__) From 0864d3a70577aa2c386331295317eaea17491e88 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 26 Jun 2023 15:38:19 +0200 Subject: [PATCH 04/18] dev testing of startup py --- .../resolve/utility_scripts/tests/testing_startup_script.py | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 openpype/hosts/resolve/utility_scripts/tests/testing_startup_script.py diff --git a/openpype/hosts/resolve/utility_scripts/tests/testing_startup_script.py b/openpype/hosts/resolve/utility_scripts/tests/testing_startup_script.py new file mode 100644 index 0000000000..b64714ab16 --- /dev/null +++ b/openpype/hosts/resolve/utility_scripts/tests/testing_startup_script.py @@ -0,0 +1,5 @@ +#! python3 +from openpype.hosts.resolve.startup import main + +if __name__ == "__main__": + main() From 856ff06b4dd0d2056ef50351ad54b84692998717 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 26 Jun 2023 15:38:50 +0200 Subject: [PATCH 05/18] removing ambiguous project nesting --- openpype/hosts/resolve/api/workio.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/openpype/hosts/resolve/api/workio.py b/openpype/hosts/resolve/api/workio.py index 5de6b251af..61425e19f1 100644 --- a/openpype/hosts/resolve/api/workio.py +++ b/openpype/hosts/resolve/api/workio.py @@ -69,10 +69,8 @@ def open_file(filepath): file = os.path.basename(filepath) fname, _ = os.path.splitext(file) - dname, _ = fname.split("_v") + try: - if not set_project_manager_to_folder_name(dname): - raise # load project from input path project = pm.LoadProject(fname) log.info(f"Project {project.GetName()} opened...") From 43f611cbdfb5532e407836104697f05c3e0f5070 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 26 Jun 2023 15:50:50 +0200 Subject: [PATCH 06/18] fix starting openpype menu automatically even no first version of workfile is available --- openpype/hosts/resolve/startup.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/resolve/startup.py b/openpype/hosts/resolve/startup.py index 79a64e0fbf..f64792d2ff 100644 --- a/openpype/hosts/resolve/startup.py +++ b/openpype/hosts/resolve/startup.py @@ -10,9 +10,11 @@ This code runs in a separate process to the main Resolve process. """ import os - +from openpype.lib import Logger import openpype.hosts.resolve.api +log = Logger.get_logger(__name__) + def ensure_installed_host(): """Install resolve host with openpype and return the registered host. @@ -44,17 +46,22 @@ def open_file(path): def main(): # Open last workfile workfile_path = os.environ.get("OPENPYPE_RESOLVE_OPEN_ON_LAUNCH") - if workfile_path: + + if workfile_path and os.path.exists(workfile_path): + log.info(f"Opening last workfile: {workfile_path}") open_file(workfile_path) else: - print("No last workfile set to open. Skipping..") + log.info("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() + log.info(f"Current project name in context: {project_name}") + settings = get_project_settings(project_name) if settings.get("resolve", {}).get("launch_openpype_menu_on_start", True): + self.log.info("Launching OpenPype menu..") launch_menu() From 0145a299ebc0f840b4c281ee7daf0c0b65becf3d Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 26 Jun 2023 15:57:59 +0200 Subject: [PATCH 07/18] removing self --- openpype/hosts/resolve/startup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/resolve/startup.py b/openpype/hosts/resolve/startup.py index f64792d2ff..e807a48f5a 100644 --- a/openpype/hosts/resolve/startup.py +++ b/openpype/hosts/resolve/startup.py @@ -61,7 +61,7 @@ def main(): settings = get_project_settings(project_name) if settings.get("resolve", {}).get("launch_openpype_menu_on_start", True): - self.log.info("Launching OpenPype menu..") + log.info("Launching OpenPype menu..") launch_menu() From fcde80dcc3898e72705854ab751c0fb7e6a9c9f9 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 26 Jun 2023 15:58:42 +0200 Subject: [PATCH 08/18] removed debug prints --- openpype/hosts/resolve/api/workio.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/openpype/hosts/resolve/api/workio.py b/openpype/hosts/resolve/api/workio.py index 61425e19f1..77cd4d488a 100644 --- a/openpype/hosts/resolve/api/workio.py +++ b/openpype/hosts/resolve/api/workio.py @@ -31,9 +31,6 @@ def save_file(filepath): project = get_current_project() name = project.GetName() - log.info("name: `{}`, file: '{}'".format(name, file)) - log.info("fname: `{}`, filepath: '{}'".format(fname, filepath)) - response = False if name == "Untitled Project": response = pm.CreateProject(fname) From 33f2adff54c87e4216fac77314ffdaa9afd20c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Je=C5=BEek?= Date: Mon, 26 Jun 2023 16:58:49 +0200 Subject: [PATCH 09/18] Update openpype/hosts/resolve/api/workio.py Co-authored-by: Roy Nieterau --- openpype/hosts/resolve/api/workio.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/resolve/api/workio.py b/openpype/hosts/resolve/api/workio.py index 77cd4d488a..c04320d063 100644 --- a/openpype/hosts/resolve/api/workio.py +++ b/openpype/hosts/resolve/api/workio.py @@ -34,7 +34,7 @@ def save_file(filepath): response = False if name == "Untitled Project": response = pm.CreateProject(fname) - # re-cash new current project after renaming + # recache new current project after creating new project set_current_project() log.info("New project created: {}".format(response)) pm.SaveProject() From e83cf51da903a8b606e332fa13796cabc5384208 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 26 Jun 2023 17:04:16 +0200 Subject: [PATCH 10/18] removing current project cashing --- openpype/hosts/resolve/api/lib.py | 12 +----------- openpype/hosts/resolve/api/workio.py | 6 +----- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/openpype/hosts/resolve/api/lib.py b/openpype/hosts/resolve/api/lib.py index 396d2234bb..eaee3bb9ba 100644 --- a/openpype/hosts/resolve/api/lib.py +++ b/openpype/hosts/resolve/api/lib.py @@ -15,7 +15,6 @@ 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 @@ -88,16 +87,7 @@ def get_media_storage(): def get_current_project(): """Get current project object. """ - if not self.current_project: - set_current_project() - - return self.current_project - - -def set_current_project(): - """Set current project object. - """ - self.current_project = get_project_manager().GetCurrentProject() + return get_project_manager().GetCurrentProject() def get_current_timeline(new=False): diff --git a/openpype/hosts/resolve/api/workio.py b/openpype/hosts/resolve/api/workio.py index 77cd4d488a..59a1a07e9b 100644 --- a/openpype/hosts/resolve/api/workio.py +++ b/openpype/hosts/resolve/api/workio.py @@ -4,9 +4,7 @@ import os from openpype.lib import Logger from .lib import ( get_project_manager, - get_current_project, - set_current_project, - set_project_manager_to_folder_name + get_current_project ) @@ -34,8 +32,6 @@ def save_file(filepath): response = False if name == "Untitled Project": response = pm.CreateProject(fname) - # re-cash new current project after renaming - set_current_project() log.info("New project created: {}".format(response)) pm.SaveProject() elif name != fname: From bcd8aea40d7e80b1842c48afae07cb88e331b9b5 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 26 Jun 2023 17:08:07 +0200 Subject: [PATCH 11/18] recommit after conflict merge --- openpype/hosts/resolve/api/workio.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/openpype/hosts/resolve/api/workio.py b/openpype/hosts/resolve/api/workio.py index 44b15cde9b..59a1a07e9b 100644 --- a/openpype/hosts/resolve/api/workio.py +++ b/openpype/hosts/resolve/api/workio.py @@ -32,8 +32,6 @@ def save_file(filepath): response = False if name == "Untitled Project": response = pm.CreateProject(fname) - # recache new current project after creating new project - set_current_project() log.info("New project created: {}".format(response)) pm.SaveProject() elif name != fname: From 117706bca4bbed08117522d65da61c80036cf234 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 26 Jun 2023 17:08:17 +0200 Subject: [PATCH 12/18] typo --- openpype/hosts/resolve/api/workio.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/hosts/resolve/api/workio.py b/openpype/hosts/resolve/api/workio.py index 59a1a07e9b..55b69f7734 100644 --- a/openpype/hosts/resolve/api/workio.py +++ b/openpype/hosts/resolve/api/workio.py @@ -10,11 +10,11 @@ from .lib import ( log = Logger.get_logger(__name__) -exported_projet_ext = ".drp" +exported_project_ext = ".drp" def file_extensions(): - return [exported_projet_ext] + return [exported_project_ext] def has_unsaved_changes(): @@ -85,7 +85,7 @@ def current_file(): current_dir = os.getenv("AVALON_WORKDIR") project = pm.GetCurrentProject() name = project.GetName() - fname = name + exported_projet_ext + fname = name + exported_project_ext current_file = os.path.join(current_dir, fname) if not current_file: return None From e81a16116943c644d8e4a5d0a9b69eb97da5fe52 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Mon, 26 Jun 2023 17:09:33 +0200 Subject: [PATCH 13/18] code readability --- openpype/hosts/resolve/api/workio.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/openpype/hosts/resolve/api/workio.py b/openpype/hosts/resolve/api/workio.py index 55b69f7734..bc32f7802e 100644 --- a/openpype/hosts/resolve/api/workio.py +++ b/openpype/hosts/resolve/api/workio.py @@ -87,9 +87,7 @@ def current_file(): name = project.GetName() fname = name + exported_project_ext current_file = os.path.join(current_dir, fname) - if not current_file: - return None - return os.path.normpath(current_file) + return os.path.normpath(current_file) if current_file else None def work_root(session): From 1966482407158c13e7ff6db53a8732ab7103cc4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Je=C5=BEek?= Date: Tue, 27 Jun 2023 11:04:06 +0200 Subject: [PATCH 14/18] Update openpype/hosts/resolve/api/workio.py Co-authored-by: Roy Nieterau --- openpype/hosts/resolve/api/workio.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/resolve/api/workio.py b/openpype/hosts/resolve/api/workio.py index bc32f7802e..511254d29b 100644 --- a/openpype/hosts/resolve/api/workio.py +++ b/openpype/hosts/resolve/api/workio.py @@ -87,7 +87,8 @@ def current_file(): name = project.GetName() fname = name + exported_project_ext current_file = os.path.join(current_dir, fname) - return os.path.normpath(current_file) if current_file else None + if current_file: + return os.path.normpath(current_file) def work_root(session): From 31fa1a12009933749cf9eb7589a492095bbba9b5 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 27 Jun 2023 11:22:18 +0200 Subject: [PATCH 15/18] clearing old code --- openpype/hosts/resolve/api/workio.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/openpype/hosts/resolve/api/workio.py b/openpype/hosts/resolve/api/workio.py index 511254d29b..63be4abb1b 100644 --- a/openpype/hosts/resolve/api/workio.py +++ b/openpype/hosts/resolve/api/workio.py @@ -10,11 +10,9 @@ from .lib import ( log = Logger.get_logger(__name__) -exported_project_ext = ".drp" - def file_extensions(): - return [exported_project_ext] + return [".drp"] def has_unsaved_changes(): @@ -82,13 +80,18 @@ def open_file(filepath): def current_file(): pm = get_project_manager() - current_dir = os.getenv("AVALON_WORKDIR") + file_ext = file_extensions()[0] + workdir_path = os.getenv("AVALON_WORKDIR") project = pm.GetCurrentProject() - name = project.GetName() - fname = name + exported_project_ext - current_file = os.path.join(current_dir, fname) - if current_file: - return os.path.normpath(current_file) + project_name = project.GetName() + file_name = project_name + file_ext + + # create current file path + current_file_path = os.path.join(workdir_path, file_name) + + # return current file path if it exists + if os.path.exists(current_file_path): + return os.path.normpath(current_file_path) def work_root(session): From 8b5722c0a272ac91414aa8dfc1c6d1a3cfafdf24 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 27 Jun 2023 11:26:44 +0200 Subject: [PATCH 16/18] export anyway --- openpype/hosts/resolve/api/workio.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/resolve/api/workio.py b/openpype/hosts/resolve/api/workio.py index 63be4abb1b..9101d6fce6 100644 --- a/openpype/hosts/resolve/api/workio.py +++ b/openpype/hosts/resolve/api/workio.py @@ -36,10 +36,8 @@ def save_file(filepath): response = project.SetName(fname) log.info("Project renamed: {}".format(response)) - if response: - # only export if project was saved or renamed - exported = pm.ExportProject(fname, filepath) - log.info("Project exported: {}".format(exported)) + exported = pm.ExportProject(fname, filepath) + log.info("Project exported: {}".format(exported)) def open_file(filepath): From 3e9ac5935d2c8f72899c847f5d5099188d88d53b Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 27 Jun 2023 11:36:13 +0200 Subject: [PATCH 17/18] separate the startup script logic from workfile hook --- .../hooks/pre_resolve_launch_last_workfile.py | 24 ++++--------------- .../hooks/pre_resolve_startup_script.py | 24 +++++++++++++++++++ 2 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 openpype/hosts/resolve/hooks/pre_resolve_startup_script.py diff --git a/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py b/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py index 94c123e6f9..bc03baad8d 100644 --- a/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py +++ b/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py @@ -1,23 +1,17 @@ import os - from openpype.lib import PreLaunchHook -import openpype.hosts.resolve -class ResolveLaunchLastWorkfile(PreLaunchHook): +class PreLaunchResolveLastWorkfile(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): - self.set_startup_script() - if not self.data.get("start_last_workfile"): self.log.info("It is set to not start last workfile on start.") return @@ -32,17 +26,9 @@ class ResolveLaunchLastWorkfile(PreLaunchHook): 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}") + self.log.info( + "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 - - def set_startup_script(self): - # 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_startup_script.py b/openpype/hosts/resolve/hooks/pre_resolve_startup_script.py new file mode 100644 index 0000000000..599e0c0008 --- /dev/null +++ b/openpype/hosts/resolve/hooks/pre_resolve_startup_script.py @@ -0,0 +1,24 @@ +import os + +from openpype.lib import PreLaunchHook +import openpype.hosts.resolve + + +class PreLaunchResolveStartup(PreLaunchHook): + """Special hook to configure startup script. + + """ + order = 11 + app_groups = ["resolve"] + + def execute(self): + # 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( + f"Setting OPENPYPE_RESOLVE_STARTUP_SCRIPT to: {script_path}" + ) From c8e7b7c264f6ead73ef7e2b7e906900a9ae30b58 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 27 Jun 2023 11:37:33 +0200 Subject: [PATCH 18/18] improving names --- ...lve_launch_last_workfile.py => pre_resolve_last_workfile.py} | 0 openpype/hosts/resolve/hooks/pre_resolve_setup.py | 2 +- .../{pre_resolve_startup_script.py => pre_resolve_startup.py} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename openpype/hosts/resolve/hooks/{pre_resolve_launch_last_workfile.py => pre_resolve_last_workfile.py} (100%) rename openpype/hosts/resolve/hooks/{pre_resolve_startup_script.py => pre_resolve_startup.py} (100%) diff --git a/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py b/openpype/hosts/resolve/hooks/pre_resolve_last_workfile.py similarity index 100% rename from openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py rename to openpype/hosts/resolve/hooks/pre_resolve_last_workfile.py diff --git a/openpype/hosts/resolve/hooks/pre_resolve_setup.py b/openpype/hosts/resolve/hooks/pre_resolve_setup.py index d066fc2da2..3fd39d665c 100644 --- a/openpype/hosts/resolve/hooks/pre_resolve_setup.py +++ b/openpype/hosts/resolve/hooks/pre_resolve_setup.py @@ -5,7 +5,7 @@ from openpype.lib import PreLaunchHook from openpype.hosts.resolve.utils import setup -class ResolvePrelaunch(PreLaunchHook): +class PreLaunchResolveSetup(PreLaunchHook): """ This hook will set up the Resolve scripting environment as described in Resolve's documentation found with the installed application at diff --git a/openpype/hosts/resolve/hooks/pre_resolve_startup_script.py b/openpype/hosts/resolve/hooks/pre_resolve_startup.py similarity index 100% rename from openpype/hosts/resolve/hooks/pre_resolve_startup_script.py rename to openpype/hosts/resolve/hooks/pre_resolve_startup.py