Merge pull request #1414 from MoojMidge/v7.4

v7.4.1.1

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.1" provider-name="anxdpanic, bromix, MoojMidge">
+<addon id="plugin.video.youtube" name="YouTube" version="7.4.1.1" 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,7 @@
+## v7.4.1.1
+### Fixed
+- Address possible race condition resulting in KeyError exception when calling pop() on an empty set
+
 ## v7.4.1
 ### Fixed
 - Fix unnecessary double resolve on playback #1371

resources/lib/youtube_plugin/youtube/client/data_client.py

@@ -2392,8 +2392,7 @@ def _get_cached_feed(output,
             else:
                 channel_prefix = False
 
-            batch = inputs.copy()
-            for item_id in batch:
+            for item_id in inputs:
                 if channel_prefix:
                     channel_id = item_id
                     item_id = item_id.replace('UC', channel_prefix, 1)
@@ -2419,7 +2418,6 @@ def _get_cached_feed(output,
                 else:
                     to_refresh.add(channel_id)
 
-            inputs -= batch
             return True, False
 
         def _get_feed(output,
@@ -2642,11 +2640,18 @@ def _threaded_fetch(kwargs,
                     _kwargs = {}
                 elif kwargs:
                     if do_batch:
-                        _kwargs = {'inputs': kwargs}
-                    elif unpack:
-                        _kwargs = {'input': kwargs.pop()}
+                        batch = kwargs.copy()
+                        kwargs -= batch
+                        _kwargs = {'inputs': batch}
                     else:
-                        _kwargs = kwargs.pop()
+                        try:
+                            _kwargs = kwargs.pop()
+                        except KeyError:
+                            if check_inputs:
+                                check_inputs.clear()
+                            break
+                        if unpack:
+                            _kwargs = {'input': _kwargs}
                 elif check_inputs:
                     if check_inputs.wait(0.1) and kwargs:
                         continue