From d9ef2b59abdbeb7147cf21db47592147cb7f0d0f Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Tue, 20 Apr 2021 18:49:51 +0200
Subject: [PATCH] create update custom attributes is using functions from lib

---
 .../action_create_cust_attrs.py               | 35 +++++--------------
 openpype/modules/ftrack/lib/avalon_sync.py    |  9 -----
 2 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/openpype/modules/ftrack/event_handlers_user/action_create_cust_attrs.py b/openpype/modules/ftrack/event_handlers_user/action_create_cust_attrs.py
index 8d585dee20..63605eda5e 100644
--- a/openpype/modules/ftrack/event_handlers_user/action_create_cust_attrs.py
+++ b/openpype/modules/ftrack/event_handlers_user/action_create_cust_attrs.py
@@ -5,14 +5,17 @@ import ftrack_api
 from openpype.modules.ftrack.lib import (
     BaseAction,
     statics_icon,
+
     CUST_ATTR_ID_KEY,
     CUST_ATTR_GROUP,
     CUST_ATTR_TOOLS,
-    CUST_ATTR_APPLICATIONS
-)
-from openpype.modules.ftrack.lib.avalon_sync import (
-    default_custom_attributes_definition
+    CUST_ATTR_APPLICATIONS,
+
+    default_custom_attributes_definition,
+    app_definitions_from_app_manager,
+    tool_definitions_from_app_manager
 )
+
 from openpype.api import get_system_settings
 from openpype.lib import ApplicationManager
 
@@ -377,20 +380,8 @@ class CustomAttributes(BaseAction):
                     exc_info=True
                 )
 
-    def app_defs_from_app_manager(self):
-        app_definitions = []
-        for app_name, app in self.app_manager.applications.items():
-            if app.enabled and app.is_host:
-                app_definitions.append({
-                    app_name: app.full_label
-                })
-
-        if not app_definitions:
-            app_definitions.append({"empty": "< Empty >"})
-        return app_definitions
-
     def applications_attribute(self, event):
-        apps_data = self.app_defs_from_app_manager()
+        apps_data = app_definitions_from_app_manager(self.app_manager)
 
         applications_custom_attr_data = {
             "label": "Applications",
@@ -406,15 +397,7 @@ class CustomAttributes(BaseAction):
         self.process_attr_data(applications_custom_attr_data, event)
 
     def tools_attribute(self, event):
-        tools_data = []
-        for tool_name, tool in self.app_manager.tools.items():
-            tools_data.append({
-                tool_name: tool.label
-            })
-
-        # Make sure there is at least one item
-        if not tools_data:
-            tools_data.append({"empty": "< Empty >"})
+        tools_data = tool_definitions_from_app_manager(self.app_manager)
 
         tools_custom_attr_data = {
             "label": "Tools",
diff --git a/openpype/modules/ftrack/lib/avalon_sync.py b/openpype/modules/ftrack/lib/avalon_sync.py
index 5f44181e5f..6e83be8b64 100644
--- a/openpype/modules/ftrack/lib/avalon_sync.py
+++ b/openpype/modules/ftrack/lib/avalon_sync.py
@@ -42,15 +42,6 @@ EntitySchemas = {
     "config": "openpype:config-2.0"
 }
 
-def default_custom_attributes_definition():
-    json_file_path = os.path.join(
-        os.path.dirname(os.path.abspath(__file__)),
-        "custom_attributes.json"
-    )
-    with open(json_file_path, "r") as json_stream:
-        data = json.load(json_stream)
-    return data
-
 
 def check_regex(name, entity_type, in_schema=None, schema_patterns=None):
     schema_name = "asset-3.0"