From 19313b06bdc2722eab88571921055cb6a357510b Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Tue, 30 Mar 2021 19:51:30 +0200
Subject: [PATCH] ApplicationManager use new tools classes to define it's tools

---
 pype/lib/applications.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pype/lib/applications.py b/pype/lib/applications.py
index 5b0e61b909..37021e0a5c 100644
--- a/pype/lib/applications.py
+++ b/pype/lib/applications.py
@@ -248,6 +248,7 @@ class ApplicationManager:
 
         self.app_groups = {}
         self.applications = {}
+        self.tool_groups = {}
         self.tools = {}
 
         self.refresh()
@@ -256,6 +257,7 @@ class ApplicationManager:
         """Refresh applications from settings."""
         self.app_groups.clear()
         self.applications.clear()
+        self.tool_groups.clear()
         self.tools.clear()
 
         settings = get_system_settings()
@@ -270,13 +272,13 @@ class ApplicationManager:
 
         tools_definitions = settings["tools"]["tool_groups"]
         for tool_group_name, tool_group_data in tools_definitions.items():
-            tool_variants = tool_group_data.get("variants") or {}
-            for tool_name, tool_data in tool_variants.items():
-                tool = ApplicationTool(tool_name, tool_group_name)
-                if tool.full_name in self.tools:
-                    self.log.warning((
-                        "Duplicated tool name in settings \"{}\""
-                    ).format(tool.full_name))
+            if not tool_group_name:
+                continue
+            group = EnvironmentToolGroup(
+                tool_group_name, tool_group_data, self
+            )
+            self.tool_groups[tool_group_name] = group
+            for tool in group:
                 self.tools[tool.full_name] = tool
 
     def launch(self, app_name, **data):