Merge pull request #3735 from pypeclub/feature/OP-3776_Houdini-as-addon

Houdini: Define houdini as addon

openpype/hosts/houdini/__init__.py

@@ -1,38 +1,10 @@
-import os
+from .addon import (
+    HoudiniAddon,
+    HOUDINI_HOST_DIR,
+)
 
 
-def add_implementation_envs(env, _app):
-    # Add requirements to HOUDINI_PATH and HOUDINI_MENU_PATH
-    pype_root = os.environ["OPENPYPE_REPOS_ROOT"]
-
-    startup_path = os.path.join(
-        pype_root, "openpype", "hosts", "houdini", "startup"
-    )
-    new_houdini_path = [startup_path]
-    new_houdini_menu_path = [startup_path]
-
-    old_houdini_path = env.get("HOUDINI_PATH") or ""
-    old_houdini_menu_path = env.get("HOUDINI_MENU_PATH") or ""
-
-    for path in old_houdini_path.split(os.pathsep):
-        if not path:
-            continue
-
-        norm_path = os.path.normpath(path)
-        if norm_path not in new_houdini_path:
-            new_houdini_path.append(norm_path)
-
-    for path in old_houdini_menu_path.split(os.pathsep):
-        if not path:
-            continue
-
-        norm_path = os.path.normpath(path)
-        if norm_path not in new_houdini_menu_path:
-            new_houdini_menu_path.append(norm_path)
-
-    # Add ampersand for unknown reason (Maybe is needed in Houdini?)
-    new_houdini_path.append("&")
-    new_houdini_menu_path.append("&")
-
-    env["HOUDINI_PATH"] = os.pathsep.join(new_houdini_path)
-    env["HOUDINI_MENU_PATH"] = os.pathsep.join(new_houdini_menu_path)
+__all__ = (
+    "HoudiniAddon",
+    "HOUDINI_HOST_DIR",
+)

openpype/hosts/houdini/addon.py

@@ -0,0 +1,55 @@
+import os
+from openpype.modules import OpenPypeModule
+from openpype.modules.interfaces import IHostAddon
+
+HOUDINI_HOST_DIR = os.path.dirname(os.path.abspath(__file__))
+
+
+class HoudiniAddon(OpenPypeModule, IHostAddon):
+    name = "houdini"
+    host_name = "houdini"
+
+    def initialize(self, module_settings):
+        self.enabled = True
+
+    def add_implementation_envs(self, env, _app):
+        # Add requirements to HOUDINI_PATH and HOUDINI_MENU_PATH
+        startup_path = os.path.join(HOUDINI_HOST_DIR, "startup")
+        new_houdini_path = [startup_path]
+        new_houdini_menu_path = [startup_path]
+
+        old_houdini_path = env.get("HOUDINI_PATH") or ""
+        old_houdini_menu_path = env.get("HOUDINI_MENU_PATH") or ""
+
+        for path in old_houdini_path.split(os.pathsep):
+            if not path:
+                continue
+
+            norm_path = os.path.normpath(path)
+            if norm_path not in new_houdini_path:
+                new_houdini_path.append(norm_path)
+
+        for path in old_houdini_menu_path.split(os.pathsep):
+            if not path:
+                continue
+
+            norm_path = os.path.normpath(path)
+            if norm_path not in new_houdini_menu_path:
+                new_houdini_menu_path.append(norm_path)
+
+        # Add ampersand for unknown reason (Maybe is needed in Houdini?)
+        new_houdini_path.append("&")
+        new_houdini_menu_path.append("&")
+
+        env["HOUDINI_PATH"] = os.pathsep.join(new_houdini_path)
+        env["HOUDINI_MENU_PATH"] = os.pathsep.join(new_houdini_menu_path)
+
+    def get_launch_hook_paths(self, app):
+        if app.host_name != self.host_name:
+            return []
+        return [
+            os.path.join(HOUDINI_HOST_DIR, "hooks")
+        ]
+
+    def get_workfile_extensions(self):
+        return [".hip", ".hiplc", ".hipnc"]

openpype/hosts/houdini/api/pipeline.py

@@ -13,7 +13,7 @@ from openpype.pipeline import (
     AVALON_CONTAINER_ID,
 )
 from openpype.pipeline.load import any_outdated_containers
-import openpype.hosts.houdini
+from openpype.hosts.houdini import HOUDINI_HOST_DIR
 from openpype.hosts.houdini.api import lib
 
 from openpype.lib import (
@@ -28,8 +28,7 @@ log = logging.getLogger("openpype.hosts.houdini")
 AVALON_CONTAINERS = "/obj/AVALON_CONTAINERS"
 IS_HEADLESS = not hasattr(hou, "ui")
 
-HOST_DIR = os.path.dirname(os.path.abspath(openpype.hosts.houdini.__file__))
-PLUGINS_DIR = os.path.join(HOST_DIR, "plugins")
+PLUGINS_DIR = os.path.join(HOUDINI_HOST_DIR, "plugins")
 PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish")
 LOAD_PATH = os.path.join(PLUGINS_DIR, "load")
 CREATE_PATH = os.path.join(PLUGINS_DIR, "create")
@@ -66,7 +65,7 @@ def install():
 
     self._has_been_setup = True
     # add houdini vendor packages
-    hou_pythonpath = os.path.join(os.path.dirname(HOST_DIR), "vendor")
+    hou_pythonpath = os.path.join(HOUDINI_HOST_DIR, "vendor")
 
     sys.path.append(hou_pythonpath)
 

openpype/hosts/houdini/api/workio.py

@@ -2,11 +2,10 @@
 import os
 
 import hou
-from openpype.pipeline import HOST_WORKFILE_EXTENSIONS
 
 
 def file_extensions():
-    return HOST_WORKFILE_EXTENSIONS["houdini"]
+    return [".hip", ".hiplc", ".hipnc"]
 
 
 def has_unsaved_changes():

openpype/hosts/houdini/hooks/set_paths.py

@@ -1,5 +1,4 @@
 from openpype.lib import PreLaunchHook
-import os
 
 
 class SetPath(PreLaunchHook):
@@ -15,4 +14,4 @@ class SetPath(PreLaunchHook):
             self.log.warning("BUG: Workdir is not filled.")
             return
 
-        os.chdir(workdir)
+        self.launch_context.kwargs["cwd"] = workdir