diff --git a/contextmenu.py b/contextmenu.py index a7837684..6de457be 100644 --- a/contextmenu.py +++ b/contextmenu.py @@ -10,13 +10,25 @@ import xbmc import xbmcaddon import xbmcgui -import utils -addon_ = xbmcaddon.Addon(id='plugin.video.plexkodiconnect') -addon_path = utils.tryDecode(addon_.getAddonInfo('path')) -base_resource = utils.tryDecode(xbmc.translatePath(os.path.join(addon_path, 'resources', 'lib'))) +_addon = xbmcaddon.Addon(id='plugin.video.plexkodiconnect') +try: + addon_path = _addon.getAddonInfo('path').decode('utf-8') +except TypeError: + addon_path = _addon.getAddonInfo('path').decode() +try: + base_resource = xbmc.translatePath(os.path.join( + addon_path, + 'resources', + 'lib')).decode('utf-8') +except TypeError: + base_resource = xbmc.translatePath(os.path.join( + addon_path, + 'resources', + 'lib')).decode() sys.path.append(base_resource) +import utils import artwork import clientinfo import downloadutils diff --git a/default.py b/default.py index 65949e78..09595054 100644 --- a/default.py +++ b/default.py @@ -10,18 +10,30 @@ import xbmc import xbmcaddon import xbmcgui -import utils ############################################################################### -addon_ = xbmcaddon.Addon(id='plugin.video.plexkodiconnect') -addon_path = utils.tryDecode(addon_.getAddonInfo('path')) -base_resource = utils.tryDecode(xbmc.translatePath(os.path.join(addon_path, 'resources', 'lib'))) +_addon = xbmcaddon.Addon(id='plugin.video.plexkodiconnect') +try: + addon_path = _addon.getAddonInfo('path').decode('utf-8') +except TypeError: + addon_path = _addon.getAddonInfo('path').decode() +try: + base_resource = xbmc.translatePath(os.path.join( + addon_path, + 'resources', + 'lib')).decode('utf-8') +except TypeError: + base_resource = xbmc.translatePath(os.path.join( + addon_path, + 'resources', + 'lib')).decode() sys.path.append(base_resource) ############################################################################### import entrypoint +import utils ############################################################################### diff --git a/service.py b/service.py index 74ee7f98..85577a8b 100644 --- a/service.py +++ b/service.py @@ -11,19 +11,29 @@ import xbmc import xbmcaddon import xbmcgui -import utils ############################################################################### _addon = xbmcaddon.Addon(id='plugin.video.plexkodiconnect') -addon_path = utils.tryDecode(_addon.getAddonInfo('path')) -base_resource = utils.tryDecode(xbmc.translatePath(os.path.join( - addon_path, - 'resources', - 'lib'))) +try: + addon_path = _addon.getAddonInfo('path').decode('utf-8') +except TypeError: + addon_path = _addon.getAddonInfo('path').decode() +try: + base_resource = xbmc.translatePath(os.path.join( + addon_path, + 'resources', + 'lib')).decode('utf-8') +except TypeError: + base_resource = xbmc.translatePath(os.path.join( + addon_path, + 'resources', + 'lib')).decode() + sys.path.append(base_resource) ############################################################################### +import utils import userclient import clientinfo import initialsetup