From 59c5c464ccd3960dbf2e5260024d42c2c58436eb Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 4 Mar 2022 11:02:19 +0100
Subject: [PATCH] change how fusion calcuates workdir path

---
 openpype/hosts/fusion/scripts/fusion_switch_shot.py |  9 +++------
 openpype/hosts/fusion/utility_scripts/switch_ui.py  | 13 +++----------
 openpype/scripts/fusion_switch_shot.py              |  9 ++++-----
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/openpype/hosts/fusion/scripts/fusion_switch_shot.py b/openpype/hosts/fusion/scripts/fusion_switch_shot.py
index 9dd8a351e4..ed6a06bb34 100644
--- a/openpype/hosts/fusion/scripts/fusion_switch_shot.py
+++ b/openpype/hosts/fusion/scripts/fusion_switch_shot.py
@@ -5,11 +5,12 @@ import logging
 
 # Pipeline imports
 import avalon.api
-from avalon import io, pipeline
+from avalon import io
 
 from openpype.lib import version_up
 from openpype.hosts.fusion import api
 from openpype.hosts.fusion.api import lib
+from openpype.lib.avalon_context import get_workdir_from_session
 
 log = logging.getLogger("Update Slap Comp")
 
@@ -46,12 +47,8 @@ def _format_version_folder(folder):
 
 def _get_work_folder(session):
     """Convenience function to get the work folder path of the current asset"""
-
     # Get new filename, create path based on asset and work template
-    template_work = self._project["config"]["template"]["work"]
-    work_path = pipeline._format_work_template(template_work, session)
-
-    return os.path.normpath(work_path)
+    return get_workdir_from_session(session)
 
 
 def _get_fusion_instance():
diff --git a/openpype/hosts/fusion/utility_scripts/switch_ui.py b/openpype/hosts/fusion/utility_scripts/switch_ui.py
index fe324d9a41..854c2fd415 100644
--- a/openpype/hosts/fusion/utility_scripts/switch_ui.py
+++ b/openpype/hosts/fusion/utility_scripts/switch_ui.py
@@ -5,11 +5,12 @@ import logging
 from Qt import QtWidgets, QtCore
 
 import avalon.api
-from avalon import io, pipeline
+from avalon import io
 from avalon.vendor import qtawesome as qta
 
 from openpype import style
 from openpype.hosts.fusion import api
+from openpype.lib.avalon_context import get_workdir_from_session
 
 log = logging.getLogger("Fusion Switch Shot")
 
@@ -158,15 +159,7 @@ class App(QtWidgets.QWidget):
         switch_shot.switch(asset_name=asset, filepath=file_name, new=True)
 
     def _get_context_directory(self):
-
-        project = io.find_one({"type": "project",
-                               "name": avalon.api.Session["AVALON_PROJECT"]},
-                              projection={"config": True})
-
-        template = project["config"]["template"]["work"]
-        dir = pipeline._format_work_template(template, avalon.api.Session)
-
-        return dir
+        return get_workdir_from_session(avalon.api.Session)
 
     def collect_slap_comps(self, directory):
         items = glob.glob("{}/*.comp".format(directory))
diff --git a/openpype/scripts/fusion_switch_shot.py b/openpype/scripts/fusion_switch_shot.py
index 26f5356336..a8ac6812b5 100644
--- a/openpype/scripts/fusion_switch_shot.py
+++ b/openpype/scripts/fusion_switch_shot.py
@@ -4,13 +4,15 @@ import sys
 import logging
 
 # Pipeline imports
-from avalon import api, io, pipeline
+from avalon import api, io
 import avalon.fusion
 
 # Config imports
 import openpype.lib as pype
 import openpype.hosts.fusion.lib as fusion_lib
 
+from openpype.lib.avalon_context import get_workdir_from_session
+
 log = logging.getLogger("Update Slap Comp")
 
 self = sys.modules[__name__]
@@ -48,10 +50,7 @@ def _get_work_folder(session):
     """Convenience function to get the work folder path of the current asset"""
 
     # Get new filename, create path based on asset and work template
-    template_work = self._project["config"]["template"]["work"]
-    work_path = pipeline._format_work_template(template_work, session)
-
-    return os.path.normpath(work_path)
+    return get_workdir_from_session(session)
 
 
 def _get_fusion_instance():