From d9a150022e1659aec584fe962f9c47e66bfb178d Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.cocm>
Date: Mon, 5 Sep 2022 19:28:48 +0800
Subject: [PATCH 01/29] adding and loading maya mel workspace through openpype
 project setting

---
 openpype/hosts/maya/api/pipeline.py            |  4 ++--
 openpype/hosts/maya/lib.py                     | 18 ++++++++++++++++++
 .../defaults/project_settings/maya.json        | 14 ++++++++++++++
 .../projects_schema/schema_project_maya.json   | 15 +++++++++++++++
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/maya/api/pipeline.py b/openpype/hosts/maya/api/pipeline.py
index f565f6a308..5bf8b67fc2 100644
--- a/openpype/hosts/maya/api/pipeline.py
+++ b/openpype/hosts/maya/api/pipeline.py
@@ -28,7 +28,7 @@ from openpype.pipeline import (
     AVALON_CONTAINER_ID,
 )
 from openpype.pipeline.load import any_outdated_containers
-from openpype.hosts.maya.lib import copy_workspace_mel
+from openpype.hosts.maya.lib import copy_workspace_mel,load_workspace_mel
 from . import menu, lib
 from .workio import (
     open_file,
@@ -550,7 +550,7 @@ def on_task_changed():
 def before_workfile_save(event):
     workdir_path = event["workdir_path"]
     if workdir_path:
-        copy_workspace_mel(workdir_path)
+        load_workspace_mel(workdir_path)
 
 
 class MayaDirmap(HostDirmap):
diff --git a/openpype/hosts/maya/lib.py b/openpype/hosts/maya/lib.py
index 6c142053e6..d24f267bbd 100644
--- a/openpype/hosts/maya/lib.py
+++ b/openpype/hosts/maya/lib.py
@@ -1,6 +1,8 @@
 import os
 import shutil
 
+import json
+from openpype.settings import get_current_project_settings
 
 def copy_workspace_mel(workdir):
     # Check that source mel exists
@@ -24,3 +26,19 @@ def copy_workspace_mel(workdir):
         src_filepath, dst_filepath
     ))
     shutil.copy(src_filepath, dst_filepath)
+
+
+def load_workspace_mel(workdir):
+    dst_filepath = os.path.join(workdir, "workspace.mel")
+    if os.path.exists(dst_filepath):
+        return
+
+    if not os.path.exists(workdir):
+        os.makedirs(workdir)
+
+    with open(dst_filepath, "w") as mel_file:
+        setting = get_current_project_settings()
+        mel_script = setting["maya"]["mel-workspace"]["scripts"]
+        for mel in mel_script:
+            mel_file.write(mel)
+            mel_file.write("\n")
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index ac0f161cf2..0a46632042 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -15,6 +15,20 @@
             "destination-path": []
         }
     },
+    "mel-workspace":{
+        "scripts":[
+            "workspace -fr \"shaders\" \"renderData/shaders\";",
+            "workspace -fr \"images\" \"renders\";",
+            "workspace -fr \"particles\" \"particles\";",
+            "workspace -fr \"mayaAscii\" \"\";",
+            "workspace -fr \"mayaBinary\" \"\";",
+            "workspace -fr \"scene\" \"\";",
+            "workspace -fr \"alembicCache\" \"cache/alembic\";",
+            "workspace -fr \"renderData\" \"renderData\";",
+            "workspace -fr \"sourceImages\" \"sourceimages\";",
+            "workspace -fr \"fileCache\" \"cache/nCache\";"
+        ]
+    },
     "scriptsmenu": {
         "name": "OpenPype Tools",
         "definition": [
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json b/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
index cb380194a7..a774d604ca 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
@@ -53,6 +53,21 @@
                 }
             ]
         },
+        {
+            "type": "dict",
+             "collapsible": true,
+             "key": "mel-workspace",
+             "label": "Maya MEL Workspace",
+             "is_group": true,
+             "children": [
+                 {
+                    "type": "list",
+                    "object_type": "text",
+                    "key": "scripts",
+                    "label": "scripts"
+                 }
+             ]
+         },
         {
             "type": "schema",
             "name": "schema_scriptsmenu"

From b88def9aea1fc1a682209ea78edcf5ae87a652e3 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.cocm>
Date: Mon, 5 Sep 2022 19:40:30 +0800
Subject: [PATCH 02/29] adding and loading maya mel workspace through openpype
 project setting

---
 openpype/hosts/maya/lib.py                    | 27 +------------------
 .../defaults/project_settings/maya.json       |  2 +-
 .../projects_schema/schema_project_maya.json  |  4 +--
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/openpype/hosts/maya/lib.py b/openpype/hosts/maya/lib.py
index d24f267bbd..bf06c9ad7d 100644
--- a/openpype/hosts/maya/lib.py
+++ b/openpype/hosts/maya/lib.py
@@ -1,33 +1,8 @@
 import os
 import shutil
 
-import json
 from openpype.settings import get_current_project_settings
 
-def copy_workspace_mel(workdir):
-    # Check that source mel exists
-    current_dir = os.path.dirname(os.path.abspath(__file__))
-    src_filepath = os.path.join(current_dir, "resources", "workspace.mel")
-    if not os.path.exists(src_filepath):
-        print("Source mel file does not exist. {}".format(src_filepath))
-        return
-
-    # Skip if workspace.mel already exists
-    dst_filepath = os.path.join(workdir, "workspace.mel")
-    if os.path.exists(dst_filepath):
-        return
-
-    # Create workdir if does not exists yet
-    if not os.path.exists(workdir):
-        os.makedirs(workdir)
-
-    # Copy file
-    print("Copying workspace mel \"{}\" -> \"{}\"".format(
-        src_filepath, dst_filepath
-    ))
-    shutil.copy(src_filepath, dst_filepath)
-
-
 def load_workspace_mel(workdir):
     dst_filepath = os.path.join(workdir, "workspace.mel")
     if os.path.exists(dst_filepath):
@@ -38,7 +13,7 @@ def load_workspace_mel(workdir):
 
     with open(dst_filepath, "w") as mel_file:
         setting = get_current_project_settings()
-        mel_script = setting["maya"]["mel-workspace"]["scripts"]
+        mel_script = setting["maya"]["mel-workspace"]["definition"]
         for mel in mel_script:
             mel_file.write(mel)
             mel_file.write("\n")
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 0a46632042..162732280f 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -16,7 +16,7 @@
         }
     },
     "mel-workspace":{
-        "scripts":[
+        "definition":[
             "workspace -fr \"shaders\" \"renderData/shaders\";",
             "workspace -fr \"images\" \"renders\";",
             "workspace -fr \"particles\" \"particles\";",
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json b/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
index a774d604ca..7204ec586a 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
@@ -63,8 +63,8 @@
                  {
                     "type": "list",
                     "object_type": "text",
-                    "key": "scripts",
-                    "label": "scripts"
+                    "key": "definition",
+                    "label": "definition"
                  }
              ]
          },

From 109abb58987b22f6d390d424a27e209eff6b5638 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.cocm>
Date: Mon, 5 Sep 2022 19:41:09 +0800
Subject: [PATCH 03/29] adding and loading maya mel workspace through openpype
 project setting

---
 openpype/hosts/maya/api/pipeline.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/maya/api/pipeline.py b/openpype/hosts/maya/api/pipeline.py
index 5bf8b67fc2..4768a9ee4f 100644
--- a/openpype/hosts/maya/api/pipeline.py
+++ b/openpype/hosts/maya/api/pipeline.py
@@ -28,7 +28,7 @@ from openpype.pipeline import (
     AVALON_CONTAINER_ID,
 )
 from openpype.pipeline.load import any_outdated_containers
-from openpype.hosts.maya.lib import copy_workspace_mel,load_workspace_mel
+from openpype.hosts.maya.lib import load_workspace_mel
 from . import menu, lib
 from .workio import (
     open_file,

From 69d2cf20f5b4889ce674487d2da8fd2a230a093a Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.cocm>
Date: Mon, 5 Sep 2022 19:42:10 +0800
Subject: [PATCH 04/29] adding and loading maya mel workspace through openpype
 project setting

---
 openpype/hosts/maya/lib.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/hosts/maya/lib.py b/openpype/hosts/maya/lib.py
index bf06c9ad7d..2853789656 100644
--- a/openpype/hosts/maya/lib.py
+++ b/openpype/hosts/maya/lib.py
@@ -3,6 +3,7 @@ import shutil
 
 from openpype.settings import get_current_project_settings
 
+
 def load_workspace_mel(workdir):
     dst_filepath = os.path.join(workdir, "workspace.mel")
     if os.path.exists(dst_filepath):

From 26fbdac8da117c83a71b75ce6315be4044d23942 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.cocm>
Date: Wed, 7 Sep 2022 16:14:30 +0800
Subject: [PATCH 05/29] adding and loading maya mel workspace through openpype
 project setting

---
 openpype/hosts/maya/api/pipeline.py           |  5 +++--
 openpype/hosts/maya/hooks/pre_copy_mel.py     |  5 +++--
 openpype/hosts/maya/lib.py                    | 19 ++++++++++---------
 .../defaults/project_anatomy/attributes.json  |  3 +--
 .../defaults/project_settings/maya.json       | 15 +--------------
 .../projects_schema/schema_project_maya.json  | 17 ++++-------------
 6 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/openpype/hosts/maya/api/pipeline.py b/openpype/hosts/maya/api/pipeline.py
index 4768a9ee4f..4578d6fb39 100644
--- a/openpype/hosts/maya/api/pipeline.py
+++ b/openpype/hosts/maya/api/pipeline.py
@@ -28,7 +28,7 @@ from openpype.pipeline import (
     AVALON_CONTAINER_ID,
 )
 from openpype.pipeline.load import any_outdated_containers
-from openpype.hosts.maya.lib import load_workspace_mel
+from openpype.hosts.maya.lib import create_workspace_mel
 from . import menu, lib
 from .workio import (
     open_file,
@@ -548,9 +548,10 @@ def on_task_changed():
 
 
 def before_workfile_save(event):
+    project_name = os.getenv("AVALON_PROJECT")
     workdir_path = event["workdir_path"]
     if workdir_path:
-        load_workspace_mel(workdir_path)
+        create_workspace_mel(workdir_path, project_name)
 
 
 class MayaDirmap(HostDirmap):
diff --git a/openpype/hosts/maya/hooks/pre_copy_mel.py b/openpype/hosts/maya/hooks/pre_copy_mel.py
index b11e18241e..6f90af4b7c 100644
--- a/openpype/hosts/maya/hooks/pre_copy_mel.py
+++ b/openpype/hosts/maya/hooks/pre_copy_mel.py
@@ -1,5 +1,5 @@
 from openpype.lib import PreLaunchHook
-from openpype.hosts.maya.lib import copy_workspace_mel
+from openpype.hosts.maya.lib import create_workspace_mel
 
 
 class PreCopyMel(PreLaunchHook):
@@ -10,9 +10,10 @@ class PreCopyMel(PreLaunchHook):
     app_groups = ["maya"]
 
     def execute(self):
+        project_name = self.launch_context.env.get("AVALON_PROJECT")
         workdir = self.launch_context.env.get("AVALON_WORKDIR")
         if not workdir:
             self.log.warning("BUG: Workdir is not filled.")
             return
 
-        copy_workspace_mel(workdir)
+        create_workspace_mel(workdir, project_name)
diff --git a/openpype/hosts/maya/lib.py b/openpype/hosts/maya/lib.py
index 2853789656..443bf7d10e 100644
--- a/openpype/hosts/maya/lib.py
+++ b/openpype/hosts/maya/lib.py
@@ -1,10 +1,8 @@
 import os
-import shutil
-
-from openpype.settings import get_current_project_settings
+from openpype.settings import get_project_settings
 
 
-def load_workspace_mel(workdir):
+def create_workspace_mel(workdir, project_name):
     dst_filepath = os.path.join(workdir, "workspace.mel")
     if os.path.exists(dst_filepath):
         return
@@ -12,9 +10,12 @@ def load_workspace_mel(workdir):
     if not os.path.exists(workdir):
         os.makedirs(workdir)
 
+    project_setting = get_project_settings(project_name)
+    mel_script = project_setting["maya"].get("mel_workspace")
+
+    # Skip if mel script in settings is empty
+    if not mel_script:
+        return
+
     with open(dst_filepath, "w") as mel_file:
-        setting = get_current_project_settings()
-        mel_script = setting["maya"]["mel-workspace"]["definition"]
-        for mel in mel_script:
-            mel_file.write(mel)
-            mel_file.write("\n")
+        mel_file.write(mel_script)
diff --git a/openpype/settings/defaults/project_anatomy/attributes.json b/openpype/settings/defaults/project_anatomy/attributes.json
index 983ac603f9..bf8bbef8de 100644
--- a/openpype/settings/defaults/project_anatomy/attributes.json
+++ b/openpype/settings/defaults/project_anatomy/attributes.json
@@ -19,8 +19,7 @@
         "blender/2-91",
         "harmony/20",
         "photoshop/2021",
-        "aftereffects/2021",
-        "unreal/4-26"
+        "aftereffects/2021"
     ],
     "tools_env": [],
     "active": true
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 162732280f..ada69c3730 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -15,20 +15,7 @@
             "destination-path": []
         }
     },
-    "mel-workspace":{
-        "definition":[
-            "workspace -fr \"shaders\" \"renderData/shaders\";",
-            "workspace -fr \"images\" \"renders\";",
-            "workspace -fr \"particles\" \"particles\";",
-            "workspace -fr \"mayaAscii\" \"\";",
-            "workspace -fr \"mayaBinary\" \"\";",
-            "workspace -fr \"scene\" \"\";",
-            "workspace -fr \"alembicCache\" \"cache/alembic\";",
-            "workspace -fr \"renderData\" \"renderData\";",
-            "workspace -fr \"sourceImages\" \"sourceimages\";",
-            "workspace -fr \"fileCache\" \"cache/nCache\";"
-        ]
-    },
+    "mel_workspace": "workspace -fr \"shaders\" \"renderData/shaders\";\nworkspace -fr \"images\" \"renders\";\nworkspace -fr \"particles\" \"particles\";\nworkspace -fr \"mayaAscii\" \"\";\nworkspace -fr \"mayaBinary\" \"\";\nworkspace -fr \"scene\" \"\";\nworkspace -fr \"alembicCache\" \"cache/alembic\";\nworkspace -fr \"renderData\" \"renderData\";\nworkspace -fr \"sourceImages\" \"sourceimages\";\nworkspace -fr \"fileCache\" \"cache/nCache\";\n",
     "scriptsmenu": {
         "name": "OpenPype Tools",
         "definition": [
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json b/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
index 7204ec586a..978de56a51 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
@@ -54,19 +54,10 @@
             ]
         },
         {
-            "type": "dict",
-             "collapsible": true,
-             "key": "mel-workspace",
-             "label": "Maya MEL Workspace",
-             "is_group": true,
-             "children": [
-                 {
-                    "type": "list",
-                    "object_type": "text",
-                    "key": "definition",
-                    "label": "definition"
-                 }
-             ]
+            "type": "text",
+            "multiline" : true,
+            "key": "mel_workspace",
+            "label": "Maya MEL Workspace"
          },
         {
             "type": "schema",

From a9b69536cac401221cacaaa3155c4f9a7be682b8 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.cocm>
Date: Wed, 7 Sep 2022 16:44:29 +0800
Subject: [PATCH 06/29] adding and loading maya mel workspace through openpype
 project setting

---
 openpype/settings/defaults/project_anatomy/attributes.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/settings/defaults/project_anatomy/attributes.json b/openpype/settings/defaults/project_anatomy/attributes.json
index bf8bbef8de..983ac603f9 100644
--- a/openpype/settings/defaults/project_anatomy/attributes.json
+++ b/openpype/settings/defaults/project_anatomy/attributes.json
@@ -19,7 +19,8 @@
         "blender/2-91",
         "harmony/20",
         "photoshop/2021",
-        "aftereffects/2021"
+        "aftereffects/2021",
+        "unreal/4-26"
     ],
     "tools_env": [],
     "active": true

From decc11251854f60db02531f93e2b8fbd4d3fa7ec Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.cocm>
Date: Wed, 7 Sep 2022 17:06:47 +0800
Subject: [PATCH 07/29] load and edit mel workspace within the Openpype project
 settings

---
 .../settings/defaults/project_settings/maya.json     |  2 +-
 .../schemas/projects_schema/schema_project_maya.json | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index ada69c3730..bb96fcf741 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -1,4 +1,5 @@
 {
+    "mel_workspace": "workspace -fr \"shaders\" \"renderData/shaders\";\nworkspace -fr \"images\" \"renders\";\nworkspace -fr \"particles\" \"particles\";\nworkspace -fr \"mayaAscii\" \"\";\nworkspace -fr \"mayaBinary\" \"\";\nworkspace -fr \"scene\" \"\";\nworkspace -fr \"alembicCache\" \"cache/alembic\";\nworkspace -fr \"renderData\" \"renderData\";\nworkspace -fr \"sourceImages\" \"sourceimages\";\nworkspace -fr \"fileCache\" \"cache/nCache\";\n",
     "ext_mapping": {
         "model": "ma",
         "mayaAscii": "ma",
@@ -15,7 +16,6 @@
             "destination-path": []
         }
     },
-    "mel_workspace": "workspace -fr \"shaders\" \"renderData/shaders\";\nworkspace -fr \"images\" \"renders\";\nworkspace -fr \"particles\" \"particles\";\nworkspace -fr \"mayaAscii\" \"\";\nworkspace -fr \"mayaBinary\" \"\";\nworkspace -fr \"scene\" \"\";\nworkspace -fr \"alembicCache\" \"cache/alembic\";\nworkspace -fr \"renderData\" \"renderData\";\nworkspace -fr \"sourceImages\" \"sourceimages\";\nworkspace -fr \"fileCache\" \"cache/nCache\";\n",
     "scriptsmenu": {
         "name": "OpenPype Tools",
         "definition": [
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json b/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
index 978de56a51..a54f8e6e4f 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
@@ -5,6 +5,12 @@
     "label": "Maya",
     "is_file": true,
     "children": [
+        {
+            "type": "text",
+            "multiline" : true,
+            "key": "mel_workspace",
+            "label": "Maya MEL Workspace"
+         },
         {
             "type": "dict-modifiable",
             "key": "ext_mapping",
@@ -53,12 +59,6 @@
                 }
             ]
         },
-        {
-            "type": "text",
-            "multiline" : true,
-            "key": "mel_workspace",
-            "label": "Maya MEL Workspace"
-         },
         {
             "type": "schema",
             "name": "schema_scriptsmenu"

From d4eeabad7e0883bb2f2d31e0b8479e4b547ba7cc Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.cocm>
Date: Wed, 7 Sep 2022 21:17:49 +0800
Subject: [PATCH 08/29] adding and loading maya mel workspace through openpype
 project setting

---
 openpype/hosts/maya/api/pipeline.py                         | 6 +++---
 openpype/hosts/maya/lib.py                                  | 5 +++--
 .../schemas/projects_schema/schema_project_maya.json        | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/maya/api/pipeline.py b/openpype/hosts/maya/api/pipeline.py
index 4578d6fb39..6012d82263 100644
--- a/openpype/hosts/maya/api/pipeline.py
+++ b/openpype/hosts/maya/api/pipeline.py
@@ -59,7 +59,7 @@ class MayaHost(HostBase, IWorkfileHost, ILoadHost):
         self._op_events = {}
 
     def install(self):
-        project_settings = get_project_settings(os.getenv("AVALON_PROJECT"))
+        project_settings = get_project_settings(legacy_io.active_project())
         # process path mapping
         dirmap_processor = MayaDirmap("maya", project_settings)
         dirmap_processor.process_dirmap()
@@ -536,7 +536,7 @@ def on_task_changed():
         lib.update_content_on_context_change()
 
     msg = "  project: {}\n  asset: {}\n  task:{}".format(
-        legacy_io.Session["AVALON_PROJECT"],
+        legacy_io.active_project(),
         legacy_io.Session["AVALON_ASSET"],
         legacy_io.Session["AVALON_TASK"]
     )
@@ -548,7 +548,7 @@ def on_task_changed():
 
 
 def before_workfile_save(event):
-    project_name = os.getenv("AVALON_PROJECT")
+    project_name = legacy_io.active_project()
     workdir_path = event["workdir_path"]
     if workdir_path:
         create_workspace_mel(workdir_path, project_name)
diff --git a/openpype/hosts/maya/lib.py b/openpype/hosts/maya/lib.py
index 443bf7d10e..e466850810 100644
--- a/openpype/hosts/maya/lib.py
+++ b/openpype/hosts/maya/lib.py
@@ -1,6 +1,6 @@
 import os
 from openpype.settings import get_project_settings
-
+from openpype.api import Logger
 
 def create_workspace_mel(workdir, project_name):
     dst_filepath = os.path.join(workdir, "workspace.mel")
@@ -15,7 +15,8 @@ def create_workspace_mel(workdir, project_name):
 
     # Skip if mel script in settings is empty
     if not mel_script:
-        return
+        log = Logger.get_logger("create_workspace_mel")
+        log.debug("File 'workspace.mel' not created. Settings value is empty.")
 
     with open(dst_filepath, "w") as mel_file:
         mel_file.write(mel_script)
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json b/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
index a54f8e6e4f..72c974642f 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
@@ -8,6 +8,7 @@
         {
             "type": "text",
             "multiline" : true,
+            "use_label_wrap": true,
             "key": "mel_workspace",
             "label": "Maya MEL Workspace"
          },

From a6d7df1423fdd5ec37744a34042e01a76776f263 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.cocm>
Date: Wed, 7 Sep 2022 21:19:15 +0800
Subject: [PATCH 09/29] adding and loading maya mel workspace through openpype
 project setting

---
 openpype/hosts/maya/lib.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/hosts/maya/lib.py b/openpype/hosts/maya/lib.py
index e466850810..e07e174dd6 100644
--- a/openpype/hosts/maya/lib.py
+++ b/openpype/hosts/maya/lib.py
@@ -2,6 +2,7 @@ import os
 from openpype.settings import get_project_settings
 from openpype.api import Logger
 
+
 def create_workspace_mel(workdir, project_name):
     dst_filepath = os.path.join(workdir, "workspace.mel")
     if os.path.exists(dst_filepath):

From b7256e7c19ba376e438a88ca5d0b4a9609a44423 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.cocm>
Date: Wed, 7 Sep 2022 21:49:02 +0800
Subject: [PATCH 10/29] adding and loading maya mel workspace through openpype
 project setting

---
 openpype/hosts/maya/lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/maya/lib.py b/openpype/hosts/maya/lib.py
index e07e174dd6..6f7bb8f986 100644
--- a/openpype/hosts/maya/lib.py
+++ b/openpype/hosts/maya/lib.py
@@ -1,6 +1,6 @@
 import os
 from openpype.settings import get_project_settings
-from openpype.api import Logger
+from openpype.lib import Logger
 
 
 def create_workspace_mel(workdir, project_name):

From 9bcd86bac7ca0294fc41bc3d2465166b3b5e8861 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.cocm>
Date: Wed, 7 Sep 2022 22:12:16 +0800
Subject: [PATCH 11/29] load and edit mel workspace within the Openpype project
 settings

---
 openpype/hosts/maya/lib.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/hosts/maya/lib.py b/openpype/hosts/maya/lib.py
index 6f7bb8f986..ffb2f0b27c 100644
--- a/openpype/hosts/maya/lib.py
+++ b/openpype/hosts/maya/lib.py
@@ -18,6 +18,7 @@ def create_workspace_mel(workdir, project_name):
     if not mel_script:
         log = Logger.get_logger("create_workspace_mel")
         log.debug("File 'workspace.mel' not created. Settings value is empty.")
+        return
 
     with open(dst_filepath, "w") as mel_file:
         mel_file.write(mel_script)

From d0665c3928ecff4176f6e22b676384f09485c173 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 9 Sep 2022 13:06:12 +0200
Subject: [PATCH 12/29] Change `mayaascii` -> `mayaAscii`

---
 .../ftrack/plugins/publish/integrate_ftrack_instances.py        | 2 +-
 openpype/settings/defaults/project_settings/ftrack.json         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
index 6024781d87..7e5815b100 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
@@ -35,7 +35,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
     family_mapping = {
         "camera": "cam",
         "look": "look",
-        "mayaascii": "scene",
+        "mayaAscii": "scene",
         "model": "geo",
         "rig": "rig",
         "setdress": "setdress",
diff --git a/openpype/settings/defaults/project_settings/ftrack.json b/openpype/settings/defaults/project_settings/ftrack.json
index 09b194e21c..cdf861df4a 100644
--- a/openpype/settings/defaults/project_settings/ftrack.json
+++ b/openpype/settings/defaults/project_settings/ftrack.json
@@ -455,7 +455,7 @@
             "family_mapping": {
                 "camera": "cam",
                 "look": "look",
-                "mayaascii": "scene",
+                "mayaAscii": "scene",
                 "model": "geo",
                 "rig": "rig",
                 "setdress": "setdress",

From e76ec9e5aff5651070bcc817e9c0b60a9a980ce4 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.cocm>
Date: Mon, 12 Sep 2022 16:26:35 +0800
Subject: [PATCH 13/29] adding and loading mel workspace within openpype
 settings

---
 openpype/hosts/maya/resources/workspace.mel | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 openpype/hosts/maya/resources/workspace.mel

diff --git a/openpype/hosts/maya/resources/workspace.mel b/openpype/hosts/maya/resources/workspace.mel
deleted file mode 100644
index f7213fa4f6..0000000000
--- a/openpype/hosts/maya/resources/workspace.mel
+++ /dev/null
@@ -1,11 +0,0 @@
-//Maya 2018 Project Definition
-
-workspace -fr "shaders" "renderData/shaders";
-workspace -fr "alembicCache" "cache/alembic";
-workspace -fr "mayaAscii" "";
-workspace -fr "mayaBinary" "";
-workspace -fr "renderData" "renderData";
-workspace -fr "fileCache" "cache/nCache";
-workspace -fr "scene" "";
-workspace -fr "sourceImages" "sourceimages";
-workspace -fr "images" "renders";

From 6e2ffc1e5ceb134f17fcedd1646f2cec0014a43a Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 13 Sep 2022 10:33:41 +0200
Subject: [PATCH 14/29] Remove getting project name and settings twice

---
 openpype/hosts/maya/api/pipeline.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openpype/hosts/maya/api/pipeline.py b/openpype/hosts/maya/api/pipeline.py
index acd8a55aa4..45c52cd0d5 100644
--- a/openpype/hosts/maya/api/pipeline.py
+++ b/openpype/hosts/maya/api/pipeline.py
@@ -66,8 +66,6 @@ class MayaHost(HostBase, IWorkfileHost, ILoadHost):
         project_name = legacy_io.active_project()
         project_settings = get_project_settings(project_name)
         # process path mapping
-        project_name = legacy_io.active_project()
-        project_settings = get_project_settings(project_name)
         dirmap_processor = MayaDirmap("maya", project_name, project_settings)
         dirmap_processor.process_dirmap()
 

From b14ab9f2aff93fce85cec7b6403183a0b7dcf511 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Sep 2022 12:31:44 +0200
Subject: [PATCH 15/29] added publisher to host tools

---
 openpype/tools/utils/host_tools.py | 37 ++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/openpype/tools/utils/host_tools.py b/openpype/tools/utils/host_tools.py
index 52d15a59f7..3177ed35aa 100644
--- a/openpype/tools/utils/host_tools.py
+++ b/openpype/tools/utils/host_tools.py
@@ -32,6 +32,7 @@ class HostToolsHelper:
         self._workfiles_tool = None
         self._loader_tool = None
         self._creator_tool = None
+        self._publisher_tool = None
         self._subset_manager_tool = None
         self._scene_inventory_tool = None
         self._library_loader_tool = None
@@ -205,6 +206,7 @@ class HostToolsHelper:
         pyblish_show = self._discover_pyblish_gui()
         return pyblish_show(parent)
 
+
     def _discover_pyblish_gui(self):
         """Return the most desirable of the currently registered GUIs"""
         # Prefer last registered
@@ -269,6 +271,30 @@ class HostToolsHelper:
             dialog.activateWindow()
             dialog.showNormal()
 
+    def get_publisher_tool(self, parent):
+        """Create, cache and return scene inventory tool window."""
+        if self._scene_inventory_tool is None:
+            from openpype.tools.publisher import PublisherWindow
+
+            host = registered_host()
+            ILoadHost.validate_load_methods(host)
+
+            publisher_window = PublisherWindow(
+                parent=parent or self._parent
+            )
+            self._publisher_tool = publisher_window
+
+        return self._publisher_tool
+
+    def show_publisher_tool(self, parent=None):
+        with qt_app_context():
+            dialog = self.get_publisher_tool(parent)
+
+            dialog.show()
+            dialog.raise_()
+            dialog.activateWindow()
+            dialog.showNormal()
+
     def get_tool_by_name(self, tool_name, parent=None, *args, **kwargs):
         """Show tool by it's name.
 
@@ -298,6 +324,10 @@ class HostToolsHelper:
         elif tool_name == "publish":
             self.log.info("Can't return publish tool window.")
 
+        # "new" publisher
+        elif tool_name == "publisher":
+            return self.get_publisher_tool(parent, *args, **kwargs)
+
         elif tool_name == "experimental_tools":
             return self.get_experimental_tools_dialog(parent, *args, **kwargs)
 
@@ -335,6 +365,9 @@ class HostToolsHelper:
         elif tool_name == "publish":
             self.show_publish(parent, *args, **kwargs)
 
+        elif tool_name == "publisher":
+            self.show_publisher_tool(parent, *args, **kwargs)
+
         elif tool_name == "experimental_tools":
             self.show_experimental_tools_dialog(parent, *args, **kwargs)
 
@@ -414,6 +447,10 @@ def show_publish(parent=None):
     _SingletonPoint.show_tool_by_name("publish", parent)
 
 
+def show_publisher(parent=None):
+    _SingletonPoint.show_tool_by_name("publisher", parent)
+
+
 def show_experimental_tools_dialog(parent=None):
     _SingletonPoint.show_tool_by_name("experimental_tools", parent)
 

From 7ad8aa34db533c97de270d520874a307caa93fe4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Sep 2022 12:38:36 +0200
Subject: [PATCH 16/29] fix variable usage

---
 openpype/tools/utils/host_tools.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/tools/utils/host_tools.py b/openpype/tools/utils/host_tools.py
index 3177ed35aa..f7e6d330ed 100644
--- a/openpype/tools/utils/host_tools.py
+++ b/openpype/tools/utils/host_tools.py
@@ -273,7 +273,8 @@ class HostToolsHelper:
 
     def get_publisher_tool(self, parent):
         """Create, cache and return scene inventory tool window."""
-        if self._scene_inventory_tool is None:
+
+        if self._publisher_tool is None:
             from openpype.tools.publisher import PublisherWindow
 
             host = registered_host()

From a440a92838772c967f1bb844534153fe9814f4fc Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 13 Sep 2022 13:34:37 +0200
Subject: [PATCH 17/29] Fix docstring

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
---
 openpype/tools/utils/host_tools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/tools/utils/host_tools.py b/openpype/tools/utils/host_tools.py
index f7e6d330ed..7208e0a500 100644
--- a/openpype/tools/utils/host_tools.py
+++ b/openpype/tools/utils/host_tools.py
@@ -272,7 +272,7 @@ class HostToolsHelper:
             dialog.showNormal()
 
     def get_publisher_tool(self, parent):
-        """Create, cache and return scene inventory tool window."""
+        """Create, cache and return publisher window."""
 
         if self._publisher_tool is None:
             from openpype.tools.publisher import PublisherWindow

From 9e5e5d59210a82d6c171f3871834955d326b2a0b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Sep 2022 13:35:38 +0200
Subject: [PATCH 18/29] remove unnecessary lines

---
 openpype/tools/utils/host_tools.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openpype/tools/utils/host_tools.py b/openpype/tools/utils/host_tools.py
index 7208e0a500..d2f05d3302 100644
--- a/openpype/tools/utils/host_tools.py
+++ b/openpype/tools/utils/host_tools.py
@@ -194,7 +194,6 @@ class HostToolsHelper:
             library_loader_tool.showNormal()
             library_loader_tool.refresh()
 
-
     def show_publish(self, parent=None):
         """Try showing the most desirable publish GUI
 
@@ -206,7 +205,6 @@ class HostToolsHelper:
         pyblish_show = self._discover_pyblish_gui()
         return pyblish_show(parent)
 
-
     def _discover_pyblish_gui(self):
         """Return the most desirable of the currently registered GUIs"""
         # Prefer last registered

From ecee2d2be5d33c4014effa836f620114cfc1bf9a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Sep 2022 14:02:11 +0200
Subject: [PATCH 19/29] implemented 'check_ftrack_url' in ftrack module

---
 openpype/modules/ftrack/__init__.py      |  8 ++-
 openpype/modules/ftrack/ftrack_module.py | 69 ++++++++++++++++++++----
 2 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/openpype/modules/ftrack/__init__.py b/openpype/modules/ftrack/__init__.py
index 7261254c6f..6dc67b74b9 100644
--- a/openpype/modules/ftrack/__init__.py
+++ b/openpype/modules/ftrack/__init__.py
@@ -1,9 +1,13 @@
 from .ftrack_module import (
     FtrackModule,
-    FTRACK_MODULE_DIR
+    FTRACK_MODULE_DIR,
+
+    check_ftrack_url,
 )
 
 __all__ = (
     "FtrackModule",
-    "FTRACK_MODULE_DIR"
+    "FTRACK_MODULE_DIR",
+
+    "check_ftrack_url",
 )
diff --git a/openpype/modules/ftrack/ftrack_module.py b/openpype/modules/ftrack/ftrack_module.py
index cb4f204523..e00f9d89c6 100644
--- a/openpype/modules/ftrack/ftrack_module.py
+++ b/openpype/modules/ftrack/ftrack_module.py
@@ -12,8 +12,10 @@ from openpype_interfaces import (
     ISettingsChangeListener
 )
 from openpype.settings import SaveWarningExc
+from openpype.lib import Logger
 
 FTRACK_MODULE_DIR = os.path.dirname(os.path.abspath(__file__))
+_PLACEHOLDER = object()
 
 
 class FtrackModule(
@@ -28,17 +30,8 @@ class FtrackModule(
         ftrack_settings = settings[self.name]
 
         self.enabled = ftrack_settings["enabled"]
-        # Add http schema
-        ftrack_url = ftrack_settings["ftrack_server"].strip("/ ")
-        if ftrack_url:
-            if "http" not in ftrack_url:
-                ftrack_url = "https://" + ftrack_url
-
-            # Check if "ftrack.app" is part os url
-            if "ftrackapp.com" not in ftrack_url:
-                ftrack_url = ftrack_url + ".ftrackapp.com"
-
-        self.ftrack_url = ftrack_url
+        self._settings_ftrack_url = ftrack_settings["ftrack_server"]
+        self._ftrack_url = _PLACEHOLDER
 
         current_dir = os.path.dirname(os.path.abspath(__file__))
         low_platform = platform.system().lower()
@@ -70,6 +63,16 @@ class FtrackModule(
         self.timers_manager_connector = None
         self._timers_manager_module = None
 
+    def get_ftrack_url(self):
+        if self._ftrack_url is _PLACEHOLDER:
+            self._ftrack_url = check_ftrack_url(
+                self._settings_ftrack_url,
+                logger=self.log
+            )
+        return self._ftrack_url
+
+    ftrack_url = property(get_ftrack_url)
+
     def get_global_environments(self):
         """Ftrack's global environments."""
         return {
@@ -479,6 +482,50 @@ class FtrackModule(
         click_group.add_command(cli_main)
 
 
+def _check_ftrack_url(url):
+    import requests
+
+    try:
+        result = requests.get(url, allow_redirects=False)
+    except requests.exceptions.RequestException:
+        return False
+
+    if (result.status_code != 200 or "FTRACK_VERSION" not in result.headers):
+        return False
+    return True
+
+
+def check_ftrack_url(url, log_errors=True, logger=None):
+    """Checks if Ftrack server is responding"""
+
+    if logger is None:
+        logger = Logger.get_logger(__name__)
+
+    url = url.strip("/ ")
+    if not url:
+        logger.error("Ftrack URL is not set!")
+        return None
+
+    if not url.startswith("http"):
+        url = "https://" + url
+
+    ftrack_url = None
+    if not url.endswith("ftrackapp.com"):
+        ftrackapp_url = url + ".ftrackapp.com"
+        if _check_ftrack_url(ftrackapp_url):
+            ftrack_url = ftrackapp_url
+
+    if not ftrack_url and _check_ftrack_url(url):
+        ftrack_url = url
+
+    if ftrack_url:
+        logger.debug("Ftrack server \"{}\" is accessible.".format(ftrack_url))
+    elif log_errors:
+        logger.error("Entered Ftrack URL \"{}\" is not accesible!".format(url))
+
+    return ftrack_url
+
+
 @click.group(FtrackModule.name, help="Ftrack module related commands.")
 def cli_main():
     pass

From b29f26b28cb9350c0460b8bd8b89a8bfcbf0c7cd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Sep 2022 14:02:42 +0200
Subject: [PATCH 20/29] changed imports in ftrack tray

---
 openpype/modules/ftrack/tray/ftrack_tray.py | 40 +++++++++------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/openpype/modules/ftrack/tray/ftrack_tray.py b/openpype/modules/ftrack/tray/ftrack_tray.py
index 501d837a4c..a6a87b8ef9 100644
--- a/openpype/modules/ftrack/tray/ftrack_tray.py
+++ b/openpype/modules/ftrack/tray/ftrack_tray.py
@@ -6,22 +6,18 @@ import threading
 from Qt import QtCore, QtWidgets, QtGui
 
 import ftrack_api
-from ..ftrack_server.lib import check_ftrack_url
-from ..ftrack_server import socket_thread
-from ..lib import credentials
-from ..ftrack_module import FTRACK_MODULE_DIR
-from . import login_dialog
-
 from openpype import resources
 from openpype.lib import Logger
-
-
-log = Logger.get_logger("FtrackModule")
+from openpype_modules.ftrack import check_ftrack_url, FTRACK_MODULE_DIR
+from openpype_modules.ftrack.ftrack_server import socket_thread
+from openpype_modules.ftrack.lib import credentials
+from . import login_dialog
 
 
 class FtrackTrayWrapper:
     def __init__(self, module):
         self.module = module
+        self.log = Logger.get_logger(self.__class__.__name__)
 
         self.thread_action_server = None
         self.thread_socket_server = None
@@ -62,19 +58,19 @@ class FtrackTrayWrapper:
         if validation:
             self.widget_login.set_credentials(ft_user, ft_api_key)
             self.module.set_credentials_to_env(ft_user, ft_api_key)
-            log.info("Connected to Ftrack successfully")
+            self.log.info("Connected to Ftrack successfully")
             self.on_login_change()
 
             return validation
 
         if not validation and ft_user and ft_api_key:
-            log.warning(
+            self.log.warning(
                 "Current Ftrack credentials are not valid. {}: {} - {}".format(
                     str(os.environ.get("FTRACK_SERVER")), ft_user, ft_api_key
                 )
             )
 
-        log.info("Please sign in to Ftrack")
+        self.log.info("Please sign in to Ftrack")
         self.bool_logged = False
         self.show_login_widget()
         self.set_menu_visibility()
@@ -104,7 +100,7 @@ class FtrackTrayWrapper:
             self.action_credentials.setIcon(self.icon_not_logged)
             self.action_credentials.setToolTip("Logged out")
 
-        log.info("Logged out of Ftrack")
+        self.log.info("Logged out of Ftrack")
         self.bool_logged = False
         self.set_menu_visibility()
 
@@ -126,10 +122,6 @@ class FtrackTrayWrapper:
         ftrack_url = self.module.ftrack_url
         os.environ["FTRACK_SERVER"] = ftrack_url
 
-        parent_file_path = os.path.dirname(
-            os.path.dirname(os.path.realpath(__file__))
-        )
-
         min_fail_seconds = 5
         max_fail_count = 3
         wait_time_after_max_fail = 10
@@ -154,7 +146,7 @@ class FtrackTrayWrapper:
         # Main loop
         while True:
             if not self.bool_action_server_running:
-                log.debug("Action server was pushed to stop.")
+                self.log.debug("Action server was pushed to stop.")
                 break
 
             # Check if accessible Ftrack and Mongo url
@@ -164,7 +156,9 @@ class FtrackTrayWrapper:
             # Run threads only if Ftrack is accessible
             if not ftrack_accessible:
                 if not printed_ftrack_error:
-                    log.warning("Can't access Ftrack {}".format(ftrack_url))
+                    self.log.warning(
+                        "Can't access Ftrack {}".format(ftrack_url)
+                    )
 
                 if self.thread_socket_server is not None:
                     self.thread_socket_server.stop()
@@ -191,7 +185,7 @@ class FtrackTrayWrapper:
                     self.set_menu_visibility()
 
                 elif failed_count == max_fail_count:
-                    log.warning((
+                    self.log.warning((
                         "Action server failed {} times."
                         " I'll try to run again {}s later"
                     ).format(
@@ -243,10 +237,10 @@ class FtrackTrayWrapper:
                 self.thread_action_server.join()
                 self.thread_action_server = None
 
-            log.info("Ftrack action server was forced to stop")
+            self.log.info("Ftrack action server was forced to stop")
 
         except Exception:
-            log.warning(
+            self.log.warning(
                 "Error has happened during Killing action server",
                 exc_info=True
             )
@@ -343,7 +337,7 @@ class FtrackTrayWrapper:
                 self.thread_timer = None
 
         except Exception as e:
-            log.error("During Killing Timer event server: {0}".format(e))
+            self.log.error("During Killing Timer event server: {0}".format(e))
 
     def changed_user(self):
         self.stop_action_server()

From 21e050a8f18a272da3e200405550be6570e9f3d9 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Sep 2022 14:05:25 +0200
Subject: [PATCH 21/29] use new import of 'check_ftrack_url'

---
 openpype/modules/ftrack/ftrack_module.py      |  2 +-
 .../modules/ftrack/ftrack_server/__init__.py  |  2 --
 .../ftrack/ftrack_server/event_server_cli.py  |  6 ++--
 openpype/modules/ftrack/ftrack_server/lib.py  | 35 +------------------
 openpype/modules/ftrack/lib/avalon_sync.py    |  7 ++--
 5 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/openpype/modules/ftrack/ftrack_module.py b/openpype/modules/ftrack/ftrack_module.py
index e00f9d89c6..899711e33e 100644
--- a/openpype/modules/ftrack/ftrack_module.py
+++ b/openpype/modules/ftrack/ftrack_module.py
@@ -6,7 +6,7 @@ import platform
 import click
 
 from openpype.modules import OpenPypeModule
-from openpype_interfaces import (
+from openpype.modules.interfaces import (
     ITrayModule,
     IPluginPaths,
     ISettingsChangeListener
diff --git a/openpype/modules/ftrack/ftrack_server/__init__.py b/openpype/modules/ftrack/ftrack_server/__init__.py
index 9e3920b500..8e5f7c4c51 100644
--- a/openpype/modules/ftrack/ftrack_server/__init__.py
+++ b/openpype/modules/ftrack/ftrack_server/__init__.py
@@ -1,8 +1,6 @@
 from .ftrack_server import FtrackServer
-from .lib import check_ftrack_url
 
 
 __all__ = (
     "FtrackServer",
-    "check_ftrack_url"
 )
diff --git a/openpype/modules/ftrack/ftrack_server/event_server_cli.py b/openpype/modules/ftrack/ftrack_server/event_server_cli.py
index 3ef7c8270a..2848469bc3 100644
--- a/openpype/modules/ftrack/ftrack_server/event_server_cli.py
+++ b/openpype/modules/ftrack/ftrack_server/event_server_cli.py
@@ -20,9 +20,11 @@ from openpype.lib import (
     get_openpype_version,
     get_build_version,
 )
-from openpype_modules.ftrack import FTRACK_MODULE_DIR
+from openpype_modules.ftrack import (
+    FTRACK_MODULE_DIR,
+    check_ftrack_url,
+)
 from openpype_modules.ftrack.lib import credentials
-from openpype_modules.ftrack.ftrack_server.lib import check_ftrack_url
 from openpype_modules.ftrack.ftrack_server import socket_thread
 
 
diff --git a/openpype/modules/ftrack/ftrack_server/lib.py b/openpype/modules/ftrack/ftrack_server/lib.py
index 947dacf917..c8143f739c 100644
--- a/openpype/modules/ftrack/ftrack_server/lib.py
+++ b/openpype/modules/ftrack/ftrack_server/lib.py
@@ -26,45 +26,12 @@ except ImportError:
 from openpype_modules.ftrack.lib import get_ftrack_event_mongo_info
 
 from openpype.client import OpenPypeMongoConnection
-from openpype.api import Logger
+from openpype.lib import Logger
 
 TOPIC_STATUS_SERVER = "openpype.event.server.status"
 TOPIC_STATUS_SERVER_RESULT = "openpype.event.server.status.result"
 
 
-def check_ftrack_url(url, log_errors=True, logger=None):
-    """Checks if Ftrack server is responding"""
-    if logger is None:
-        logger = Logger.get_logger(__name__)
-
-    if not url:
-        logger.error("Ftrack URL is not set!")
-        return None
-
-    url = url.strip('/ ')
-
-    if 'http' not in url:
-        if url.endswith('ftrackapp.com'):
-            url = 'https://' + url
-        else:
-            url = 'https://{0}.ftrackapp.com'.format(url)
-    try:
-        result = requests.get(url, allow_redirects=False)
-    except requests.exceptions.RequestException:
-        if log_errors:
-            logger.error("Entered Ftrack URL is not accesible!")
-        return False
-
-    if (result.status_code != 200 or 'FTRACK_VERSION' not in result.headers):
-        if log_errors:
-            logger.error("Entered Ftrack URL is not accesible!")
-        return False
-
-    logger.debug("Ftrack server {} is accessible.".format(url))
-
-    return url
-
-
 class SocketBaseEventHub(ftrack_api.event.hub.EventHub):
 
     hearbeat_msg = b"hearbeat"
diff --git a/openpype/modules/ftrack/lib/avalon_sync.py b/openpype/modules/ftrack/lib/avalon_sync.py
index 72be6a8e9a..935d1e85c9 100644
--- a/openpype/modules/ftrack/lib/avalon_sync.py
+++ b/openpype/modules/ftrack/lib/avalon_sync.py
@@ -19,11 +19,8 @@ from openpype.client.operations import (
     CURRENT_PROJECT_SCHEMA,
     CURRENT_PROJECT_CONFIG_SCHEMA,
 )
-from openpype.api import (
-    Logger,
-    get_anatomy_settings
-)
-from openpype.lib import ApplicationManager
+from openpype.settings import get_anatomy_settings
+from openpype.lib import ApplicationManager, Logger
 from openpype.pipeline import AvalonMongoDB, schema
 
 from .constants import CUST_ATTR_ID_KEY, FPS_KEYS

From 98f1312ce999e4be72a1a90bce99c75be967cdfd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 13 Sep 2022 15:06:31 +0200
Subject: [PATCH 22/29] Modify log message

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
---
 openpype/modules/ftrack/ftrack_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/ftrack/ftrack_module.py b/openpype/modules/ftrack/ftrack_module.py
index 899711e33e..2ab0eb8239 100644
--- a/openpype/modules/ftrack/ftrack_module.py
+++ b/openpype/modules/ftrack/ftrack_module.py
@@ -521,7 +521,7 @@ def check_ftrack_url(url, log_errors=True, logger=None):
     if ftrack_url:
         logger.debug("Ftrack server \"{}\" is accessible.".format(ftrack_url))
     elif log_errors:
-        logger.error("Entered Ftrack URL \"{}\" is not accesible!".format(url))
+        logger.error("Entered Ftrack URL \"{}\" is not accessible!".format(url))
 
     return ftrack_url
 

From aead601397e0ebecfafb6da62570c0585f627018 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Sep 2022 15:11:20 +0200
Subject: [PATCH 23/29] unify messages

---
 openpype/modules/ftrack/ftrack_module.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/modules/ftrack/ftrack_module.py b/openpype/modules/ftrack/ftrack_module.py
index 2ab0eb8239..e79910372f 100644
--- a/openpype/modules/ftrack/ftrack_module.py
+++ b/openpype/modules/ftrack/ftrack_module.py
@@ -520,8 +520,9 @@ def check_ftrack_url(url, log_errors=True, logger=None):
 
     if ftrack_url:
         logger.debug("Ftrack server \"{}\" is accessible.".format(ftrack_url))
+
     elif log_errors:
-        logger.error("Entered Ftrack URL \"{}\" is not accessible!".format(url))
+        logger.error("Ftrack server \"{}\" is not accessible!".format(url))
 
     return ftrack_url
 

From 0291d2a7054b6b551fc8e5dc1092a87a026838d8 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Sep 2022 15:15:18 +0200
Subject: [PATCH 24/29] renamed 'check_ftrack_url' to 'resolve_ftrack_url'

---
 openpype/modules/ftrack/__init__.py                       | 4 ++--
 openpype/modules/ftrack/ftrack_module.py                  | 6 +++---
 openpype/modules/ftrack/ftrack_server/event_server_cli.py | 8 ++++----
 openpype/modules/ftrack/tray/ftrack_tray.py               | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/openpype/modules/ftrack/__init__.py b/openpype/modules/ftrack/__init__.py
index 6dc67b74b9..e520f08337 100644
--- a/openpype/modules/ftrack/__init__.py
+++ b/openpype/modules/ftrack/__init__.py
@@ -2,12 +2,12 @@ from .ftrack_module import (
     FtrackModule,
     FTRACK_MODULE_DIR,
 
-    check_ftrack_url,
+    resolve_ftrack_url,
 )
 
 __all__ = (
     "FtrackModule",
     "FTRACK_MODULE_DIR",
 
-    "check_ftrack_url",
+    "resolve_ftrack_url",
 )
diff --git a/openpype/modules/ftrack/ftrack_module.py b/openpype/modules/ftrack/ftrack_module.py
index e79910372f..05ea7b79d1 100644
--- a/openpype/modules/ftrack/ftrack_module.py
+++ b/openpype/modules/ftrack/ftrack_module.py
@@ -65,7 +65,7 @@ class FtrackModule(
 
     def get_ftrack_url(self):
         if self._ftrack_url is _PLACEHOLDER:
-            self._ftrack_url = check_ftrack_url(
+            self._ftrack_url = resolve_ftrack_url(
                 self._settings_ftrack_url,
                 logger=self.log
             )
@@ -495,8 +495,8 @@ def _check_ftrack_url(url):
     return True
 
 
-def check_ftrack_url(url, log_errors=True, logger=None):
-    """Checks if Ftrack server is responding"""
+def resolve_ftrack_url(url, log_errors=True, logger=None):
+    """Checks if Ftrack server is responding."""
 
     if logger is None:
         logger = Logger.get_logger(__name__)
diff --git a/openpype/modules/ftrack/ftrack_server/event_server_cli.py b/openpype/modules/ftrack/ftrack_server/event_server_cli.py
index 2848469bc3..20c5ab24a8 100644
--- a/openpype/modules/ftrack/ftrack_server/event_server_cli.py
+++ b/openpype/modules/ftrack/ftrack_server/event_server_cli.py
@@ -22,7 +22,7 @@ from openpype.lib import (
 )
 from openpype_modules.ftrack import (
     FTRACK_MODULE_DIR,
-    check_ftrack_url,
+    resolve_ftrack_url,
 )
 from openpype_modules.ftrack.lib import credentials
 from openpype_modules.ftrack.ftrack_server import socket_thread
@@ -116,7 +116,7 @@ def legacy_server(ftrack_url):
 
     while True:
         if not ftrack_accessible:
-            ftrack_accessible = check_ftrack_url(ftrack_url)
+            ftrack_accessible = resolve_ftrack_url(ftrack_url)
 
         # Run threads only if Ftrack is accessible
         if not ftrack_accessible and not printed_ftrack_error:
@@ -259,7 +259,7 @@ def main_loop(ftrack_url):
     while True:
         # Check if accessible Ftrack and Mongo url
         if not ftrack_accessible:
-            ftrack_accessible = check_ftrack_url(ftrack_url)
+            ftrack_accessible = resolve_ftrack_url(ftrack_url)
 
         if not mongo_accessible:
             mongo_accessible = check_mongo_url(mongo_uri)
@@ -443,7 +443,7 @@ def run_event_server(
         os.environ["CLOCKIFY_API_KEY"] = clockify_api_key
 
     # Check url regex and accessibility
-    ftrack_url = check_ftrack_url(ftrack_url)
+    ftrack_url = resolve_ftrack_url(ftrack_url)
     if not ftrack_url:
         print('Exiting! < Please enter Ftrack server url >')
         return 1
diff --git a/openpype/modules/ftrack/tray/ftrack_tray.py b/openpype/modules/ftrack/tray/ftrack_tray.py
index a6a87b8ef9..e3c6e30ead 100644
--- a/openpype/modules/ftrack/tray/ftrack_tray.py
+++ b/openpype/modules/ftrack/tray/ftrack_tray.py
@@ -8,7 +8,7 @@ from Qt import QtCore, QtWidgets, QtGui
 import ftrack_api
 from openpype import resources
 from openpype.lib import Logger
-from openpype_modules.ftrack import check_ftrack_url, FTRACK_MODULE_DIR
+from openpype_modules.ftrack import resolve_ftrack_url, FTRACK_MODULE_DIR
 from openpype_modules.ftrack.ftrack_server import socket_thread
 from openpype_modules.ftrack.lib import credentials
 from . import login_dialog
@@ -151,7 +151,7 @@ class FtrackTrayWrapper:
 
             # Check if accessible Ftrack and Mongo url
             if not ftrack_accessible:
-                ftrack_accessible = check_ftrack_url(ftrack_url)
+                ftrack_accessible = resolve_ftrack_url(ftrack_url)
 
             # Run threads only if Ftrack is accessible
             if not ftrack_accessible:

From 09519c25a804186f9cc4afb92131d0572211f712 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Sep 2022 15:17:25 +0200
Subject: [PATCH 25/29] removed unused argument 'log_errors'

---
 openpype/modules/ftrack/ftrack_module.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/modules/ftrack/ftrack_module.py b/openpype/modules/ftrack/ftrack_module.py
index 05ea7b79d1..68575009b2 100644
--- a/openpype/modules/ftrack/ftrack_module.py
+++ b/openpype/modules/ftrack/ftrack_module.py
@@ -495,7 +495,7 @@ def _check_ftrack_url(url):
     return True
 
 
-def resolve_ftrack_url(url, log_errors=True, logger=None):
+def resolve_ftrack_url(url, logger=None):
     """Checks if Ftrack server is responding."""
 
     if logger is None:
@@ -521,7 +521,7 @@ def resolve_ftrack_url(url, log_errors=True, logger=None):
     if ftrack_url:
         logger.debug("Ftrack server \"{}\" is accessible.".format(ftrack_url))
 
-    elif log_errors:
+    else:
         logger.error("Ftrack server \"{}\" is not accessible!".format(url))
 
     return ftrack_url

From 477266f1407e84e2ba9d086107e15e8fc5173e79 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Sep 2022 15:18:56 +0200
Subject: [PATCH 26/29] better variable name for ftrack url value check

---
 openpype/modules/ftrack/ftrack_module.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openpype/modules/ftrack/ftrack_module.py b/openpype/modules/ftrack/ftrack_module.py
index 68575009b2..75ffd7f864 100644
--- a/openpype/modules/ftrack/ftrack_module.py
+++ b/openpype/modules/ftrack/ftrack_module.py
@@ -15,7 +15,7 @@ from openpype.settings import SaveWarningExc
 from openpype.lib import Logger
 
 FTRACK_MODULE_DIR = os.path.dirname(os.path.abspath(__file__))
-_PLACEHOLDER = object()
+_URL_NOT_SET = object()
 
 
 class FtrackModule(
@@ -31,7 +31,7 @@ class FtrackModule(
 
         self.enabled = ftrack_settings["enabled"]
         self._settings_ftrack_url = ftrack_settings["ftrack_server"]
-        self._ftrack_url = _PLACEHOLDER
+        self._ftrack_url = _URL_NOT_SET
 
         current_dir = os.path.dirname(os.path.abspath(__file__))
         low_platform = platform.system().lower()
@@ -64,7 +64,7 @@ class FtrackModule(
         self._timers_manager_module = None
 
     def get_ftrack_url(self):
-        if self._ftrack_url is _PLACEHOLDER:
+        if self._ftrack_url is _URL_NOT_SET:
             self._ftrack_url = resolve_ftrack_url(
                 self._settings_ftrack_url,
                 logger=self.log

From 778e0b2e491f5948f2932968a70f8f620204fb01 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 13 Sep 2022 15:44:20 +0200
Subject: [PATCH 27/29] Perform case-insensitive lookup

---
 .../ftrack/plugins/publish/integrate_ftrack_instances.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
index 7e5815b100..5d39e12985 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
@@ -74,11 +74,14 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
         version_number = int(instance_version)
 
         family = instance.data["family"]
-        family_low = family.lower()
 
+        # Perform case-insensitive family mapping
+        family_low = family.lower()
         asset_type = instance.data.get("ftrackFamily")
-        if not asset_type and family_low in self.family_mapping:
-            asset_type = self.family_mapping[family_low]
+        if not asset_type:
+            for map_family, map_value in self.family_mapping.items():
+                if map_family.lower() == family_low:
+                    asset_type = map_value
 
         if not asset_type:
             asset_type = "upload"

From 4466d8a94249ad66546730b7135e34003f4aa4f8 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 13 Sep 2022 15:45:11 +0200
Subject: [PATCH 28/29] Remove redundant logic since just above it's forced to
 be "upload" when `not asset_type`

---
 .../ftrack/plugins/publish/integrate_ftrack_instances.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
index 5d39e12985..a35dbf71d4 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
@@ -89,15 +89,6 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
         self.log.debug(
             "Family: {}\nMapping: {}".format(family_low, self.family_mapping)
         )
-
-        # Ignore this instance if neither "ftrackFamily" or a family mapping is
-        # found.
-        if not asset_type:
-            self.log.info((
-                "Family \"{}\" does not match any asset type mapping"
-            ).format(family))
-            return
-
         status_name = self._get_asset_version_status_name(instance)
 
         # Base of component item data

From 1bc37ace465f647b6af35a4a2b8cf2832bd94925 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 13 Sep 2022 15:45:48 +0200
Subject: [PATCH 29/29] Actually break loop early on detected mapping

---
 .../modules/ftrack/plugins/publish/integrate_ftrack_instances.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
index a35dbf71d4..5ff75e7060 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
@@ -82,6 +82,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
             for map_family, map_value in self.family_mapping.items():
                 if map_family.lower() == family_low:
                     asset_type = map_value
+                    break
 
         if not asset_type:
             asset_type = "upload"