From e8beee331c44339ffe2d45adf7cb77b11d745694 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 2 Oct 2021 14:23:28 -0400 Subject: [PATCH] Replace translatePath in top level files --- context.py | 8 ++++++-- context_play.py | 8 ++++++-- default.py | 8 ++++++-- service.py | 8 ++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/context.py b/context.py index 88eea1b3..2a6b3d5a 100644 --- a/context.py +++ b/context.py @@ -6,12 +6,16 @@ from __future__ import division, absolute_import, print_function, unicode_litera import os import sys -from kodi_six import xbmc, xbmcaddon +from kodi_six import xbmc, xbmcaddon, xbmcvfs ################################################################################################# +kodi_version = int(xbmc.getInfoLabel('System.BuildVersion')[:2]) __addon__ = xbmcaddon.Addon(id='plugin.video.jellyfin') -__base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'jellyfin_kodi')) +if kodi_version > 18: + __base__ = xbmcvfs.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'jellyfin_kodi')) +else: + __base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'jellyfin_kodi')) sys.path.insert(0, __base__) diff --git a/context_play.py b/context_play.py index 87d1638d..01513485 100644 --- a/context_play.py +++ b/context_play.py @@ -6,12 +6,16 @@ from __future__ import division, absolute_import, print_function, unicode_litera import os import sys -from kodi_six import xbmc, xbmcaddon +from kodi_six import xbmc, xbmcaddon, xbmcvfs ################################################################################################# +kodi_version = int(xbmc.getInfoLabel('System.BuildVersion')[:2]) __addon__ = xbmcaddon.Addon(id='plugin.video.jellyfin') -__base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'jellyfin_kodi')) +if kodi_version > 18: + __base__ = xbmcvfs.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'jellyfin_kodi')) +else: + __base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'jellyfin_kodi')) sys.path.insert(0, __base__) diff --git a/default.py b/default.py index 998ff512..06610631 100644 --- a/default.py +++ b/default.py @@ -6,12 +6,16 @@ from __future__ import division, absolute_import, print_function, unicode_litera import os import sys -from kodi_six import xbmc, xbmcaddon +from kodi_six import xbmc, xbmcaddon, xbmcvfs ################################################################################################# +kodi_version = int(xbmc.getInfoLabel('System.BuildVersion')[:2]) __addon__ = xbmcaddon.Addon(id='plugin.video.jellyfin') -__base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'jellyfin_kodi')) +if kodi_version > 18: + __base__ = xbmcvfs.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'jellyfin_kodi')) +else: + __base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'jellyfin_kodi')) sys.path.insert(0, __base__) diff --git a/service.py b/service.py index 4d0fb7b7..c0f47b84 100644 --- a/service.py +++ b/service.py @@ -7,12 +7,16 @@ import os import threading import sys -from kodi_six import xbmc, xbmcaddon +from kodi_six import xbmc, xbmcaddon, xbmcvfs ################################################################################################# +kodi_version = int(xbmc.getInfoLabel('System.BuildVersion')[:2]) __addon__ = xbmcaddon.Addon(id='plugin.video.jellyfin') -__base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'jellyfin_kodi')) +if kodi_version > 18: + __base__ = xbmcvfs.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'jellyfin_kodi')) +else: + __base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'jellyfin_kodi')) sys.path.insert(0, __base__)