move the check on the mxp_workspace being enabled in project settings…

… into the prelaunch hook

client/ayon_max/hooks/pre_copy_mxp.py

@@ -1,5 +1,6 @@
 from ayon_applications import PreLaunchHook, LaunchTypes
 from ayon_max.mxp import create_workspace_mxp
+from ayon_core.settings import get_project_settings
 
 
 class PreCopyMxp(PreLaunchHook):
@@ -12,9 +13,20 @@ class PreCopyMxp(PreLaunchHook):
 
     def execute(self):
         project_entity = self.data["project_entity"]
+        project_settings = get_project_settings(project_entity.get("name"))
+        if not project_settings:
+            return
+        mxp_workspace = project_settings["max"].get("mxp_workspace")
+        # Ensure the hook would not cause possible error
+        # when using the old addon.
+        if mxp_workspace is None:
+            self.log.warning("No mxp workspace setting found in the "
+                             "latest Max Addon.")
+            return
+
         workdir = self.launch_context.env.get("AYON_WORKDIR")
         if not workdir:
             self.log.warning("BUG: Workdir is not filled.")
             return
 
-        create_workspace_mxp(workdir, project_entity["name"])
+        create_workspace_mxp(workdir, mxp_workspace=mxp_workspace)

client/ayon_max/mxp.py

@@ -1,26 +1,14 @@
 import os
-from ayon_core.settings import get_project_settings
 from ayon_core.lib import Logger
 
 
-def create_workspace_mxp(workdir, project_name):
+def create_workspace_mxp(workdir, mxp_workspace=None):
     dst_filepath = os.path.join(workdir, "workspace.mxp")
     if os.path.exists(dst_filepath):
         return
 
-    if not os.path.exists(workdir):
-        os.makedirs(workdir)
-
-    project_settings = get_project_settings(project_name)
     log = Logger.get_logger("create_workspace_mxp")
-    mxp_workspace = project_settings["max"].get("mxp_workspace")
-    # Ensure the hook would not cause possible error
-    # when using the old addon.
-    if mxp_workspace is None:
-        log.debug("No mxp workspace setting found in the "
-                  "latest Max Addon. Please update to 0.1.8")
-        return
-
+    os.makedirs(workdir, exist_ok=True)
     max_script = default_mxp_template()
     if mxp_workspace.get("enabled_project_creation"):
         max_script = mxp_workspace.get("mxp_workspace_script")
@@ -55,7 +43,6 @@ def default_mxp_template():
         'Scenes=./',
         'Sounds=./',
         '[XReferenceDirs]',
-        'Dir1=./',
-        ''
+        'Dir1=./'
     ))
     return mxp_template