From c240cd813b19887db64745ddf77eec6abb5ed788 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Wed, 16 Dec 2020 19:05:19 +0100
Subject: [PATCH] user handlers are loaded with modules manager instead of lib
 functions

---
 .../ftrack/ftrack_server/sub_user_server.py   | 10 ++++++---
 pype/modules/ftrack/lib/__init__.py           |  4 ----
 pype/modules/ftrack/lib/settings.py           | 22 -------------------
 3 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/pype/modules/ftrack/ftrack_server/sub_user_server.py b/pype/modules/ftrack/ftrack_server/sub_user_server.py
index 2686c74c2e..1dedbbc7d0 100644
--- a/pype/modules/ftrack/ftrack_server/sub_user_server.py
+++ b/pype/modules/ftrack/ftrack_server/sub_user_server.py
@@ -7,7 +7,7 @@ from pype.modules.ftrack.ftrack_server.lib import (
     SocketSession,
     SocketBaseEventHub
 )
-from pype.modules.ftrack.lib import get_user_event_handler_paths
+from pype.modules import ModulesManager
 
 from pype.api import Logger
 
@@ -32,8 +32,12 @@ def main(args):
         session = SocketSession(
             auto_connect_event_hub=True, sock=sock, Eventhub=SocketBaseEventHub
         )
-        event_handler_paths = get_user_event_handler_paths()
-        server = FtrackServer(event_handler_paths, "action")
+        manager = ModulesManager()
+        ftrack_module = manager.modules_by_name["ftrack"]
+        ftrack_module.user_event_handlers_paths
+        server = FtrackServer(
+            ftrack_module.user_event_handlers_paths, "action"
+        )
         log.debug("Launching User Ftrack Server")
         server.run_server(session=session)
 
diff --git a/pype/modules/ftrack/lib/__init__.py b/pype/modules/ftrack/lib/__init__.py
index bb79faf0cb..f534d22564 100644
--- a/pype/modules/ftrack/lib/__init__.py
+++ b/pype/modules/ftrack/lib/__init__.py
@@ -1,10 +1,8 @@
 from . settings import (
     FTRACK_MODULE_DIR,
     SERVER_HANDLERS_DIR,
-    USER_HANDLERS_DIR,
     get_ftrack_url_from_settings,
     get_server_event_handler_paths,
-    get_user_event_handler_paths,
     get_ftrack_event_mongo_info
 )
 from . import avalon_sync
@@ -17,10 +15,8 @@ from .ftrack_action_handler import BaseAction, ServerAction, statics_icon
 __all__ = (
     "FTRACK_MODULE_DIR",
     "SERVER_HANDLERS_DIR",
-    "USER_HANDLERS_DIR",
     "get_ftrack_url_from_settings",
     "get_server_event_handler_paths",
-    "get_user_event_handler_paths",
     "get_ftrack_event_mongo_info",
 
     "avalon_sync",
diff --git a/pype/modules/ftrack/lib/settings.py b/pype/modules/ftrack/lib/settings.py
index 52c93ae62f..84872d141a 100644
--- a/pype/modules/ftrack/lib/settings.py
+++ b/pype/modules/ftrack/lib/settings.py
@@ -11,7 +11,6 @@ log = Logger().get_logger(__name__)
 
 FTRACK_MODULE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 SERVER_HANDLERS_DIR = os.path.join(FTRACK_MODULE_DIR, "events")
-USER_HANDLERS_DIR = os.path.join(FTRACK_MODULE_DIR, "actions")
 
 
 def get_ftrack_settings():
@@ -55,27 +54,6 @@ def get_server_event_handler_paths():
     return _paths
 
 
-def get_user_event_handler_paths():
-    paths = []
-    # Add pype's default dir
-    paths.append(USER_HANDLERS_DIR)
-    # Add additional paths from settings
-    paths.extend(
-        get_ftrack_settings()["ftrack_actions_path"]
-    )
-
-    # Filter only existing paths
-    _paths = []
-    for path in paths:
-        if os.path.exists(path):
-            _paths.append(path)
-        else:
-            log.warning((
-                "Registered event handler path is not accessible: {}"
-            ).format(path))
-    return _paths
-
-
 def clockify_event_path():
     api_key = os.environ.get("CLOCKIFY_API_KEY")
     if not api_key: