From 243de91a8ef6a0ee5862a86e43c3a0efce7d5d11 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Tue, 18 May 2021 13:52:14 +0200
Subject: [PATCH] converted hiero and nukestudio environments to host defaults

---
 openpype/hosts/hiero/__init__.py              | 40 +++++++++++++++++++
 .../system_settings/applications.json         | 18 +--------
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/openpype/hosts/hiero/__init__.py b/openpype/hosts/hiero/__init__.py
index e69de29bb2..5b036224e4 100644
--- a/openpype/hosts/hiero/__init__.py
+++ b/openpype/hosts/hiero/__init__.py
@@ -0,0 +1,40 @@
+import os
+import platform
+
+
+def add_implementation_envs(env):
+    # Add requirements to HIERO_PLUGIN_PATH
+    pype_root = os.environ["OPENPYPE_REPOS_ROOT"]
+    new_hiero_paths = [
+        os.path.join(pype_root, "openpype", "hosts", "hiero", "startup")
+    ]
+    old_hiero_path = env.get("HIERO_PLUGIN_PATH") or ""
+    for path in old_hiero_path.split(os.pathsep):
+        if not path or not os.path.exists(path):
+            continue
+
+        norm_path = os.path.normpath(path)
+        if norm_path not in new_hiero_paths:
+            new_hiero_paths.append(norm_path)
+
+    env["HIERO_PLUGIN_PATH"] = os.pathsep.join(new_hiero_paths)
+
+    # Try to add QuickTime to PATH
+    quick_time_path = "C:/Program Files (x86)/QuickTime/QTSystem"
+    if platform.system() == "windows" and os.path.exists(quick_time_path):
+        path_value = env.get("PATH") or ""
+        path_paths = [
+            path
+            for path in path_value.split(os.pathsep)
+            if path
+        ]
+        path_paths.append(quick_time_path)
+        env["PATH"] = os.pathsep.join(path_paths)
+
+    # Set default values if are not already set via settings
+    defaults = {
+        "LOGLEVEL": "DEBUG"
+    }
+    for key, value in defaults.items():
+        if not env.get(key):
+            env[key] = value
diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json
index 01602bf549..486aa06849 100644
--- a/openpype/settings/defaults/system_settings/applications.json
+++ b/openpype/settings/defaults/system_settings/applications.json
@@ -339,15 +339,8 @@
         "icon": "{}/app_icons/nuke.png",
         "host_name": "hiero",
         "environment": {
-            "HIERO_PLUGIN_PATH": [
-                "{OPENPYPE_REPOS_ROOT}/openpype/hosts/hiero/startup"
-            ],
-            "PATH": {
-                "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}"
-            },
             "WORKFILES_STARTUP": "0",
-            "TAG_ASSETBUILD_STARTUP": "0",
-            "LOGLEVEL": "DEBUG"
+            "TAG_ASSETBUILD_STARTUP": "0"
         },
         "variants": {
             "13-0": {
@@ -481,15 +474,8 @@
         "icon": "{}/app_icons/hiero.png",
         "host_name": "hiero",
         "environment": {
-            "HIERO_PLUGIN_PATH": [
-                "{OPENPYPE_REPOS_ROOT}/openpype/hosts/hiero/startup"
-            ],
-            "PATH": {
-                "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}"
-            },
             "WORKFILES_STARTUP": "0",
-            "TAG_ASSETBUILD_STARTUP": "0",
-            "LOGLEVEL": "DEBUG"
+            "TAG_ASSETBUILD_STARTUP": "0"
         },
         "variants": {
             "13-0": {