From f66fe753b65e34fd9e4c6cd5cc3fc25f6cae79b6 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 20 Jun 2024 15:59:27 +0800
Subject: [PATCH] improve collector variable - big roy's comment

---
 .../plugins/publish/collect_ornatrix_cache.py    | 12 +++++-------
 .../plugins/publish/collect_ornatrix_rig.py      | 16 ++++++----------
 server_addon/maya/client/ayon_maya/version.py    |  2 +-
 server_addon/maya/server/settings/creators.py    |  4 ++--
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_ornatrix_cache.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_ornatrix_cache.py
index 9356c05244..494b31a311 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_ornatrix_cache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_ornatrix_cache.py
@@ -19,13 +19,9 @@ class CollectOxCache(plugin.MayaInstancePlugin):
             # Get transform data
             parent = cmds.listRelatives(ox_shape, parent=True)[0]
             mesh_shape_data = {"name": parent, "cbId": lib.get_id(parent)}
-            ox_cache_nodes = [
-                ox_node for ox_node in cmds.listConnections(ox_shape, destination=True)
-                if cmds.nodeType(ox_node) == "HairFromGuidesNode"
-            ]
+            ox_cache_nodes = cmds.listConnections(
+                ox_shape, destination=True, type="HairFromGuidesNode") or []
             # transfer cache file
-            if not lib.get_id(ox_shape):
-                return
             shape_data = {
                 "shape": mesh_shape_data,
                 "name": ox_shapes,
@@ -34,5 +30,7 @@ class CollectOxCache(plugin.MayaInstancePlugin):
                 "cache_file_attribute": ["{}.cacheFilePath".format(ox_node)
                                         for ox_node in ox_cache_nodes]
             }
-            settings["nodes"].append(shape_data)
+            if shape_data["cbId"]:
+                settings["nodes"].append(shape_data)
+        self.log.debug(settings)
         instance.data["cachesettings"] = settings
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_ornatrix_rig.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_ornatrix_rig.py
index 5a3ef4e9ea..5fa4f56686 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_ornatrix_rig.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_ornatrix_rig.py
@@ -53,17 +53,13 @@ class CollectOxRig(plugin.MayaInstancePlugin):
         ox_nodes = [
             ox_node for ox_node in cmds.listConnections(node_shape, destination=True)
                     if cmds.nodeType(ox_node) in ORNATRIX_NODES
-        ]
-        ox_image_file = [
-            ox_img for ox_img in cmds.listConnections(ox_nodes, destination=False)
-            if cmds.nodeType(ox_img) == "file"
-        ]
-        if not ox_image_file:
+        ] or []
+        ox_file_nodes = cmds.listConnections(ox_nodes, destination=False, type="file") or []
+        if not ox_file_nodes:
             return []
-
-        for img in ox_image_file:
-            texture_attr = "{}.fileTextureName".format(img)
-            texture = cmds.getAttr("{}.fileTextureName".format(img))
+        for file_node in ox_file_nodes:
+            texture_attr = "{}.fileTextureName".format(file_node)
+            texture = cmds.getAttr("{}.fileTextureName".format(file_node))
             files = []
             if os.path.isabs(texture):
                 self.log.debug("Texture is absolute path, ignoring "
diff --git a/server_addon/maya/client/ayon_maya/version.py b/server_addon/maya/client/ayon_maya/version.py
index fcad19941f..37f9026945 100644
--- a/server_addon/maya/client/ayon_maya/version.py
+++ b/server_addon/maya/client/ayon_maya/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON addon 'maya' version."""
-__version__ = "0.2.3"
+__version__ = "0.2.4"
diff --git a/server_addon/maya/server/settings/creators.py b/server_addon/maya/server/settings/creators.py
index 2931ed7aa2..9484a0881b 100644
--- a/server_addon/maya/server/settings/creators.py
+++ b/server_addon/maya/server/settings/creators.py
@@ -382,13 +382,13 @@ DEFAULT_CREATORS_SETTINGS = {
         ]
     },
     "CreateOxRig": {
-        "enabled": False,
+        "enabled": True,
         "default_variants": [
             "Main"
         ]
     },
     "CreateOxCache": {
-        "enabled": False,
+        "enabled": True,
         "default_variants": [
             "Main"
         ]