From a1d32ec1003d1a9d85342834d39dd519b642e867 Mon Sep 17 00:00:00 2001 From: cvium Date: Fri, 30 Oct 2020 11:54:48 +0100 Subject: [PATCH] Fix linter and typo --- jellyfin_kodi/connect.py | 2 +- jellyfin_kodi/jellyfin/__init__.py | 1 + jellyfin_kodi/jellyfin/client.py | 4 ++-- jellyfin_kodi/monitor.py | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jellyfin_kodi/connect.py b/jellyfin_kodi/connect.py index c2d3c8ca..f6654cdb 100644 --- a/jellyfin_kodi/connect.py +++ b/jellyfin_kodi/connect.py @@ -76,7 +76,7 @@ class Connect(object): ''' Get Jellyfin client. ''' - client = Jellyfin(server_id) + client = Jellyfin(server_id).get_client() client.config.app("Kodi", self.info['Version'], self.info['DeviceName'], self.info['DeviceId']) client.config.data['http.user_agent'] = "Jellyfin-Kodi/%s" % self.info['Version'] client.config.data['auth.ssl'] = self.get_ssl() diff --git a/jellyfin_kodi/jellyfin/__init__.py b/jellyfin_kodi/jellyfin/__init__.py index 4768a072..d5d7e78f 100644 --- a/jellyfin_kodi/jellyfin/__init__.py +++ b/jellyfin_kodi/jellyfin/__init__.py @@ -15,6 +15,7 @@ LOG = LazyLogger() ################################################################################################# + class Jellyfin(object): ''' This is your Jellyfinclient, you can create more than one. The server_id is only a temporary thing diff --git a/jellyfin_kodi/jellyfin/client.py b/jellyfin_kodi/jellyfin/client.py index 7e1dda37..df3fc389 100644 --- a/jellyfin_kodi/jellyfin/client.py +++ b/jellyfin_kodi/jellyfin/client.py @@ -3,7 +3,8 @@ from __future__ import division, absolute_import, print_function, unicode_litera ################################################################################################# -from helper import LazyLogger, window, dialog, translate, settings +from client import get_device_id +from helper import LazyLogger, window, settings from helper import api as helper_api from . import api @@ -11,7 +12,6 @@ from .configuration import Config from .http import HTTP from .ws_client import WSClient from .connection_manager import ConnectionManager, CONNECTION_STATE -from client import get_device_id ################################################################################################# diff --git a/jellyfin_kodi/monitor.py b/jellyfin_kodi/monitor.py index d4b1640f..aae80755 100644 --- a/jellyfin_kodi/monitor.py +++ b/jellyfin_kodi/monitor.py @@ -92,7 +92,7 @@ class Monitor(xbmc.Monitor): return - server = Jellyfin(data.get('ServerId')).server.get_client() + server = Jellyfin(data.get('ServerId')).get_client() if method == 'Play': @@ -121,7 +121,7 @@ class Monitor(xbmc.Monitor): self.general_commands(data) elif method == 'LoadServer': - self.server_instance(data['ServerId']) + Jellyfin(data['ServerId']).get_client().register_client() elif method == 'AddUser': server.jellyfin.session_add_user(server.config.data['app.session'], data['Id'], data['Add'])