From 0ff0b6b645e1f7293347a24a638bb2afb80556e9 Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Wed, 5 Apr 2023 07:39:53 +0100
Subject: [PATCH] Move launch logic to host module.

---
 openpype/hooks/pre_add_last_workfile_arg.py   | 13 ----------
 .../hosts/maya/hooks/pre_auto_load_plugins.py | 22 +++++++++++++---
 .../pre_open_workfile_post_initialization.py  | 25 +++++++++++++++++++
 3 files changed, 43 insertions(+), 17 deletions(-)
 create mode 100644 openpype/hosts/maya/hooks/pre_open_workfile_post_initialization.py

diff --git a/openpype/hooks/pre_add_last_workfile_arg.py b/openpype/hooks/pre_add_last_workfile_arg.py
index df4aa5cc5d..2a35db869a 100644
--- a/openpype/hooks/pre_add_last_workfile_arg.py
+++ b/openpype/hooks/pre_add_last_workfile_arg.py
@@ -42,18 +42,5 @@ class AddLastWorkfileToLaunchArgs(PreLaunchHook):
             self.log.info("Current context does not have any workfile yet.")
             return
 
-        # Determine whether to open workfile post initialization.
-        if self.host_name == "maya":
-            keys = [
-                "open_workfile_post_initialization", "explicit_plugins_loading"
-            ]
-            maya_settings = self.data["project_settings"]["maya"]
-            values = [maya_settings[k] for k in keys]
-            if any(values):
-                self.log.debug("Opening workfile post initialization.")
-                key = "OPENPYPE_OPEN_WORKFILE_POST_INITIALIZATION"
-                self.data["env"][key] = "1"
-                return
-
         # Add path to workfile to arguments
         self.launch_context.launch_args.append(last_workfile)
diff --git a/openpype/hosts/maya/hooks/pre_auto_load_plugins.py b/openpype/hosts/maya/hooks/pre_auto_load_plugins.py
index 3c3ddbe4dc..689d7adb4f 100644
--- a/openpype/hosts/maya/hooks/pre_auto_load_plugins.py
+++ b/openpype/hosts/maya/hooks/pre_auto_load_plugins.py
@@ -1,15 +1,29 @@
 from openpype.lib import PreLaunchHook
 
 
-class PreAutoLoadPlugins(PreLaunchHook):
+class MayaPreAutoLoadPlugins(PreLaunchHook):
     """Define -noAutoloadPlugins command flag."""
 
-    # Execute before workfile argument.
-    order = 0
+    # Before AddLastWorkfileToLaunchArgs
+    order = 9
     app_groups = ["maya"]
 
     def execute(self):
+
+        # Ignore if there's no last workfile to start.
+        if not self.data.get("start_last_workfile"):
+            return
+
         maya_settings = self.data["project_settings"]["maya"]
-        if maya_settings["explicit_plugins_loading"]["enabled"]:
+        enabled = maya_settings["explicit_plugins_loading"]["enabled"]
+        if enabled:
+            # Force disable the `AddLastWorkfileToLaunchArgs`.
+            self.data.pop("start_last_workfile")
+
+            # Force post initialization so our dedicated plug-in load can run
+            # prior to Maya opening a scene file.
+            key = "OPENPYPE_OPEN_WORKFILE_POST_INITIALIZATION"
+            self.launch_context.env[key] = "1"
+
             self.log.debug("Explicit plugins loading.")
             self.launch_context.launch_args.append("-noAutoloadPlugins")
diff --git a/openpype/hosts/maya/hooks/pre_open_workfile_post_initialization.py b/openpype/hosts/maya/hooks/pre_open_workfile_post_initialization.py
new file mode 100644
index 0000000000..7582ce0591
--- /dev/null
+++ b/openpype/hosts/maya/hooks/pre_open_workfile_post_initialization.py
@@ -0,0 +1,25 @@
+from openpype.lib import PreLaunchHook
+
+
+class MayaPreOpenWorkfilePostInitialization(PreLaunchHook):
+    """Define whether open last workfile should run post initialize."""
+
+    # Before AddLastWorkfileToLaunchArgs.
+    order = 9
+    app_groups = ["maya"]
+
+    def execute(self):
+
+        # Ignore if there's no last workfile to start.
+        if not self.data.get("start_last_workfile"):
+            return
+
+        maya_settings = self.data["project_settings"]["maya"]
+        enabled = maya_settings["open_workfile_post_initialization"]
+        if enabled:
+            # Force disable the `AddLastWorkfileToLaunchArgs`.
+            self.data.pop("start_last_workfile")
+
+            self.log.debug("Opening workfile post initialization.")
+            key = "OPENPYPE_OPEN_WORKFILE_POST_INITIALIZATION"
+            self.launch_context.env[key] = "1"