From 7e8f34401d45ab5025e1e9e5e964d7933774481c Mon Sep 17 00:00:00 2001 From: TrueTechy Date: Sun, 3 Nov 2019 20:06:21 +0000 Subject: [PATCH] Remove Core folder --- jellyfin_kodi/connect.py | 4 ++-- jellyfin_kodi/dialogs/serverconnect.py | 2 +- jellyfin_kodi/dialogs/servermanual.py | 2 +- jellyfin_kodi/downloader.py | 4 ++-- jellyfin_kodi/jellyfin/{core => }/api.py | 0 jellyfin_kodi/jellyfin/client.py | 10 +++++----- jellyfin_kodi/jellyfin/{core => }/configuration.py | 0 .../jellyfin/{core => }/connection_manager.py | 0 jellyfin_kodi/jellyfin/core/__init__.py | 0 jellyfin_kodi/jellyfin/{core => }/credentials.py | 0 jellyfin_kodi/jellyfin/{core => }/exceptions.py | 0 jellyfin_kodi/jellyfin/{core => }/http.py | 0 jellyfin_kodi/jellyfin/{core => }/ws_client.py | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename jellyfin_kodi/jellyfin/{core => }/api.py (100%) rename jellyfin_kodi/jellyfin/{core => }/configuration.py (100%) rename jellyfin_kodi/jellyfin/{core => }/connection_manager.py (100%) delete mode 100644 jellyfin_kodi/jellyfin/core/__init__.py rename jellyfin_kodi/jellyfin/{core => }/credentials.py (100%) rename jellyfin_kodi/jellyfin/{core => }/exceptions.py (100%) rename jellyfin_kodi/jellyfin/{core => }/http.py (100%) rename jellyfin_kodi/jellyfin/{core => }/ws_client.py (98%) diff --git a/jellyfin_kodi/connect.py b/jellyfin_kodi/connect.py index 9d16f0ba..e05b5f9d 100644 --- a/jellyfin_kodi/connect.py +++ b/jellyfin_kodi/connect.py @@ -12,8 +12,8 @@ from database import get_credentials, save_credentials from dialogs import ServerConnect, UsersConnect, LoginManual, ServerManual from helper import settings, addon_id, event, api, window from jellyfin import Jellyfin -from jellyfin.core.connection_manager import CONNECTION_STATE -from jellyfin.core.exceptions import HTTPException +from jellyfin.connection_manager import CONNECTION_STATE +from jellyfin.exceptions import HTTPException ################################################################################################## diff --git a/jellyfin_kodi/dialogs/serverconnect.py b/jellyfin_kodi/dialogs/serverconnect.py index 349280b5..a1377fbf 100644 --- a/jellyfin_kodi/dialogs/serverconnect.py +++ b/jellyfin_kodi/dialogs/serverconnect.py @@ -8,7 +8,7 @@ import xbmc import xbmcgui from helper import _ -from jellyfin.core.connection_manager import CONNECTION_STATE +from jellyfin.connection_manager import CONNECTION_STATE ################################################################################################## diff --git a/jellyfin_kodi/dialogs/servermanual.py b/jellyfin_kodi/dialogs/servermanual.py index 314e9c28..a187ac66 100644 --- a/jellyfin_kodi/dialogs/servermanual.py +++ b/jellyfin_kodi/dialogs/servermanual.py @@ -10,7 +10,7 @@ import xbmcgui import xbmcaddon from helper import _, addon_id -from jellyfin.core.connection_manager import CONNECTION_STATE +from jellyfin.connection_manager import CONNECTION_STATE ################################################################################################## diff --git a/jellyfin_kodi/downloader.py b/jellyfin_kodi/downloader.py index a345ce00..fef18a4c 100644 --- a/jellyfin_kodi/downloader.py +++ b/jellyfin_kodi/downloader.py @@ -10,8 +10,8 @@ import xbmc import requests from helper import settings, stop, event, window, create_id from jellyfin import Jellyfin -from jellyfin.core import api -from jellyfin.core.exceptions import HTTPException +from jellyfin import api +from jellyfin.exceptions import HTTPException ################################################################################################# diff --git a/jellyfin_kodi/jellyfin/core/api.py b/jellyfin_kodi/jellyfin/api.py similarity index 100% rename from jellyfin_kodi/jellyfin/core/api.py rename to jellyfin_kodi/jellyfin/api.py diff --git a/jellyfin_kodi/jellyfin/client.py b/jellyfin_kodi/jellyfin/client.py index 7f03ff92..ee9db7fd 100644 --- a/jellyfin_kodi/jellyfin/client.py +++ b/jellyfin_kodi/jellyfin/client.py @@ -4,11 +4,11 @@ import logging -import core.api as api -from core.configuration import Config -from core.http import HTTP -from core.ws_client import WSClient -from core.connection_manager import ConnectionManager, CONNECTION_STATE +import api +from configuration import Config +from http import HTTP +from ws_client import WSClient +from connection_manager import ConnectionManager, CONNECTION_STATE ################################################################################################# diff --git a/jellyfin_kodi/jellyfin/core/configuration.py b/jellyfin_kodi/jellyfin/configuration.py similarity index 100% rename from jellyfin_kodi/jellyfin/core/configuration.py rename to jellyfin_kodi/jellyfin/configuration.py diff --git a/jellyfin_kodi/jellyfin/core/connection_manager.py b/jellyfin_kodi/jellyfin/connection_manager.py similarity index 100% rename from jellyfin_kodi/jellyfin/core/connection_manager.py rename to jellyfin_kodi/jellyfin/connection_manager.py diff --git a/jellyfin_kodi/jellyfin/core/__init__.py b/jellyfin_kodi/jellyfin/core/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/jellyfin_kodi/jellyfin/core/credentials.py b/jellyfin_kodi/jellyfin/credentials.py similarity index 100% rename from jellyfin_kodi/jellyfin/core/credentials.py rename to jellyfin_kodi/jellyfin/credentials.py diff --git a/jellyfin_kodi/jellyfin/core/exceptions.py b/jellyfin_kodi/jellyfin/exceptions.py similarity index 100% rename from jellyfin_kodi/jellyfin/core/exceptions.py rename to jellyfin_kodi/jellyfin/exceptions.py diff --git a/jellyfin_kodi/jellyfin/core/http.py b/jellyfin_kodi/jellyfin/http.py similarity index 100% rename from jellyfin_kodi/jellyfin/core/http.py rename to jellyfin_kodi/jellyfin/http.py diff --git a/jellyfin_kodi/jellyfin/core/ws_client.py b/jellyfin_kodi/jellyfin/ws_client.py similarity index 98% rename from jellyfin_kodi/jellyfin/core/ws_client.py rename to jellyfin_kodi/jellyfin/ws_client.py index b51b45b1..a2f1b8d8 100644 --- a/jellyfin_kodi/jellyfin/core/ws_client.py +++ b/jellyfin_kodi/jellyfin/ws_client.py @@ -8,7 +8,7 @@ import threading import xbmc -from .. import websocket +import websocket ##################################################################################################