Merge pull request #1423 from MoojMidge/v7.4

v7.4.2+beta.2

Author: MoojMidge

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.youtube" name="YouTube" version="7.4.2+beta.1" provider-name="anxdpanic, bromix, MoojMidge">
+<addon id="plugin.video.youtube" name="YouTube" version="7.4.2+beta.2" provider-name="anxdpanic, bromix, MoojMidge">
     <requires>
         <import addon="xbmc.python" version="3.0.0"/>
         <import addon="script.module.requests" version="2.27.1"/>

changelog.txt

@@ -1,3 +1,11 @@
+## v7.4.2+beta.2
+### Fixed
+- Ensure updated context is used in client instance when rerouting to existing provider handler methods #1418
+- Fix required ID potentially not being passed to YouTubeDataClient.(add|remove)_video_from_playlist() #1418
+
+### Changed
+- Update parsing of plugin urls for path params and ID lists #1418
+
 ## v7.4.2+beta.1
 ### Fixed
 - Skip unplayable live manifests #1377

resources/lib/youtube_plugin/kodion/abstract_provider.py

@@ -312,34 +312,38 @@ def reroute(self, context, path=None, params=None, uri=None):
                 self.log.debug('Rerouting - Fallback route not required')
                 return False, {self.FALLBACK: False}
 
-        refresh = context.refresh_requested(params=params)
+        new_context = context.clone(
+            new_path=path,
+            new_params=params,
+        )
+
+        refresh = new_context.refresh_requested()
         if (refresh or (
                 params == current_params
                 and path.rstrip('/') == current_path.rstrip('/')
         )):
             if refresh and refresh < 0:
                 del params['refresh']
             else:
-                params['refresh'] = context.refresh_requested(
+                params['refresh'] = new_context.refresh_requested(
                     force=True,
                     on=True,
-                    params=params,
                 )
         else:
             params['refresh'] = 0
 
         result = None
-        uri = context.create_uri(path, params)
+        uri = new_context.get_uri()
         if window_cache:
             function_cache = context.get_function_cache()
             with ui.on_busy():
                 result, options = function_cache.run(
                     self.navigate,
                     _refresh=True,
                     _scope=function_cache.SCOPE_NONE,
-                    context=context.clone(path, params),
+                    context=new_context,
                 )
-            if not result:
+            if not result and not isinstance(result, (tuple, list)):
                 self.log.debug(('No results', 'URI: %s'), uri)
                 return False
 

resources/lib/youtube_plugin/kodion/context/abstract_context.py

@@ -184,6 +184,11 @@ class AbstractContext(object):
     ))
     _NON_EMPTY_STRING_PARAMS = set()
 
+    _PATH_PARAMS = {
+        'channel': CHANNEL_ID,
+        'playlist': PLAYLIST_ID,
+    }
+
     def __init__(self, path='/', params=None, plugin_id=''):
         self._access_manager = None
         self._uuid = None
@@ -205,7 +210,7 @@ def __init__(self, path='/', params=None, plugin_id=''):
         self._version = 'UNKNOWN'
 
         self._param_string = ''
-        self._params = params or {}
+        self._params = {}
         if params:
             self.parse_params(params)
 
@@ -511,9 +516,8 @@ def set_path(self, *path, **kwargs):
             parts = kwargs.get('parts')
             path = unquote(path[0])
             if parts is None:
-                path = path.split('/')
                 path, parts = self.create_path(
-                    *path,
+                    *path.split('/'),
                     parts=True,
                     parser=kwargs.get('parser')
                 )
@@ -525,6 +529,8 @@ def set_path(self, *path, **kwargs):
         if kwargs.get('update_uri', True):
             self.update_uri()
 
+        return path
+
     def get_original_params(self):
         return self._param_string
 
@@ -537,19 +543,42 @@ def get_param(self, name, default=None):
     def pop_param(self, name, default=None):
         return self._params.pop(name, default)
 
-    def parse_uri(self, uri, parse_params=True, update=False):
+    @classmethod
+    def parse_path(cls, path):
+        params = {}
+        path_params = cls._PATH_PARAMS
+        path = path.rstrip('/')
+        while path:
+            param, _, next_part = path.partition('/')
+            if not next_part:
+                break
+
+            if param in path_params:
+                value = next_part.partition('/')[0]
+                if value:
+                    params[path_params[param]] = value
+
+            path = next_part
+
+        return params
+
+    def parse_uri(self, uri, parse_params=True, parse_path=True, update=False):
         uri = urlsplit(uri)
         path = uri.path
-        if parse_params:
-            params = self.parse_params(
-                dict(parse_qsl(uri.query, keep_blank_values=True)),
-                update=False,
-            )
-            if update:
-                self._params = params
-                self.set_path(path)
-        else:
-            params = uri.query
+        if not parse_params:
+            return path, uri.query
+
+        params = dict(parse_qsl(uri.query, keep_blank_values=True))
+
+        if parse_path:
+            params.update(self.parse_path(path))
+
+        params = self.parse_params(params, update=False)
+
+        if update:
+            self._params = params
+            self.set_path(path)
+
         return path, params
 
     def parse_params(self, params, update=True, parser=None):

resources/lib/youtube_plugin/kodion/context/xbmc/xbmc_context.py

@@ -34,12 +34,14 @@
     FOLDER_NAME,
     FOLDER_URI,
     PLAYLIST_ID,
+    PLAYLIST_IDS,
     PLAY_FORCE_AUDIO,
     SERVICE_IPC,
     SERVICE_RUNNING_FLAG,
     SORT,
     URI,
     VIDEO_ID,
+    VIDEO_IDS,
 )
 from ...json_store import APIKeyStore, AccessManager
 from ...player import XbmcPlaylistPlayer
@@ -477,29 +479,34 @@ def init(self):
             self._plugin_handle = -1
             return
 
+        self._param_string = ''
+        self._params = {}
+
         # first the path of the uri
-        self.set_path(
+        path = self.set_path(
             urlsplit(uri).path,
             force=True,
             parser=XbmcContextUI.get_infolabel,
             update_uri=False,
         )
+        params = self.parse_path(path)
 
         # after that try to get the params
         if num_args > 2:
-            params = to_unicode(sys.argv[2][1:])
-            self._param_string = params
-            self._params = {}
-            if params:
-                self.parse_params(
-                    dict(parse_qsl(params, keep_blank_values=True)),
-                    parser=XbmcContextUI.get_infolabel,
-                )
+            _params = to_unicode(sys.argv[2][1:])
+            if _params:
+                self._param_string = _params
+                params.update(dict(parse_qsl(_params, keep_blank_values=True)))
 
         # then Kodi resume status
         if num_args > 3 and sys.argv[3].lower() == 'resume:true':
-            self._params['resume'] = True
+            params['resume'] = True
 
+        if params:
+            self.parse_params(
+                params,
+                parser=XbmcContextUI.get_infolabel,
+            )
         self.update_uri()
 
     def get_region(self):
@@ -1120,35 +1127,24 @@ def refresh_requested(self, force=False, on=False, off=False, params=None):
     def parse_item_ids(self,
                        uri='',
                        from_listitem=True,
-                       _ids={'video': VIDEO_ID,
-                             'channel': CHANNEL_ID,
-                             'playlist': PLAYLIST_ID}):
-        item_ids = {}
+                       _ids=(VIDEO_ID,
+                             VIDEO_IDS,
+                             CHANNEL_ID,
+                             # CHANNEL_IDS,  # not currently supported
+                             PLAYLIST_ID,
+                             PLAYLIST_IDS)):
         if not uri and from_listitem:
             uri = XbmcContextUI.get_listitem_info(URI)
         if not uri or not self.is_plugin_path(uri):
-            return item_ids
-        uri = urlsplit(uri)
+            return {}
 
-        path = uri.path.rstrip('/')
-        while path:
-            id_type, _, next_part = path.partition('/')
-            if not next_part:
-                break
-
-            if id_type in _ids:
-                id_value = next_part.partition('/')[0]
-                if id_value:
-                    item_ids[_ids[id_type]] = id_value
-
-            path = next_part
-
-        params = dict(parse_qsl(uri.query))
-        for name in _ids.values():
-            id_value = params.get(name)
-            if not id_value and from_listitem:
-                id_value = XbmcContextUI.get_listitem_property(name)
-            if id_value:
-                item_ids[name] = id_value
+        uri = urlsplit(uri)
+        item_ids = self.parse_path(uri.path)
+        _params = dict(parse_qsl(uri.query))
+        _prop = XbmcContextUI.get_listitem_property if from_listitem else False
+        for name in _ids:
+            value = _params.get(name) or _prop and _prop(name)
+            if value:
+                item_ids[name] = value
 
         return item_ids

resources/lib/youtube_plugin/kodion/monitors/player_monitor.py

@@ -291,7 +291,8 @@ def run(self):
                         command='remove',
                         category='video',
                         playlist_id=watch_later_id,
-                        video_id=playlist_item_id,
+                        video_id=video_id,
+                        playlist_item_id=playlist_item_id,
                         video_name='',
                         confirmed=True,
                     )

resources/lib/youtube_plugin/kodion/network/requests.py

@@ -218,6 +218,9 @@ def init(cls,
     def reinit(self, **kwargs):
         self.__init__(**kwargs)
 
+    def context_changed(self, context):
+        return self._context != context
+
     def __enter__(self):
         return self
 

resources/lib/youtube_plugin/youtube/provider.py

@@ -222,7 +222,7 @@ def get_client(self, context, refresh=False):
             _,
         ) = access_manager.get_access_tokens(dev_id)
 
-        if client:
+        if client and not client.context_changed(context):
             if api_last_origin != origin:
                 access_manager.set_last_origin(origin)
                 self.log.info(('API key origin changed - Resetting client',