Merge pull request #1413 from MoojMidge/nexus-unofficial

Nexus unofficial v7.4.1.1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -51,7 +51,11 @@ Please provide detailed steps for reproducing the issue.
 
 ### Log
 
-Please include a complete [debug log](https://kodi.wiki/view/Log_file).
+Nothing can or will be done about your issue report without a complete **debug** log.
+
+It is not enough to include an excerpt of the ordinary Kodi event log.
+
+Details on how a debug log can be produced are available on the Kodi Wiki: https://kodi.wiki/view/Log_file.
 
 
 

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/language/resource.language.zh_cn/strings.po

@@ -5,17 +5,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XBMC-Addons\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"Report-Msgid-Bugs-To: translations@kodi.tv\n"
 "POT-Creation-Date: 2015-09-21 11:01+0000\n"
-"PO-Revision-Date: 2026-01-24 03:13+0000\n"
-"Last-Translator: wabisabi926 <liwenliang926@163.com>\n"
+"PO-Revision-Date: 2026-03-02 08:13+0000\n"
+"Last-Translator: wabisabi926 <wabisabi926@foxmail.com>\n"
 "Language-Team: Chinese (Simplified Han script) <https://kodi.weblate.cloud/projects/kodi-add-ons-video/plugin-video-youtube/zh_Hans/>\n"
 "Language: zh_cn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 5.16.1\n"
 
 msgctxt "Addon Summary"
 msgid "Plugin for YouTube"
@@ -1585,19 +1585,19 @@ msgstr "播客"
 
 msgctxt "#30821"
 msgid "Auto-like watched videos"
-msgstr ""
+msgstr "自动点赞已观看视频"
 
 msgctxt "#30822"
 msgid "Channel filtering"
-msgstr ""
+msgstr "频道过滤"
 
 msgctxt "#30823"
 msgid "Disable filtering to auto-like all videos. Enable filtering to auto-like videos only from specific channels. Enable blacklist to auto-like all videos except from specific channels."
-msgstr ""
+msgstr "关闭过滤：自动点赞所有视频。开启过滤：仅自动点赞指定频道的视频。开启黑名单：自动点赞除指定频道外的所有视频。"
 
 msgctxt "#30824"
 msgid "Filter by channel names separated by a comma eg. 'The Best Channel,The 2nd Best Channel'"
-msgstr ""
+msgstr "按频道名称过滤，使用英文逗号分隔，例如：“优质频道，第二频道”"
 
 #~ msgctxt "#30511"
 #~ msgid "Queue video"

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

@@ -2392,8 +2392,7 @@ class YouTubeDataClient(YouTubeLoginClient):
             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 @@ class YouTubeDataClient(YouTubeLoginClient):
                 else:
                     to_refresh.add(channel_id)
 
-            inputs -= batch
             return True, False
 
         def _get_feed(output,
@@ -2642,11 +2640,18 @@ class YouTubeDataClient(YouTubeLoginClient):
                     _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