From 76bcca4c44aaada832304769d514dba5ed219209 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Thu, 25 Mar 2021 19:42:53 +0100
Subject: [PATCH] changed how tools are used

---
 pype/lib/applications.py              | 23 +++++++++--------------
 pype/settings/entities/enum_entity.py | 12 +++++-------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/pype/lib/applications.py b/pype/lib/applications.py
index abaecf1e9c..d62c5deff7 100644
--- a/pype/lib/applications.py
+++ b/pype/lib/applications.py
@@ -138,20 +138,16 @@ class ApplicationManager:
                     app_group, app_name, host_name, app_data, self
                 )
 
-        tools_definitions = settings["tools"]
+        tools_definitions = settings["tools"]["tool_groups"]
         for tool_group_name, tool_group_data in tools_definitions.items():
-            enabled = tool_group_data.get("enabled", True)
             tool_variants = tool_group_data.get("variants") or {}
             for tool_name, tool_data in tool_variants.items():
-                if tool_name in self.tools:
+                tool = ApplicationTool(tool_name, tool_group_name)
+                if tool.full_name in self.tools:
                     self.log.warning((
                         "Duplicated tool name in settings \"{}\""
-                    ).format(tool_name))
-
-                _enabled = tool_data.get("enabled", enabled)
-                self.tools[tool_name] = ApplicationTool(
-                    tool_name, tool_group_name, _enabled
-                )
+                    ).format(tool.full_name))
+                self.tools[tool.full_name] = tool
 
     def launch(self, app_name, **data):
         """Launch procedure.
@@ -196,16 +192,15 @@ class ApplicationTool:
     Args:
         tool_name (str): Name of the tool.
         group_name (str): Name of group which wraps tool.
-        enabled (bool): Is tool enabled by studio.
     """
 
-    def __init__(self, tool_name, group_name, enabled):
+    def __init__(self, tool_name, group_name):
         self.name = tool_name
         self.group_name = group_name
-        self.enabled = enabled
 
-    def __bool__(self):
-        return self.enabled
+    @property
+    def full_name(self):
+        return "/".join((self.group_name, self.name))
 
 
 class ApplicationExecutable:
diff --git a/pype/settings/entities/enum_entity.py b/pype/settings/entities/enum_entity.py
index f06ec97f4b..ca0d5dec21 100644
--- a/pype/settings/entities/enum_entity.py
+++ b/pype/settings/entities/enum_entity.py
@@ -170,14 +170,12 @@ class ToolsEnumEntity(BaseEnumEntity):
 
         valid_keys = set()
         enum_items = []
-        for tool_group in system_settings_entity["tools"].values():
-            enabled_entity = tool_group.get("enabled")
-            if enabled_entity and not enabled_entity.value:
-                continue
-
+        tools_entity = system_settings_entity["tools"]
+        for group_name, tool_group in tools_entity["tool_groups"].items():
             for variant_name in tool_group["variants"].keys():
-                enum_items.append({variant_name: variant_name})
-                valid_keys.add(variant_name)
+                tool_name = "/".join((group_name, variant_name))
+                enum_items.append({tool_name: tool_name})
+                valid_keys.add(tool_name)
         return enum_items, valid_keys
 
     def set_override_state(self, *args, **kwargs):