diff --git a/kodi_jellyfin/connect.py b/kodi_jellyfin/connect.py index e7b46b8c..a7e50fb6 100644 --- a/kodi_jellyfin/connect.py +++ b/kodi_jellyfin/connect.py @@ -157,7 +157,6 @@ class Connect(object): state = state or self.connect_manager.connect({'enableAutoLogin': False}) user = {} - LOG.info("XML PATH: "+str(XML_PATH)) dialog = ServerConnect("script-jellyfin-connect-server.xml", *XML_PATH) dialog.set_args(**{ 'connect_manager': self.connect_manager, diff --git a/kodi_jellyfin/helper/__init__.py b/kodi_jellyfin/helper/__init__.py index 4e279cd6..aaafd384 100644 --- a/kodi_jellyfin/helper/__init__.py +++ b/kodi_jellyfin/helper/__init__.py @@ -17,6 +17,7 @@ from utils import compare_version from utils import unzip from utils import create_id from utils import convert_to_local as Local +from utils import has_attribute from wrapper import progress from wrapper import catch diff --git a/kodi_jellyfin/helper/utils.py b/kodi_jellyfin/helper/utils.py index 328d954e..84264b64 100644 --- a/kodi_jellyfin/helper/utils.py +++ b/kodi_jellyfin/helper/utils.py @@ -480,3 +480,10 @@ def convert_to_local(date): LOG.exception(error) return str(date) + +def has_attribute(obj, name): + try: + object.__getattribute__(obj, name) + return True + except AttributeError: + return False diff --git a/kodi_jellyfin/jellyfin/__init__.py b/kodi_jellyfin/jellyfin/__init__.py index e8da2b1a..cffb1e6a 100644 --- a/kodi_jellyfin/jellyfin/__init__.py +++ b/kodi_jellyfin/jellyfin/__init__.py @@ -5,7 +5,7 @@ import logging from client import JellyfinClient -from helpers import has_attribute +from helper import has_attribute ################################################################################################# diff --git a/kodi_jellyfin/jellyfin/helpers/__init__.py b/kodi_jellyfin/jellyfin/helpers/__init__.py deleted file mode 100644 index 453fa606..00000000 --- a/kodi_jellyfin/jellyfin/helpers/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ - -def has_attribute(obj, name): - try: - object.__getattribute__(obj, name) - return True - except AttributeError: - return False diff --git a/kodi_jellyfin/jellyfin/helpers/utils.py b/kodi_jellyfin/jellyfin/helpers/utils.py deleted file mode 100644 index 62848188..00000000 --- a/kodi_jellyfin/jellyfin/helpers/utils.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- - -################################################################################################# - -import logging -from uuid import uuid4 - -################################################################################################# - -LOG = logging.getLogger('JELLYFIN.' + __name__) - -################################################################################################# - - -def generate_client_id(): - return str("%012X" % uuid4())