From daee320863c51d899d74f68dfbb80a9b0879d9a9 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Fri, 15 Nov 2019 16:07:36 +0100
Subject: [PATCH] check_ftrack_url has moved from event_server_cli to lib to be
 importable

---
 pype/ftrack/__init__.py                       |  2 +-
 pype/ftrack/ftrack_server/__init__.py         |  1 +
 pype/ftrack/ftrack_server/event_server_cli.py | 35 ++-----------------
 pype/ftrack/ftrack_server/lib.py              | 31 ++++++++++++++++
 4 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/pype/ftrack/__init__.py b/pype/ftrack/__init__.py
index 45ca8384b5..aa8f04bffb 100644
--- a/pype/ftrack/__init__.py
+++ b/pype/ftrack/__init__.py
@@ -1,2 +1,2 @@
 from .lib import *
-from .ftrack_server import FtrackServer
+from .ftrack_server import FtrackServer, check_ftrack_url
diff --git a/pype/ftrack/ftrack_server/__init__.py b/pype/ftrack/ftrack_server/__init__.py
index 0861a1bc08..fcae4e0690 100644
--- a/pype/ftrack/ftrack_server/__init__.py
+++ b/pype/ftrack/ftrack_server/__init__.py
@@ -1 +1,2 @@
 from .ftrack_server import FtrackServer
+from .lib import check_ftrack_url
diff --git a/pype/ftrack/ftrack_server/event_server_cli.py b/pype/ftrack/ftrack_server/event_server_cli.py
index 8dd503f845..e14fd705f1 100644
--- a/pype/ftrack/ftrack_server/event_server_cli.py
+++ b/pype/ftrack/ftrack_server/event_server_cli.py
@@ -9,11 +9,12 @@ import atexit
 import time
 from urllib.parse import urlparse
 
-import requests
 from pype.vendor import ftrack_api
 from pype.ftrack.lib import credentials
 from pype.ftrack.ftrack_server import FtrackServer
-from pype.ftrack.ftrack_server.lib import ftrack_events_mongo_settings
+from pype.ftrack.ftrack_server.lib import (
+    ftrack_events_mongo_settings, check_ftrack_url
+)
 import socket_thread
 
 
@@ -25,36 +26,6 @@ class MongoPermissionsError(Exception):
         super().__init__(message)
 
 
-def check_ftrack_url(url, log_errors=True):
-    """Checks if Ftrack server is responding"""
-    if not url:
-        print('ERROR: Ftrack URL is not set!')
-        return None
-
-    url = url.strip('/ ')
-
-    if 'http' not in url:
-        if url.endswith('ftrackapp.com'):
-            url = 'https://' + url
-        else:
-            url = 'https://{0}.ftrackapp.com'.format(url)
-    try:
-        result = requests.get(url, allow_redirects=False)
-    except requests.exceptions.RequestException:
-        if log_errors:
-            print('ERROR: Entered Ftrack URL is not accesible!')
-        return False
-
-    if (result.status_code != 200 or 'FTRACK_VERSION' not in result.headers):
-        if log_errors:
-            print('ERROR: Entered Ftrack URL is not accesible!')
-        return False
-
-    print('DEBUG: Ftrack server {} is accessible.'.format(url))
-
-    return url
-
-
 def check_mongo_url(host, port, log_error=False):
     """Checks if mongo server is responding"""
     sock = None
diff --git a/pype/ftrack/ftrack_server/lib.py b/pype/ftrack/ftrack_server/lib.py
index 12159693fe..748937c7bd 100644
--- a/pype/ftrack/ftrack_server/lib.py
+++ b/pype/ftrack/ftrack_server/lib.py
@@ -1,4 +1,5 @@
 import os
+import requests
 try:
     from urllib.parse import urlparse, parse_qs
 except ImportError:
@@ -66,3 +67,33 @@ def get_ftrack_event_mongo_info():
     url = "mongodb://{}{}{}{}".format(user_pass, socket_path, dab, auth)
 
     return url, database, collection
+
+
+def check_ftrack_url(url, log_errors=True):
+    """Checks if Ftrack server is responding"""
+    if not url:
+        print('ERROR: Ftrack URL is not set!')
+        return None
+
+    url = url.strip('/ ')
+
+    if 'http' not in url:
+        if url.endswith('ftrackapp.com'):
+            url = 'https://' + url
+        else:
+            url = 'https://{0}.ftrackapp.com'.format(url)
+    try:
+        result = requests.get(url, allow_redirects=False)
+    except requests.exceptions.RequestException:
+        if log_errors:
+            print('ERROR: Entered Ftrack URL is not accesible!')
+        return False
+
+    if (result.status_code != 200 or 'FTRACK_VERSION' not in result.headers):
+        if log_errors:
+            print('ERROR: Entered Ftrack URL is not accesible!')
+        return False
+
+    print('DEBUG: Ftrack server {} is accessible.'.format(url))
+
+    return url