From 7356fc666d7aa4cca7251849f4eaf4d91dfc0e75 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 25 Aug 2022 12:31:47 +0200
Subject: [PATCH] moved collection of launch hooks from modules into
 applications logic

---
 openpype/lib/applications.py | 61 +++++++++++++++++++++++++++++++++--
 openpype/modules/base.py     | 62 ------------------------------------
 2 files changed, 58 insertions(+), 65 deletions(-)

diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py
index 074e815160..b389bc2539 100644
--- a/openpype/lib/applications.py
+++ b/openpype/lib/applications.py
@@ -950,6 +950,63 @@ class ApplicationLaunchContext:
             )
         self.kwargs["env"] = value
 
+    def _collect_addons_launch_hook_paths(self):
+        """Helper to collect application launch hooks from addons.
+
+        Module have to have implemented 'get_launch_hook_paths' method which
+        can expect appliction as argument or nothing.
+
+        Returns:
+            List[str]: Paths to launch hook directories.
+        """
+
+        expected_types = (list, tuple, set)
+
+        output = []
+        for module in self.modules_manager.get_enabled_modules():
+            # Skip module if does not have implemented 'get_launch_hook_paths'
+            func = getattr(module, "get_launch_hook_paths", None)
+            if func is None:
+                continue
+
+            func = module.get_launch_hook_paths
+            if hasattr(inspect, "signature"):
+                sig = inspect.signature(func)
+                expect_args = len(sig.parameters) > 0
+            else:
+                expect_args = len(inspect.getargspec(func)[0]) > 0
+
+            # Pass application argument if method expect it.
+            try:
+                if expect_args:
+                    hook_paths = func(self.application)
+                else:
+                    hook_paths = func()
+            except Exception:
+                self.log.warning(
+                    "Failed to call 'get_launch_hook_paths'",
+                    exc_info=True
+                )
+                continue
+
+            if not hook_paths:
+                continue
+
+            # Convert string to list
+            if isinstance(hook_paths, six.string_types):
+                hook_paths = [hook_paths]
+
+            # Skip invalid types
+            if not isinstance(hook_paths, expected_types):
+                self.log.warning((
+                    "Result of `get_launch_hook_paths`"
+                    " has invalid type {}. Expected {}"
+                ).format(type(hook_paths), expected_types))
+                continue
+
+            output.extend(hook_paths)
+        return output
+
     def paths_to_launch_hooks(self):
         """Directory paths where to look for launch hooks."""
         # This method has potential to be part of application manager (maybe).
@@ -983,9 +1040,7 @@ class ApplicationLaunchContext:
                 paths.append(path)
 
         # Load modules paths
-        paths.extend(
-            self.modules_manager.collect_launch_hook_paths(self.application)
-        )
+        paths.extend(self._collect_addons_launch_hook_paths())
 
         return paths
 
diff --git a/openpype/modules/base.py b/openpype/modules/base.py
index 1b8cf5d769..25355cbd9c 100644
--- a/openpype/modules/base.py
+++ b/openpype/modules/base.py
@@ -805,68 +805,6 @@ class ModulesManager:
                 output.extend(paths)
         return output
 
-    def collect_launch_hook_paths(self, app):
-        """Helper to collect application launch hooks.
-
-        It used to be based on 'ILaunchHookPaths' which is not true anymore.
-        Module just have to have implemented 'get_launch_hook_paths' method.
-
-        Args:
-            app (Application): Application object which can be used for
-                filtering of which launch hook paths are returned.
-
-        Returns:
-            list: Paths to launch hook directories.
-        """
-
-        str_type = type("")
-        expected_types = (list, tuple, set)
-
-        output = []
-        for module in self.get_enabled_modules():
-            # Skip module if does not have implemented 'get_launch_hook_paths'
-            func = getattr(module, "get_launch_hook_paths", None)
-            if func is None:
-                continue
-
-            func = module.get_launch_hook_paths
-            if hasattr(inspect, "signature"):
-                sig = inspect.signature(func)
-                expect_args = len(sig.parameters) > 0
-            else:
-                expect_args = len(inspect.getargspec(func)[0]) > 0
-
-            # Pass application argument if method expect it.
-            try:
-                if expect_args:
-                    hook_paths = func(app)
-                else:
-                    hook_paths = func()
-            except Exception:
-                self.log.warning(
-                    "Failed to call 'get_launch_hook_paths'",
-                    exc_info=True
-                )
-                continue
-
-            if not hook_paths:
-                continue
-
-            # Convert string to list
-            if isinstance(hook_paths, str_type):
-                hook_paths = [hook_paths]
-
-            # Skip invalid types
-            if not isinstance(hook_paths, expected_types):
-                self.log.warning((
-                    "Result of `get_launch_hook_paths`"
-                    " has invalid type {}. Expected {}"
-                ).format(type(hook_paths), expected_types))
-                continue
-
-            output.extend(hook_paths)
-        return output
-
     def get_host_module(self, host_name):
         """Find host module by host name.