From 832683327b6b5d85e5738e71c6a77871b9e82931 Mon Sep 17 00:00:00 2001 From: Croneter Date: Sat, 19 Dec 2020 21:11:04 +0100 Subject: [PATCH 1/7] Update add-on metadata for Python 3 and Kodi 19 Matrix --- addon.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addon.xml b/addon.xml index 52ccff1..5eec080 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ - + - + From 569f90165351f69365e1fd74a068be0683b60f2e Mon Sep 17 00:00:00 2001 From: Croneter Date: Sat, 19 Dec 2020 21:11:19 +0100 Subject: [PATCH 2/7] Compatibility for Python 3 --- default.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/default.py b/default.py index b9f224a..d54b458 100644 --- a/default.py +++ b/default.py @@ -2,7 +2,6 @@ # We need this in order to use add-on paths like # 'plugin://plugin.video.plexkodiconnect.MOVIES' in the Kodi video database ############################################################################### -from __future__ import absolute_import, division, unicode_literals from logging import getLogger import sys import os @@ -14,12 +13,11 @@ # Import from the main pkc add-on __addon__ = xbmcaddon.Addon(id='plugin.video.plexkodiconnect') -__temp_path__ = os.path.join(__addon__.getAddonInfo('path').decode('utf-8'), 'resources', 'lib') -__base__ = xbmc.translatePath(__temp_path__.encode('utf-8')).decode('utf-8') +__temp_path__ = os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib') +__base__ = xbmc.translatePath(__temp_path__.encode('utf-8')) sys.path.append(__base__) import transfer, loghandler -from tools import unicode_paths ############################################################################### loghandler.config() @@ -41,12 +39,12 @@ def play(): xbmcplugin.setResolvedUrl(HANDLE, False, xbmcgui.ListItem()) return else: - request = '%s&handle=%s' % (unicode_paths.decode(sys.argv[2]), HANDLE) - if b'resume:true' in sys.argv: + request = f'{sys.argv[2]}&handle={HANDLE}' + if 'resume:true' in sys.argv: request += '&resume=1' - elif b'resume:false' in sys.argv: + elif 'resume:false' in sys.argv: request += '&resume=0' - transfer.plex_command('PLAY-%s' % request) + transfer.plex_command(f'PLAY-{request}') if HANDLE == -1: # Handle -1 received, not waiting for main thread return From 1d5556476475d1558b71a06a4de7ecc7408c870f Mon Sep 17 00:00:00 2001 From: quietvoid <39477805+quietvoid@users.noreply.github.com> Date: Thu, 29 Apr 2021 22:14:29 -0400 Subject: [PATCH 3/7] Use xbmcvfs for translatePath --- addon.xml | 2 +- default.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addon.xml b/addon.xml index 5eec080..eb77982 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/default.py b/default.py index d54b458..a24db3e 100644 --- a/default.py +++ b/default.py @@ -6,7 +6,7 @@ import sys import os -import xbmc +import xbmcvfs import xbmcgui import xbmcplugin import xbmcaddon @@ -14,7 +14,7 @@ # Import from the main pkc add-on __addon__ = xbmcaddon.Addon(id='plugin.video.plexkodiconnect') __temp_path__ = os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib') -__base__ = xbmc.translatePath(__temp_path__.encode('utf-8')) +__base__ = xbmcvfs.translatePath(__temp_path__.encode('utf-8')) sys.path.append(__base__) import transfer, loghandler From 4ce9124e7de67addd9a342f267dd208ec3b3c6bd Mon Sep 17 00:00:00 2001 From: Croneter Date: Sat, 5 Jun 2021 15:21:49 +0200 Subject: [PATCH 4/7] Revert version bump --- addon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon.xml b/addon.xml index eb77982..5eec080 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + From d907470ef2e8385a6649c7d0677cf73720c9d65d Mon Sep 17 00:00:00 2001 From: Croneter Date: Sat, 5 Jun 2021 15:24:06 +0200 Subject: [PATCH 5/7] Version bump 3.0.1 --- addon.xml | 10 ++++++++-- changelog.txt | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/addon.xml b/addon.xml index 5eec080..8d787dc 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,13 @@ https://github.com/croneter/PlexKodiConnect - version 2.1.3 + version 3.0.1 +- Make PKC compatible with Kodi 20 N* by using xbmcvfs for translatePath + +version 3.0.0 +- Initial version for Kodi 19 Matrix using Python 3 + +version 2.1.3 - Fix UnicodeWarning: Unicode equal comparison failed to convert both arguments to Unicode - interpreting them as being unequal version 2.1.2 diff --git a/changelog.txt b/changelog.txt index c164759..b3ec236 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +version 3.0.1 +- Make PKC compatible with Kodi 20 N* by using xbmcvfs for translatePath + +version 3.0.0 +- Initial version for Kodi 19 Matrix using Python 3 + version 2.1.3 - Fix UnicodeWarning: Unicode equal comparison failed to convert both arguments to Unicode - interpreting them as being unequal From d9743457d08d2f2379343ed3a1c441a00ab9b20e Mon Sep 17 00:00:00 2001 From: croneter Date: Sun, 5 Dec 2021 14:31:37 +0100 Subject: [PATCH 6/7] Use addon.xml `reuselanguageinvoker` to turn add-on snappier --- addon.xml | 2 ++ default.py | 15 +++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/addon.xml b/addon.xml index 8d787dc..a0e5b6b 100644 --- a/addon.xml +++ b/addon.xml @@ -7,6 +7,8 @@ + + true PKC Dependency Add-On PlexKodiConnect add-on for tv shows all diff --git a/default.py b/default.py index a24db3e..77830ae 100644 --- a/default.py +++ b/default.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # We need this in order to use add-on paths like # 'plugin://plugin.video.plexkodiconnect.MOVIES' in the Kodi video database -############################################################################### from logging import getLogger import sys import os @@ -19,12 +18,8 @@ import transfer, loghandler -############################################################################### loghandler.config() LOG = getLogger('PLEX.TVSHOWS') -############################################################################### - -HANDLE = int(sys.argv[1]) def play(): @@ -36,26 +31,26 @@ def play(): if not sys.argv[2]: # Browsing to a tv show from a tv show info dialog - picked up # by kodimonitor.py and its method OnAdd - xbmcplugin.setResolvedUrl(HANDLE, False, xbmcgui.ListItem()) + xbmcplugin.setResolvedUrl(int(sys.argv[1]), False, xbmcgui.ListItem()) return else: - request = f'{sys.argv[2]}&handle={HANDLE}' + request = f'{sys.argv[2]}&handle={int(sys.argv[1])}' if 'resume:true' in sys.argv: request += '&resume=1' elif 'resume:false' in sys.argv: request += '&resume=0' transfer.plex_command(f'PLAY-{request}') - if HANDLE == -1: + if int(sys.argv[1]) == -1: # Handle -1 received, not waiting for main thread return # Wait for the result result = transfer.wait_for_transfer(source='main') if result is True: - xbmcplugin.setResolvedUrl(HANDLE, False, xbmcgui.ListItem()) + xbmcplugin.setResolvedUrl(int(sys.argv[1]), False, xbmcgui.ListItem()) # Tell main thread that we're done transfer.send(True, target='main') else: - xbmcplugin.setResolvedUrl(HANDLE, True, result) + xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, result) if __name__ == '__main__': From db2b3634a5f43f0b49e388884ac7caa969dbd141 Mon Sep 17 00:00:00 2001 From: croneter Date: Sun, 5 Dec 2021 14:34:34 +0100 Subject: [PATCH 7/7] Version bump 3.0.2 --- addon.xml | 7 +++++-- changelog.txt | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/addon.xml b/addon.xml index 8d787dc..16c26ae 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,10 @@ https://github.com/croneter/PlexKodiConnect - version 3.0.1 + version 3.0.2 +- Use addon.xml `reuselanguageinvoker` to turn add-on snappier + +version 3.0.1 - Make PKC compatible with Kodi 20 N* by using xbmcvfs for translatePath version 3.0.0 diff --git a/changelog.txt b/changelog.txt index b3ec236..41be0ce 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +version 3.0.2 +- Use addon.xml `reuselanguageinvoker` to turn add-on snappier + version 3.0.1 - Make PKC compatible with Kodi 20 N* by using xbmcvfs for translatePath