Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

user handlers are loaded with modules manager instead of lib functions

Browse source
This commit is contained in:
iLLiCiTiT 2020-12-16 19:05:19 +01:00
parent 2409dee0c5
commit c240cd813b
3 changed files with 7 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pype/modules/ftrack/ftrack_server/sub_user_server.py
View file

@ -7,7 +7,7 @@ from pype.modules.ftrack.ftrack_server.lib import (
SocketSession, SocketSession,
SocketBaseEventHub SocketBaseEventHub
) )
from pype.modules.ftrack.lib import get_user_event_handler_paths from pype.modules import ModulesManager
from pype.api import Logger from pype.api import Logger
@ -32,8 +32,12 @@ def main(args):
session = SocketSession( session = SocketSession(
auto_connect_event_hub=True, sock=sock, Eventhub=SocketBaseEventHub auto_connect_event_hub=True, sock=sock, Eventhub=SocketBaseEventHub
) )
event_handler_paths = get_user_event_handler_paths() manager = ModulesManager()
server = FtrackServer(event_handler_paths, "action") 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") log.debug("Launching User Ftrack Server")
server.run_server(session=session) server.run_server(session=session)

4
pype/modules/ftrack/lib/__init__.py
View file

@ -1,10 +1,8 @@
from . settings import ( from . settings import (
FTRACK_MODULE_DIR, FTRACK_MODULE_DIR,
SERVER_HANDLERS_DIR, SERVER_HANDLERS_DIR,
USER_HANDLERS_DIR,
get_ftrack_url_from_settings, get_ftrack_url_from_settings,
get_server_event_handler_paths, get_server_event_handler_paths,
get_user_event_handler_paths,
get_ftrack_event_mongo_info get_ftrack_event_mongo_info
) )
from . import avalon_sync from . import avalon_sync
@ -17,10 +15,8 @@ from .ftrack_action_handler import BaseAction, ServerAction, statics_icon
__all__ = ( __all__ = (
"FTRACK_MODULE_DIR", "FTRACK_MODULE_DIR",
"SERVER_HANDLERS_DIR", "SERVER_HANDLERS_DIR",
"USER_HANDLERS_DIR",
"get_ftrack_url_from_settings", "get_ftrack_url_from_settings",
"get_server_event_handler_paths", "get_server_event_handler_paths",
"get_user_event_handler_paths",
"get_ftrack_event_mongo_info", "get_ftrack_event_mongo_info",
"avalon_sync", "avalon_sync",

22
pype/modules/ftrack/lib/settings.py
View file

@ -11,7 +11,6 @@ log = Logger().get_logger(__name__)
FTRACK_MODULE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) FTRACK_MODULE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
SERVER_HANDLERS_DIR = os.path.join(FTRACK_MODULE_DIR, "events") SERVER_HANDLERS_DIR = os.path.join(FTRACK_MODULE_DIR, "events")
USER_HANDLERS_DIR = os.path.join(FTRACK_MODULE_DIR, "actions")
def get_ftrack_settings(): def get_ftrack_settings():
@ -55,27 +54,6 @@ def get_server_event_handler_paths():
return _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(): def clockify_event_path():
api_key = os.environ.get("CLOCKIFY_API_KEY") api_key = os.environ.get("CLOCKIFY_API_KEY")
if not api_key: if not api_key: