From b64ee60b3d92ac35be9a7418fd77963964b7c162 Mon Sep 17 00:00:00 2001 From: TrueTechy Date: Fri, 1 Nov 2019 00:43:20 +0000 Subject: [PATCH] Begin restructing, fixed some issues related to movement --- addon.xml | 1 + context.py | 2 +- context_play.py | 2 +- default.py | 2 +- {resources/lib => kodi_jellyfin}/__init__.py | 0 {resources/lib => kodi_jellyfin}/client.py | 0 {resources/lib => kodi_jellyfin}/connect.py | 6 ++++-- {resources/lib => kodi_jellyfin}/database/__init__.py | 0 {resources/lib => kodi_jellyfin}/database/jellyfin_db.py | 0 {resources/lib => kodi_jellyfin}/database/queries.py | 0 {resources/lib => kodi_jellyfin}/dialogs/__init__.py | 0 {resources/lib => kodi_jellyfin}/dialogs/context.py | 0 {resources/lib => kodi_jellyfin}/dialogs/loginmanual.py | 0 {resources/lib => kodi_jellyfin}/dialogs/resume.py | 0 {resources/lib => kodi_jellyfin}/dialogs/serverconnect.py | 0 {resources/lib => kodi_jellyfin}/dialogs/servermanual.py | 0 {resources/lib => kodi_jellyfin}/dialogs/usersconnect.py | 0 {resources/lib => kodi_jellyfin}/downloader.py | 0 {resources/lib => kodi_jellyfin}/entrypoint/__init__.py | 0 {resources/lib => kodi_jellyfin}/entrypoint/context.py | 0 {resources/lib => kodi_jellyfin}/entrypoint/default.py | 0 {resources/lib => kodi_jellyfin}/entrypoint/service.py | 0 {resources/lib => kodi_jellyfin}/full_sync.py | 0 {resources/lib => kodi_jellyfin}/helper/__init__.py | 0 {resources/lib => kodi_jellyfin}/helper/api.py | 0 {resources/lib => kodi_jellyfin}/helper/exceptions.py | 0 {resources/lib => kodi_jellyfin}/helper/loghandler.py | 0 {resources/lib => kodi_jellyfin}/helper/playutils.py | 0 {resources/lib => kodi_jellyfin}/helper/translate.py | 0 {resources/lib => kodi_jellyfin}/helper/utils.py | 2 +- {resources/lib => kodi_jellyfin}/helper/wrapper.py | 0 {resources/lib => kodi_jellyfin}/helper/xmls.py | 0 {resources/lib => kodi_jellyfin}/jellyfin/__init__.py | 0 {resources/lib => kodi_jellyfin}/jellyfin/client.py | 0 {resources/lib => kodi_jellyfin}/jellyfin/core/__init__.py | 0 {resources/lib => kodi_jellyfin}/jellyfin/core/api.py | 0 .../lib => kodi_jellyfin}/jellyfin/core/configuration.py | 0 .../jellyfin/core/connection_manager.py | 0 .../lib => kodi_jellyfin}/jellyfin/core/credentials.py | 0 .../lib => kodi_jellyfin}/jellyfin/core/exceptions.py | 0 {resources/lib => kodi_jellyfin}/jellyfin/core/http.py | 0 {resources/lib => kodi_jellyfin}/jellyfin/core/ws_client.py | 2 +- .../lib => kodi_jellyfin}/jellyfin/helpers/__init__.py | 0 {resources/lib => kodi_jellyfin}/jellyfin/helpers/utils.py | 0 .../resources => kodi_jellyfin/jellyfin}/websocket.py | 0 {resources/lib => kodi_jellyfin}/library.py | 0 {resources/lib => kodi_jellyfin}/monitor.py | 0 {resources/lib => kodi_jellyfin}/objects/__init__.py | 0 {resources/lib => kodi_jellyfin}/objects/actions.py | 0 {resources/lib => kodi_jellyfin}/objects/kodi/__init__.py | 0 {resources/lib => kodi_jellyfin}/objects/kodi/artwork.py | 0 {resources/lib => kodi_jellyfin}/objects/kodi/kodi.py | 0 {resources/lib => kodi_jellyfin}/objects/kodi/movies.py | 0 {resources/lib => kodi_jellyfin}/objects/kodi/music.py | 0 .../lib => kodi_jellyfin}/objects/kodi/musicvideos.py | 0 {resources/lib => kodi_jellyfin}/objects/kodi/queries.py | 0 .../lib => kodi_jellyfin}/objects/kodi/queries_music.py | 0 .../lib => kodi_jellyfin}/objects/kodi/queries_texture.py | 0 {resources/lib => kodi_jellyfin}/objects/kodi/tvshows.py | 0 {resources/lib => kodi_jellyfin}/objects/movies.py | 0 {resources/lib => kodi_jellyfin}/objects/music.py | 0 {resources/lib => kodi_jellyfin}/objects/musicvideos.py | 0 {resources/lib => kodi_jellyfin}/objects/obj.py | 0 {resources/lib => kodi_jellyfin}/objects/obj_map.json | 0 {resources/lib => kodi_jellyfin}/objects/tvshows.py | 0 {resources/lib => kodi_jellyfin}/objects/utils.py | 0 {resources/lib => kodi_jellyfin}/player.py | 0 {resources/lib => kodi_jellyfin}/setup.py | 0 {resources/lib => kodi_jellyfin}/views.py | 0 {resources/lib => kodi_jellyfin}/webservice.py | 0 resources/__init__.py | 1 - resources/lib/jellyfin/resources/__init__.py | 0 service.py | 6 ++---- 73 files changed, 12 insertions(+), 12 deletions(-) rename {resources/lib => kodi_jellyfin}/__init__.py (100%) rename {resources/lib => kodi_jellyfin}/client.py (100%) rename {resources/lib => kodi_jellyfin}/connect.py (98%) rename {resources/lib => kodi_jellyfin}/database/__init__.py (100%) rename {resources/lib => kodi_jellyfin}/database/jellyfin_db.py (100%) rename {resources/lib => kodi_jellyfin}/database/queries.py (100%) rename {resources/lib => kodi_jellyfin}/dialogs/__init__.py (100%) rename {resources/lib => kodi_jellyfin}/dialogs/context.py (100%) rename {resources/lib => kodi_jellyfin}/dialogs/loginmanual.py (100%) rename {resources/lib => kodi_jellyfin}/dialogs/resume.py (100%) rename {resources/lib => kodi_jellyfin}/dialogs/serverconnect.py (100%) rename {resources/lib => kodi_jellyfin}/dialogs/servermanual.py (100%) rename {resources/lib => kodi_jellyfin}/dialogs/usersconnect.py (100%) rename {resources/lib => kodi_jellyfin}/downloader.py (100%) rename {resources/lib => kodi_jellyfin}/entrypoint/__init__.py (100%) rename {resources/lib => kodi_jellyfin}/entrypoint/context.py (100%) rename {resources/lib => kodi_jellyfin}/entrypoint/default.py (100%) rename {resources/lib => kodi_jellyfin}/entrypoint/service.py (100%) rename {resources/lib => kodi_jellyfin}/full_sync.py (100%) rename {resources/lib => kodi_jellyfin}/helper/__init__.py (100%) rename {resources/lib => kodi_jellyfin}/helper/api.py (100%) rename {resources/lib => kodi_jellyfin}/helper/exceptions.py (100%) rename {resources/lib => kodi_jellyfin}/helper/loghandler.py (100%) rename {resources/lib => kodi_jellyfin}/helper/playutils.py (100%) rename {resources/lib => kodi_jellyfin}/helper/translate.py (100%) rename {resources/lib => kodi_jellyfin}/helper/utils.py (99%) rename {resources/lib => kodi_jellyfin}/helper/wrapper.py (100%) rename {resources/lib => kodi_jellyfin}/helper/xmls.py (100%) rename {resources/lib => kodi_jellyfin}/jellyfin/__init__.py (100%) rename {resources/lib => kodi_jellyfin}/jellyfin/client.py (100%) rename {resources/lib => kodi_jellyfin}/jellyfin/core/__init__.py (100%) rename {resources/lib => kodi_jellyfin}/jellyfin/core/api.py (100%) rename {resources/lib => kodi_jellyfin}/jellyfin/core/configuration.py (100%) rename {resources/lib => kodi_jellyfin}/jellyfin/core/connection_manager.py (100%) rename {resources/lib => kodi_jellyfin}/jellyfin/core/credentials.py (100%) rename {resources/lib => kodi_jellyfin}/jellyfin/core/exceptions.py (100%) rename {resources/lib => kodi_jellyfin}/jellyfin/core/http.py (100%) rename {resources/lib => kodi_jellyfin}/jellyfin/core/ws_client.py (98%) rename {resources/lib => kodi_jellyfin}/jellyfin/helpers/__init__.py (100%) rename {resources/lib => kodi_jellyfin}/jellyfin/helpers/utils.py (100%) rename {resources/lib/jellyfin/resources => kodi_jellyfin/jellyfin}/websocket.py (100%) rename {resources/lib => kodi_jellyfin}/library.py (100%) rename {resources/lib => kodi_jellyfin}/monitor.py (100%) rename {resources/lib => kodi_jellyfin}/objects/__init__.py (100%) rename {resources/lib => kodi_jellyfin}/objects/actions.py (100%) rename {resources/lib => kodi_jellyfin}/objects/kodi/__init__.py (100%) rename {resources/lib => kodi_jellyfin}/objects/kodi/artwork.py (100%) rename {resources/lib => kodi_jellyfin}/objects/kodi/kodi.py (100%) rename {resources/lib => kodi_jellyfin}/objects/kodi/movies.py (100%) rename {resources/lib => kodi_jellyfin}/objects/kodi/music.py (100%) rename {resources/lib => kodi_jellyfin}/objects/kodi/musicvideos.py (100%) rename {resources/lib => kodi_jellyfin}/objects/kodi/queries.py (100%) rename {resources/lib => kodi_jellyfin}/objects/kodi/queries_music.py (100%) rename {resources/lib => kodi_jellyfin}/objects/kodi/queries_texture.py (100%) rename {resources/lib => kodi_jellyfin}/objects/kodi/tvshows.py (100%) rename {resources/lib => kodi_jellyfin}/objects/movies.py (100%) rename {resources/lib => kodi_jellyfin}/objects/music.py (100%) rename {resources/lib => kodi_jellyfin}/objects/musicvideos.py (100%) rename {resources/lib => kodi_jellyfin}/objects/obj.py (100%) rename {resources/lib => kodi_jellyfin}/objects/obj_map.json (100%) rename {resources/lib => kodi_jellyfin}/objects/tvshows.py (100%) rename {resources/lib => kodi_jellyfin}/objects/utils.py (100%) rename {resources/lib => kodi_jellyfin}/player.py (100%) rename {resources/lib => kodi_jellyfin}/setup.py (100%) rename {resources/lib => kodi_jellyfin}/views.py (100%) rename {resources/lib => kodi_jellyfin}/webservice.py (100%) delete mode 100644 resources/__init__.py delete mode 100644 resources/lib/jellyfin/resources/__init__.py diff --git a/addon.xml b/addon.xml index 38be1920..a3a69e7d 100644 --- a/addon.xml +++ b/addon.xml @@ -4,6 +4,7 @@ version="0.3.4" provider-name="Jellyfin Contributors, angelblue05"> + diff --git a/context.py b/context.py index ec3c3821..e8f349c6 100644 --- a/context.py +++ b/context.py @@ -12,7 +12,7 @@ import xbmcaddon ################################################################################################# __addon__ = xbmcaddon.Addon(id='plugin.video.jellyfin') -__base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib')).decode('utf-8') +__base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'kodi_jellyfin')).decode('utf-8') sys.path.insert(0, __base__) diff --git a/context_play.py b/context_play.py index 6593b5c2..8c9d7583 100644 --- a/context_play.py +++ b/context_play.py @@ -12,7 +12,7 @@ import xbmcaddon ################################################################################################# __addon__ = xbmcaddon.Addon(id='plugin.video.jellyfin') -__base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib')).decode('utf-8') +__base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'kodi_jellyfin')).decode('utf-8') sys.path.insert(0, __base__) diff --git a/default.py b/default.py index e6f7d101..94ac956e 100644 --- a/default.py +++ b/default.py @@ -12,7 +12,7 @@ import xbmcaddon ################################################################################################# __addon__ = xbmcaddon.Addon(id='plugin.video.jellyfin') -__base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib')).decode('utf-8') +__base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'kodi_jellyfin')).decode('utf-8') sys.path.insert(0, __base__) diff --git a/resources/lib/__init__.py b/kodi_jellyfin/__init__.py similarity index 100% rename from resources/lib/__init__.py rename to kodi_jellyfin/__init__.py diff --git a/resources/lib/client.py b/kodi_jellyfin/client.py similarity index 100% rename from resources/lib/client.py rename to kodi_jellyfin/client.py diff --git a/resources/lib/connect.py b/kodi_jellyfin/connect.py similarity index 98% rename from resources/lib/connect.py rename to kodi_jellyfin/connect.py index 9d16f0ba..e7b46b8c 100644 --- a/resources/lib/connect.py +++ b/kodi_jellyfin/connect.py @@ -3,6 +3,7 @@ ################################################################################################## import logging +import os import xbmc import xbmcaddon @@ -18,7 +19,8 @@ from jellyfin.core.exceptions import HTTPException ################################################################################################## LOG = logging.getLogger("JELLYFIN." + __name__) -XML_PATH = (xbmcaddon.Addon(addon_id()).getAddonInfo('path'), "default", "1080i") +XML_PATH = (xbmcaddon.Addon(id='plugin.video.jellyfin').getAddonInfo('path'), "default", "1080i") + ################################################################################################## @@ -155,7 +157,7 @@ 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/resources/lib/database/__init__.py b/kodi_jellyfin/database/__init__.py similarity index 100% rename from resources/lib/database/__init__.py rename to kodi_jellyfin/database/__init__.py diff --git a/resources/lib/database/jellyfin_db.py b/kodi_jellyfin/database/jellyfin_db.py similarity index 100% rename from resources/lib/database/jellyfin_db.py rename to kodi_jellyfin/database/jellyfin_db.py diff --git a/resources/lib/database/queries.py b/kodi_jellyfin/database/queries.py similarity index 100% rename from resources/lib/database/queries.py rename to kodi_jellyfin/database/queries.py diff --git a/resources/lib/dialogs/__init__.py b/kodi_jellyfin/dialogs/__init__.py similarity index 100% rename from resources/lib/dialogs/__init__.py rename to kodi_jellyfin/dialogs/__init__.py diff --git a/resources/lib/dialogs/context.py b/kodi_jellyfin/dialogs/context.py similarity index 100% rename from resources/lib/dialogs/context.py rename to kodi_jellyfin/dialogs/context.py diff --git a/resources/lib/dialogs/loginmanual.py b/kodi_jellyfin/dialogs/loginmanual.py similarity index 100% rename from resources/lib/dialogs/loginmanual.py rename to kodi_jellyfin/dialogs/loginmanual.py diff --git a/resources/lib/dialogs/resume.py b/kodi_jellyfin/dialogs/resume.py similarity index 100% rename from resources/lib/dialogs/resume.py rename to kodi_jellyfin/dialogs/resume.py diff --git a/resources/lib/dialogs/serverconnect.py b/kodi_jellyfin/dialogs/serverconnect.py similarity index 100% rename from resources/lib/dialogs/serverconnect.py rename to kodi_jellyfin/dialogs/serverconnect.py diff --git a/resources/lib/dialogs/servermanual.py b/kodi_jellyfin/dialogs/servermanual.py similarity index 100% rename from resources/lib/dialogs/servermanual.py rename to kodi_jellyfin/dialogs/servermanual.py diff --git a/resources/lib/dialogs/usersconnect.py b/kodi_jellyfin/dialogs/usersconnect.py similarity index 100% rename from resources/lib/dialogs/usersconnect.py rename to kodi_jellyfin/dialogs/usersconnect.py diff --git a/resources/lib/downloader.py b/kodi_jellyfin/downloader.py similarity index 100% rename from resources/lib/downloader.py rename to kodi_jellyfin/downloader.py diff --git a/resources/lib/entrypoint/__init__.py b/kodi_jellyfin/entrypoint/__init__.py similarity index 100% rename from resources/lib/entrypoint/__init__.py rename to kodi_jellyfin/entrypoint/__init__.py diff --git a/resources/lib/entrypoint/context.py b/kodi_jellyfin/entrypoint/context.py similarity index 100% rename from resources/lib/entrypoint/context.py rename to kodi_jellyfin/entrypoint/context.py diff --git a/resources/lib/entrypoint/default.py b/kodi_jellyfin/entrypoint/default.py similarity index 100% rename from resources/lib/entrypoint/default.py rename to kodi_jellyfin/entrypoint/default.py diff --git a/resources/lib/entrypoint/service.py b/kodi_jellyfin/entrypoint/service.py similarity index 100% rename from resources/lib/entrypoint/service.py rename to kodi_jellyfin/entrypoint/service.py diff --git a/resources/lib/full_sync.py b/kodi_jellyfin/full_sync.py similarity index 100% rename from resources/lib/full_sync.py rename to kodi_jellyfin/full_sync.py diff --git a/resources/lib/helper/__init__.py b/kodi_jellyfin/helper/__init__.py similarity index 100% rename from resources/lib/helper/__init__.py rename to kodi_jellyfin/helper/__init__.py diff --git a/resources/lib/helper/api.py b/kodi_jellyfin/helper/api.py similarity index 100% rename from resources/lib/helper/api.py rename to kodi_jellyfin/helper/api.py diff --git a/resources/lib/helper/exceptions.py b/kodi_jellyfin/helper/exceptions.py similarity index 100% rename from resources/lib/helper/exceptions.py rename to kodi_jellyfin/helper/exceptions.py diff --git a/resources/lib/helper/loghandler.py b/kodi_jellyfin/helper/loghandler.py similarity index 100% rename from resources/lib/helper/loghandler.py rename to kodi_jellyfin/helper/loghandler.py diff --git a/resources/lib/helper/playutils.py b/kodi_jellyfin/helper/playutils.py similarity index 100% rename from resources/lib/helper/playutils.py rename to kodi_jellyfin/helper/playutils.py diff --git a/resources/lib/helper/translate.py b/kodi_jellyfin/helper/translate.py similarity index 100% rename from resources/lib/helper/translate.py rename to kodi_jellyfin/helper/translate.py diff --git a/resources/lib/helper/utils.py b/kodi_jellyfin/helper/utils.py similarity index 99% rename from resources/lib/helper/utils.py rename to kodi_jellyfin/helper/utils.py index 95c99c7c..328d954e 100644 --- a/resources/lib/helper/utils.py +++ b/kodi_jellyfin/helper/utils.py @@ -19,7 +19,7 @@ import xbmcaddon import xbmcgui import xbmcvfs -from .translate import _ +from translate import _ ################################################################################################# diff --git a/resources/lib/helper/wrapper.py b/kodi_jellyfin/helper/wrapper.py similarity index 100% rename from resources/lib/helper/wrapper.py rename to kodi_jellyfin/helper/wrapper.py diff --git a/resources/lib/helper/xmls.py b/kodi_jellyfin/helper/xmls.py similarity index 100% rename from resources/lib/helper/xmls.py rename to kodi_jellyfin/helper/xmls.py diff --git a/resources/lib/jellyfin/__init__.py b/kodi_jellyfin/jellyfin/__init__.py similarity index 100% rename from resources/lib/jellyfin/__init__.py rename to kodi_jellyfin/jellyfin/__init__.py diff --git a/resources/lib/jellyfin/client.py b/kodi_jellyfin/jellyfin/client.py similarity index 100% rename from resources/lib/jellyfin/client.py rename to kodi_jellyfin/jellyfin/client.py diff --git a/resources/lib/jellyfin/core/__init__.py b/kodi_jellyfin/jellyfin/core/__init__.py similarity index 100% rename from resources/lib/jellyfin/core/__init__.py rename to kodi_jellyfin/jellyfin/core/__init__.py diff --git a/resources/lib/jellyfin/core/api.py b/kodi_jellyfin/jellyfin/core/api.py similarity index 100% rename from resources/lib/jellyfin/core/api.py rename to kodi_jellyfin/jellyfin/core/api.py diff --git a/resources/lib/jellyfin/core/configuration.py b/kodi_jellyfin/jellyfin/core/configuration.py similarity index 100% rename from resources/lib/jellyfin/core/configuration.py rename to kodi_jellyfin/jellyfin/core/configuration.py diff --git a/resources/lib/jellyfin/core/connection_manager.py b/kodi_jellyfin/jellyfin/core/connection_manager.py similarity index 100% rename from resources/lib/jellyfin/core/connection_manager.py rename to kodi_jellyfin/jellyfin/core/connection_manager.py diff --git a/resources/lib/jellyfin/core/credentials.py b/kodi_jellyfin/jellyfin/core/credentials.py similarity index 100% rename from resources/lib/jellyfin/core/credentials.py rename to kodi_jellyfin/jellyfin/core/credentials.py diff --git a/resources/lib/jellyfin/core/exceptions.py b/kodi_jellyfin/jellyfin/core/exceptions.py similarity index 100% rename from resources/lib/jellyfin/core/exceptions.py rename to kodi_jellyfin/jellyfin/core/exceptions.py diff --git a/resources/lib/jellyfin/core/http.py b/kodi_jellyfin/jellyfin/core/http.py similarity index 100% rename from resources/lib/jellyfin/core/http.py rename to kodi_jellyfin/jellyfin/core/http.py diff --git a/resources/lib/jellyfin/core/ws_client.py b/kodi_jellyfin/jellyfin/core/ws_client.py similarity index 98% rename from resources/lib/jellyfin/core/ws_client.py rename to kodi_jellyfin/jellyfin/core/ws_client.py index 72c45c56..b51b45b1 100644 --- a/resources/lib/jellyfin/core/ws_client.py +++ b/kodi_jellyfin/jellyfin/core/ws_client.py @@ -8,7 +8,7 @@ import threading import xbmc -from ..resources import websocket +from .. import websocket ################################################################################################## diff --git a/resources/lib/jellyfin/helpers/__init__.py b/kodi_jellyfin/jellyfin/helpers/__init__.py similarity index 100% rename from resources/lib/jellyfin/helpers/__init__.py rename to kodi_jellyfin/jellyfin/helpers/__init__.py diff --git a/resources/lib/jellyfin/helpers/utils.py b/kodi_jellyfin/jellyfin/helpers/utils.py similarity index 100% rename from resources/lib/jellyfin/helpers/utils.py rename to kodi_jellyfin/jellyfin/helpers/utils.py diff --git a/resources/lib/jellyfin/resources/websocket.py b/kodi_jellyfin/jellyfin/websocket.py similarity index 100% rename from resources/lib/jellyfin/resources/websocket.py rename to kodi_jellyfin/jellyfin/websocket.py diff --git a/resources/lib/library.py b/kodi_jellyfin/library.py similarity index 100% rename from resources/lib/library.py rename to kodi_jellyfin/library.py diff --git a/resources/lib/monitor.py b/kodi_jellyfin/monitor.py similarity index 100% rename from resources/lib/monitor.py rename to kodi_jellyfin/monitor.py diff --git a/resources/lib/objects/__init__.py b/kodi_jellyfin/objects/__init__.py similarity index 100% rename from resources/lib/objects/__init__.py rename to kodi_jellyfin/objects/__init__.py diff --git a/resources/lib/objects/actions.py b/kodi_jellyfin/objects/actions.py similarity index 100% rename from resources/lib/objects/actions.py rename to kodi_jellyfin/objects/actions.py diff --git a/resources/lib/objects/kodi/__init__.py b/kodi_jellyfin/objects/kodi/__init__.py similarity index 100% rename from resources/lib/objects/kodi/__init__.py rename to kodi_jellyfin/objects/kodi/__init__.py diff --git a/resources/lib/objects/kodi/artwork.py b/kodi_jellyfin/objects/kodi/artwork.py similarity index 100% rename from resources/lib/objects/kodi/artwork.py rename to kodi_jellyfin/objects/kodi/artwork.py diff --git a/resources/lib/objects/kodi/kodi.py b/kodi_jellyfin/objects/kodi/kodi.py similarity index 100% rename from resources/lib/objects/kodi/kodi.py rename to kodi_jellyfin/objects/kodi/kodi.py diff --git a/resources/lib/objects/kodi/movies.py b/kodi_jellyfin/objects/kodi/movies.py similarity index 100% rename from resources/lib/objects/kodi/movies.py rename to kodi_jellyfin/objects/kodi/movies.py diff --git a/resources/lib/objects/kodi/music.py b/kodi_jellyfin/objects/kodi/music.py similarity index 100% rename from resources/lib/objects/kodi/music.py rename to kodi_jellyfin/objects/kodi/music.py diff --git a/resources/lib/objects/kodi/musicvideos.py b/kodi_jellyfin/objects/kodi/musicvideos.py similarity index 100% rename from resources/lib/objects/kodi/musicvideos.py rename to kodi_jellyfin/objects/kodi/musicvideos.py diff --git a/resources/lib/objects/kodi/queries.py b/kodi_jellyfin/objects/kodi/queries.py similarity index 100% rename from resources/lib/objects/kodi/queries.py rename to kodi_jellyfin/objects/kodi/queries.py diff --git a/resources/lib/objects/kodi/queries_music.py b/kodi_jellyfin/objects/kodi/queries_music.py similarity index 100% rename from resources/lib/objects/kodi/queries_music.py rename to kodi_jellyfin/objects/kodi/queries_music.py diff --git a/resources/lib/objects/kodi/queries_texture.py b/kodi_jellyfin/objects/kodi/queries_texture.py similarity index 100% rename from resources/lib/objects/kodi/queries_texture.py rename to kodi_jellyfin/objects/kodi/queries_texture.py diff --git a/resources/lib/objects/kodi/tvshows.py b/kodi_jellyfin/objects/kodi/tvshows.py similarity index 100% rename from resources/lib/objects/kodi/tvshows.py rename to kodi_jellyfin/objects/kodi/tvshows.py diff --git a/resources/lib/objects/movies.py b/kodi_jellyfin/objects/movies.py similarity index 100% rename from resources/lib/objects/movies.py rename to kodi_jellyfin/objects/movies.py diff --git a/resources/lib/objects/music.py b/kodi_jellyfin/objects/music.py similarity index 100% rename from resources/lib/objects/music.py rename to kodi_jellyfin/objects/music.py diff --git a/resources/lib/objects/musicvideos.py b/kodi_jellyfin/objects/musicvideos.py similarity index 100% rename from resources/lib/objects/musicvideos.py rename to kodi_jellyfin/objects/musicvideos.py diff --git a/resources/lib/objects/obj.py b/kodi_jellyfin/objects/obj.py similarity index 100% rename from resources/lib/objects/obj.py rename to kodi_jellyfin/objects/obj.py diff --git a/resources/lib/objects/obj_map.json b/kodi_jellyfin/objects/obj_map.json similarity index 100% rename from resources/lib/objects/obj_map.json rename to kodi_jellyfin/objects/obj_map.json diff --git a/resources/lib/objects/tvshows.py b/kodi_jellyfin/objects/tvshows.py similarity index 100% rename from resources/lib/objects/tvshows.py rename to kodi_jellyfin/objects/tvshows.py diff --git a/resources/lib/objects/utils.py b/kodi_jellyfin/objects/utils.py similarity index 100% rename from resources/lib/objects/utils.py rename to kodi_jellyfin/objects/utils.py diff --git a/resources/lib/player.py b/kodi_jellyfin/player.py similarity index 100% rename from resources/lib/player.py rename to kodi_jellyfin/player.py diff --git a/resources/lib/setup.py b/kodi_jellyfin/setup.py similarity index 100% rename from resources/lib/setup.py rename to kodi_jellyfin/setup.py diff --git a/resources/lib/views.py b/kodi_jellyfin/views.py similarity index 100% rename from resources/lib/views.py rename to kodi_jellyfin/views.py diff --git a/resources/lib/webservice.py b/kodi_jellyfin/webservice.py similarity index 100% rename from resources/lib/webservice.py rename to kodi_jellyfin/webservice.py diff --git a/resources/__init__.py b/resources/__init__.py deleted file mode 100644 index b93054b3..00000000 --- a/resources/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# Dummy file to make this directory a package. diff --git a/resources/lib/jellyfin/resources/__init__.py b/resources/lib/jellyfin/resources/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/service.py b/service.py index 6f09fdab..eb7f4c4b 100644 --- a/service.py +++ b/service.py @@ -13,14 +13,14 @@ import xbmcaddon ################################################################################################# __addon__ = xbmcaddon.Addon(id='plugin.video.jellyfin') -__base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib')).decode('utf-8') +__base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'kodi_jellyfin')).decode('utf-8') sys.path.insert(0, __base__) ################################################################################################# from entrypoint import Service # noqa: F402 -from helper import settings # noqa: F402 +from helper.utils import settings # noqa: F402 ################################################################################################# @@ -65,12 +65,10 @@ class ServiceManager(threading.Thread): if __name__ == "__main__": - LOG.info("-->[ service ]") LOG.info("Delay startup by %s seconds.", DELAY) while True: - if not settings('enableAddon.bool'): LOG.warning("Jellyfin for Kodi is not enabled.")