From f421a604047986e4fa021e4631da63ba67cac0bb Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 7 Dec 2020 13:07:15 +0100 Subject: [PATCH] ftrack url is taken from settings if not set via arguments --- .../modules/ftrack/ftrack_server/event_server_cli.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pype/modules/ftrack/ftrack_server/event_server_cli.py b/pype/modules/ftrack/ftrack_server/event_server_cli.py index 3f8ab49405..dbf2a2dc10 100644 --- a/pype/modules/ftrack/ftrack_server/event_server_cli.py +++ b/pype/modules/ftrack/ftrack_server/event_server_cli.py @@ -522,16 +522,20 @@ def main(argv): "environment: $CLOCKIFY_WORKSPACE)" ) ) - ftrack_url = os.environ.get('FTRACK_SERVER') - username = os.environ.get('FTRACK_API_USER') - api_key = os.environ.get('FTRACK_API_KEY') - event_paths = os.environ.get('FTRACK_EVENTS_PATH') + ftrack_url = os.environ.get("FTRACK_SERVER") + username = os.environ.get("FTRACK_API_USER") + api_key = os.environ.get("FTRACK_API_KEY") kwargs, args = parser.parse_known_args(argv) if kwargs.ftrackurl: ftrack_url = kwargs.ftrackurl + # Load Ftrack url from settings if not set + if not ftrack_url: + ftrack_url = get_ftrack_url_from_settings() + + event_paths = None if kwargs.ftrackeventpaths: event_paths = kwargs.ftrackeventpaths