Merge pull request jellyfin#130 from TrueTechy/restructuring

Restructuring
sebPomme · Nov 8, 2019 · 7212e13 · 7212e13
2 parents 6be8213 + 7e8f344
commit 7212e13
Show file tree

Hide file tree

Showing 72 changed files with 27 additions and 45 deletions.
diff --git a/context.py b/context.py
@@ -12,7 +12,7 @@
 #################################################################################################
 
 __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'), 'jellyfin_kodi')).decode('utf-8')
 
 sys.path.insert(0, __base__)
 

diff --git a/context_play.py b/context_play.py
@@ -12,7 +12,7 @@
 #################################################################################################
 
 __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'), 'jellyfin_kodi')).decode('utf-8')
 
 sys.path.insert(0, __base__)
 

diff --git a/default.py b/default.py
@@ -12,7 +12,7 @@
 #################################################################################################
 
 __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'), 'jellyfin_kodi')).decode('utf-8')
 
 sys.path.insert(0, __base__)
 

diff --git a/resources/lib/__init__.py → jellyfin_kodi/__init__.py b/resources/lib/__init__.py → jellyfin_kodi/__init__.py
diff --git a/resources/lib/client.py → jellyfin_kodi/client.py b/resources/lib/client.py → jellyfin_kodi/client.py
diff --git a/resources/lib/connect.py → jellyfin_kodi/connect.py b/resources/lib/connect.py → jellyfin_kodi/connect.py
@@ -12,8 +12,8 @@
 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/resources/lib/database/__init__.py → jellyfin_kodi/database/__init__.py b/resources/lib/database/__init__.py → jellyfin_kodi/database/__init__.py
diff --git a/resources/lib/database/jellyfin_db.py → jellyfin_kodi/database/jellyfin_db.py b/resources/lib/database/jellyfin_db.py → jellyfin_kodi/database/jellyfin_db.py
diff --git a/resources/lib/database/queries.py → jellyfin_kodi/database/queries.py b/resources/lib/database/queries.py → jellyfin_kodi/database/queries.py
diff --git a/resources/lib/dialogs/__init__.py → jellyfin_kodi/dialogs/__init__.py b/resources/lib/dialogs/__init__.py → jellyfin_kodi/dialogs/__init__.py
diff --git a/resources/lib/dialogs/context.py → jellyfin_kodi/dialogs/context.py b/resources/lib/dialogs/context.py → jellyfin_kodi/dialogs/context.py
diff --git a/resources/lib/dialogs/loginmanual.py → jellyfin_kodi/dialogs/loginmanual.py b/resources/lib/dialogs/loginmanual.py → jellyfin_kodi/dialogs/loginmanual.py
diff --git a/resources/lib/dialogs/resume.py → jellyfin_kodi/dialogs/resume.py b/resources/lib/dialogs/resume.py → jellyfin_kodi/dialogs/resume.py
diff --git a/resources/lib/dialogs/serverconnect.py → jellyfin_kodi/dialogs/serverconnect.py b/resources/lib/dialogs/serverconnect.py → jellyfin_kodi/dialogs/serverconnect.py
@@ -8,7 +8,7 @@
 import xbmcgui
 
 from helper import _
-from jellyfin.core.connection_manager import CONNECTION_STATE
+from jellyfin.connection_manager import CONNECTION_STATE
 
 ##################################################################################################
 

diff --git a/resources/lib/dialogs/servermanual.py → jellyfin_kodi/dialogs/servermanual.py b/resources/lib/dialogs/servermanual.py → jellyfin_kodi/dialogs/servermanual.py
@@ -10,7 +10,7 @@
 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/resources/lib/dialogs/usersconnect.py → jellyfin_kodi/dialogs/usersconnect.py b/resources/lib/dialogs/usersconnect.py → jellyfin_kodi/dialogs/usersconnect.py
diff --git a/resources/lib/downloader.py → jellyfin_kodi/downloader.py b/resources/lib/downloader.py → jellyfin_kodi/downloader.py
@@ -10,8 +10,8 @@
 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/resources/lib/entrypoint/__init__.py → jellyfin_kodi/entrypoint/__init__.py b/resources/lib/entrypoint/__init__.py → jellyfin_kodi/entrypoint/__init__.py
diff --git a/resources/lib/entrypoint/context.py → jellyfin_kodi/entrypoint/context.py b/resources/lib/entrypoint/context.py → jellyfin_kodi/entrypoint/context.py
diff --git a/resources/lib/entrypoint/default.py → jellyfin_kodi/entrypoint/default.py b/resources/lib/entrypoint/default.py → jellyfin_kodi/entrypoint/default.py
diff --git a/resources/lib/entrypoint/service.py → jellyfin_kodi/entrypoint/service.py b/resources/lib/entrypoint/service.py → jellyfin_kodi/entrypoint/service.py
diff --git a/resources/lib/full_sync.py → jellyfin_kodi/full_sync.py b/resources/lib/full_sync.py → jellyfin_kodi/full_sync.py
diff --git a/resources/lib/helper/__init__.py → jellyfin_kodi/helper/__init__.py b/resources/lib/helper/__init__.py → jellyfin_kodi/helper/__init__.py
@@ -17,6 +17,7 @@
 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/resources/lib/helper/api.py → jellyfin_kodi/helper/api.py b/resources/lib/helper/api.py → jellyfin_kodi/helper/api.py
diff --git a/resources/lib/helper/exceptions.py → jellyfin_kodi/helper/exceptions.py b/resources/lib/helper/exceptions.py → jellyfin_kodi/helper/exceptions.py
diff --git a/resources/lib/helper/loghandler.py → jellyfin_kodi/helper/loghandler.py b/resources/lib/helper/loghandler.py → jellyfin_kodi/helper/loghandler.py
diff --git a/resources/lib/helper/playutils.py → jellyfin_kodi/helper/playutils.py b/resources/lib/helper/playutils.py → jellyfin_kodi/helper/playutils.py
diff --git a/resources/lib/helper/translate.py → jellyfin_kodi/helper/translate.py b/resources/lib/helper/translate.py → jellyfin_kodi/helper/translate.py
diff --git a/resources/lib/helper/utils.py → jellyfin_kodi/helper/utils.py b/resources/lib/helper/utils.py → jellyfin_kodi/helper/utils.py
@@ -19,7 +19,7 @@
 import xbmcgui
 import xbmcvfs
 
-from .translate import _
+from translate import _
 
 #################################################################################################
 
@@ -484,3 +484,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/resources/lib/helper/wrapper.py → jellyfin_kodi/helper/wrapper.py b/resources/lib/helper/wrapper.py → jellyfin_kodi/helper/wrapper.py
diff --git a/resources/lib/helper/xmls.py → jellyfin_kodi/helper/xmls.py b/resources/lib/helper/xmls.py → jellyfin_kodi/helper/xmls.py
diff --git a/resources/lib/jellyfin/__init__.py → jellyfin_kodi/jellyfin/__init__.py b/resources/lib/jellyfin/__init__.py → jellyfin_kodi/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/resources/lib/jellyfin/core/api.py → jellyfin_kodi/jellyfin/api.py b/resources/lib/jellyfin/core/api.py → jellyfin_kodi/jellyfin/api.py
diff --git a/resources/lib/jellyfin/client.py → jellyfin_kodi/jellyfin/client.py b/resources/lib/jellyfin/client.py → 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/resources/lib/jellyfin/core/configuration.py → jellyfin_kodi/jellyfin/configuration.py b/resources/lib/jellyfin/core/configuration.py → jellyfin_kodi/jellyfin/configuration.py
diff --git a/...s/lib/jellyfin/core/connection_manager.py → jellyfin_kodi/jellyfin/connection_manager.py b/...s/lib/jellyfin/core/connection_manager.py → jellyfin_kodi/jellyfin/connection_manager.py
diff --git a/resources/lib/jellyfin/core/credentials.py → jellyfin_kodi/jellyfin/credentials.py b/resources/lib/jellyfin/core/credentials.py → jellyfin_kodi/jellyfin/credentials.py
diff --git a/resources/lib/jellyfin/core/exceptions.py → jellyfin_kodi/jellyfin/exceptions.py b/resources/lib/jellyfin/core/exceptions.py → jellyfin_kodi/jellyfin/exceptions.py
diff --git a/resources/lib/jellyfin/core/http.py → jellyfin_kodi/jellyfin/http.py b/resources/lib/jellyfin/core/http.py → jellyfin_kodi/jellyfin/http.py
diff --git a/...urces/lib/jellyfin/resources/websocket.py → jellyfin_kodi/jellyfin/websocket.py b/...urces/lib/jellyfin/resources/websocket.py → jellyfin_kodi/jellyfin/websocket.py
diff --git a/resources/lib/jellyfin/core/ws_client.py → jellyfin_kodi/jellyfin/ws_client.py b/resources/lib/jellyfin/core/ws_client.py → jellyfin_kodi/jellyfin/ws_client.py
@@ -8,7 +8,7 @@
 
 import xbmc
 
-from ..resources import websocket
+import websocket
 
 ##################################################################################################
 

diff --git a/resources/lib/library.py → jellyfin_kodi/library.py b/resources/lib/library.py → jellyfin_kodi/library.py
diff --git a/resources/lib/monitor.py → jellyfin_kodi/monitor.py b/resources/lib/monitor.py → jellyfin_kodi/monitor.py
diff --git a/resources/lib/objects/__init__.py → jellyfin_kodi/objects/__init__.py b/resources/lib/objects/__init__.py → jellyfin_kodi/objects/__init__.py
diff --git a/resources/lib/objects/actions.py → jellyfin_kodi/objects/actions.py b/resources/lib/objects/actions.py → jellyfin_kodi/objects/actions.py
diff --git a/resources/lib/objects/kodi/__init__.py → jellyfin_kodi/objects/kodi/__init__.py b/resources/lib/objects/kodi/__init__.py → jellyfin_kodi/objects/kodi/__init__.py
diff --git a/resources/lib/objects/kodi/artwork.py → jellyfin_kodi/objects/kodi/artwork.py b/resources/lib/objects/kodi/artwork.py → jellyfin_kodi/objects/kodi/artwork.py
diff --git a/resources/lib/objects/kodi/kodi.py → jellyfin_kodi/objects/kodi/kodi.py b/resources/lib/objects/kodi/kodi.py → jellyfin_kodi/objects/kodi/kodi.py
diff --git a/resources/lib/objects/kodi/movies.py → jellyfin_kodi/objects/kodi/movies.py b/resources/lib/objects/kodi/movies.py → jellyfin_kodi/objects/kodi/movies.py
diff --git a/resources/lib/objects/kodi/music.py → jellyfin_kodi/objects/kodi/music.py b/resources/lib/objects/kodi/music.py → jellyfin_kodi/objects/kodi/music.py
diff --git a/resources/lib/objects/kodi/musicvideos.py → jellyfin_kodi/objects/kodi/musicvideos.py b/resources/lib/objects/kodi/musicvideos.py → jellyfin_kodi/objects/kodi/musicvideos.py
diff --git a/resources/lib/objects/kodi/queries.py → jellyfin_kodi/objects/kodi/queries.py b/resources/lib/objects/kodi/queries.py → jellyfin_kodi/objects/kodi/queries.py
diff --git a/resources/lib/objects/kodi/queries_music.py → jellyfin_kodi/objects/kodi/queries_music.py b/resources/lib/objects/kodi/queries_music.py → jellyfin_kodi/objects/kodi/queries_music.py
diff --git a/...urces/lib/objects/kodi/queries_texture.py → ...yfin_kodi/objects/kodi/queries_texture.py b/...urces/lib/objects/kodi/queries_texture.py → ...yfin_kodi/objects/kodi/queries_texture.py
diff --git a/resources/lib/objects/kodi/tvshows.py → jellyfin_kodi/objects/kodi/tvshows.py b/resources/lib/objects/kodi/tvshows.py → jellyfin_kodi/objects/kodi/tvshows.py
diff --git a/resources/lib/objects/movies.py → jellyfin_kodi/objects/movies.py b/resources/lib/objects/movies.py → jellyfin_kodi/objects/movies.py
diff --git a/resources/lib/objects/music.py → jellyfin_kodi/objects/music.py b/resources/lib/objects/music.py → jellyfin_kodi/objects/music.py
diff --git a/resources/lib/objects/musicvideos.py → jellyfin_kodi/objects/musicvideos.py b/resources/lib/objects/musicvideos.py → jellyfin_kodi/objects/musicvideos.py
diff --git a/resources/lib/objects/obj.py → jellyfin_kodi/objects/obj.py b/resources/lib/objects/obj.py → jellyfin_kodi/objects/obj.py
diff --git a/resources/lib/objects/obj_map.json → jellyfin_kodi/objects/obj_map.json b/resources/lib/objects/obj_map.json → jellyfin_kodi/objects/obj_map.json
diff --git a/resources/lib/objects/tvshows.py → jellyfin_kodi/objects/tvshows.py b/resources/lib/objects/tvshows.py → jellyfin_kodi/objects/tvshows.py
diff --git a/resources/lib/objects/utils.py → jellyfin_kodi/objects/utils.py b/resources/lib/objects/utils.py → jellyfin_kodi/objects/utils.py
diff --git a/resources/lib/player.py → jellyfin_kodi/player.py b/resources/lib/player.py → jellyfin_kodi/player.py
diff --git a/resources/lib/setup.py → jellyfin_kodi/setup.py b/resources/lib/setup.py → jellyfin_kodi/setup.py
diff --git a/resources/lib/views.py → jellyfin_kodi/views.py b/resources/lib/views.py → jellyfin_kodi/views.py
diff --git a/resources/lib/webservice.py → jellyfin_kodi/webservice.py b/resources/lib/webservice.py → jellyfin_kodi/webservice.py
diff --git a/resources/__init__.py b/resources/__init__.py
diff --git a/resources/lib/jellyfin/core/__init__.py b/resources/lib/jellyfin/core/__init__.py
diff --git a/resources/lib/jellyfin/helpers/__init__.py b/resources/lib/jellyfin/helpers/__init__.py
diff --git a/resources/lib/jellyfin/helpers/utils.py b/resources/lib/jellyfin/helpers/utils.py
diff --git a/resources/lib/jellyfin/resources/__init__.py b/resources/lib/jellyfin/resources/__init__.py
diff --git a/service.py b/service.py
@@ -13,14 +13,14 @@
 #################################################################################################
 
 __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'), 'jellyfin_kodi')).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 @@ def run(self):
 
 
 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.")