add callback for creating project before opening workfile

ynput · May 6, 2024 · 7a028c4 · 7a028c4
1 parent ceea5d0
commit 7a028c4
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/client/ayon_core/hosts/max/api/pipeline.py b/client/ayon_core/hosts/max/api/pipeline.py
@@ -55,8 +55,7 @@ def install(self):
         self.menu = AYONMenu()
 
         register_event_callback("taskChanged", on_task_changed)
-        register_event_callback("workfile.save.before", before_workfile_save)
-
+        register_event_callback("workfile.open.before", on_before_open)
         self._has_been_setup = True
 
         def context_setting():
@@ -70,6 +69,7 @@ def context_setting():
 
         rt.callbacks.addScript(rt.Name('postWorkspaceChange'),
                                self._deferred_menu_creation)
+
         rt.NodeEventCallback(
             nameChanged=lib.update_modifier_node_names)
 
@@ -200,13 +200,11 @@ def _set_project():
         else:
             raise
 
-    dst_filepath = os.path.join(workdir, "workspace.mxp")
-    rt.pathConfig.load(dst_filepath)
-    has_project = (
+    mxp_filepath = os.path.join(workdir, "workspace.mxp")
+    if os.path.exists(mxp_filepath):
+        rt.pathConfig.load(mxp_filepath)
         rt.pathConfig.doProjectSetupStepsUsingDirectory(workdir)
-    )
-    if not has_project:
-        rt.pathConfig.setCurrentProjectFolder(workdir)
+    rt.pathConfig.setCurrentProjectFolder(workdir)
 
 
 def on_task_changed():
@@ -216,13 +214,17 @@ def on_task_changed():
         rt.pathConfig.setCurrentProjectFolder(workdir)
 
 
-def before_workfile_save(event):
+def on_before_open():
     project_name = get_current_project_name()
-    workdir_path = event["workdir_path"]
-    if workdir_path:
+    workdir_path = os.getenv("AYON_WORKDIR")
+    if os.path.exists(workdir_path):
         create_workspace_mxp(workdir_path, project_name)
-        mxp_filepath = os.path.join(workdir_path, mxp_filepath)
-        rt.pathConfig.load(mxp_filepath)
+        if rt.pathConfig.getCurrentProjectFolder() != workdir_path:
+            mxp_filepath = os.path.join(workdir_path, "workspace.mxp")
+            if os.path.exists(mxp_filepath):
+                rt.pathConfig.load(mxp_filepath)
+                rt.pathConfig.doProjectSetupStepsUsingDirectory(workdir_path)
+            rt.pathConfig.setCurrentProjectFolder(workdir_path)
 
 
 def load_custom_attribute_data():