kdk 3.2.0__tar.gz → 3.3.1__tar.gz

{kdk-3.2.0/src/kdk.egg-info → kdk-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kdk
-Version: 3.2.0
+Version: 3.3.1
 Summary: Kodi skin validation tool - CLI and GUI
 Author-email: MikeSiLVO <mikesilvo164@gmail.com>
 License-Expression: GPL-3.0-or-later
@@ -54,7 +54,7 @@ contain the same code; the GUI build runs without a console window, so
 double-clicking it doesn't open a terminal. No Python install needed.
 
 Download them from the [Releases page](https://github.com/MikeSiLVO/kdk/releases).
-`<version>` is the release tag, such as `v3.2.0`:
+`<version>` is the release tag, such as `v3.3.1`:
 
 - **Windows (x86_64)**: `kdk-gui-<version>-windows-x86_64.exe` and
   `kdk-cli-<version>-windows-x86_64.exe`.
@@ -196,7 +196,7 @@ still points at the right file.
 Run it on `ubuntu-latest`. Windows runners check text files out with CRLF line
 endings, which File Integrity reports as errors.
 
-## Silencing a finding
+## Muting a finding
 
 An XML comment mutes warnings the skin has already judged, the way a
 `# type: ignore` does in Python. `kdk-ignore-file` covers the whole file it sits

{kdk-3.2.0 → kdk-3.3.1}/README.md

@@ -15,7 +15,7 @@ contain the same code; the GUI build runs without a console window, so
 double-clicking it doesn't open a terminal. No Python install needed.
 
 Download them from the [Releases page](https://github.com/MikeSiLVO/kdk/releases).
-`<version>` is the release tag, such as `v3.2.0`:
+`<version>` is the release tag, such as `v3.3.1`:
 
 - **Windows (x86_64)**: `kdk-gui-<version>-windows-x86_64.exe` and
   `kdk-cli-<version>-windows-x86_64.exe`.
@@ -157,7 +157,7 @@ still points at the right file.
 Run it on `ubuntu-latest`. Windows runners check text files out with CRLF line
 endings, which File Integrity reports as errors.
 
-## Silencing a finding
+## Muting a finding
 
 An XML comment mutes warnings the skin has already judged, the way a
 `# type: ignore` does in Python. `kdk-ignore-file` covers the whole file it sits

{kdk-3.2.0 → kdk-3.3.1}/src/kdk/__init__.py

@@ -1,3 +1,3 @@
 """KDK - Kodi skin validation tool."""
 
-__version__ = "3.2.0"
+__version__ = "3.3.1"

{kdk-3.2.0 → kdk-3.3.1}/src/kdk/data/kodi/piers/strings.po

@@ -9537,7 +9537,13 @@ msgctxt "#16297"
 msgid "Smooth"
 msgstr ""
 
-#empty strings from id 16298 to 16299
+#. Name of the video filter category that holds the filters without a shader
+#: xbmc/games/dialogs/osd/DialogGameVideoFilter.cpp
+msgctxt "#16298"
+msgid "Built-in"
+msgstr ""
+
+#empty string with id 16299
 
 #: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16300"
@@ -19635,7 +19641,13 @@ msgctxt "#35309"
 msgid "Rewind"
 msgstr ""
 
-#empty strings from id 35310 to 35319
+#. Label of the Manual button in the game OSD, which shows the game's instruction booklet
+#: addons/skin.estuary/xml/GameOSD.xml
+msgctxt "#35310"
+msgid "Manual"
+msgstr ""
+
+#empty strings from id 35311 to 35319
 
 #. Label of the Cheats button in the game OSD, heading of the cheats dialog, and
 #. of the cheats group in settings
@@ -20002,7 +20014,55 @@ msgctxt "#35703"
 msgid "Hardcore mode: {0:d} of {1:d} achievements unlocked"
 msgstr ""
 
-#empty strings from id 35704 to 35999
+#empty strings from id 35704 to 35709
+
+#. Marks a locked achievement that can be missed for good
+#: addons/skin.estuary/xml/Includes_Games.xml
+msgctxt "#35710"
+msgid "Missable"
+msgstr ""
+
+#. Button that picks which of a game's achievement sets is shown
+#: addons/skin.estuary/xml/Includes_Games.xml
+msgctxt "#35711"
+msgid "Achievement set"
+msgstr ""
+
+#. An achievement set whose progression and win achievements are all earned
+#: xbmc/games/addons/cheevos/GameClientCheevos.cpp
+#: xbmc/games/dialogs/osd/DialogGameAchievements.cpp
+msgctxt "#35712"
+msgid "Beaten"
+msgstr ""
+
+#. How close an achievement set is to being beaten, {0:d} earned of {1:d} needed
+#: xbmc/games/dialogs/osd/DialogGameAchievements.cpp
+#, c++-format
+msgctxt "#35713"
+msgid "{0:d} of {1:d} to beat"
+msgstr ""
+
+#. An achievement set the player turned off
+#: xbmc/games/dialogs/osd/DialogGameAchievements.cpp
+msgctxt "#35714"
+msgid "Turned off"
+msgstr ""
+
+#. The game's own achievement set, as opposed to its subsets
+#: xbmc/games/dialogs/osd/DialogGameAchievements.cpp
+msgctxt "#35715"
+msgid "Main Set"
+msgstr ""
+
+#empty strings from id 35716 to 35717
+
+#. Marks an achievement being attempted in the list of a game's achievements
+#: addons/skin.estuary/xml/Includes_Games.xml
+msgctxt "#35718"
+msgid "Attempt active"
+msgstr ""
+
+#empty strings from id 35719 to 35999
 
 #: xbmc/peripherals/devices/PeripheralCecAdapter.cpp
 msgctxt "#36000"
@@ -20217,6 +20277,7 @@ msgstr ""
 #: xbmc/video/VideoItemArtworkHandler.cpp
 #: xbmc/video/dialogs/GUIDialogVideoInfo.cpp
 #: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+#: xbmc/video/dialogs/GUIDialogSubtitleSettings.cpp
 msgctxt "#36041"
 msgid "* Item folder"
 msgstr ""

{kdk-3.2.0 → kdk-3.3.1}/src/kdk/libs/skin/skin.py

@@ -7,6 +7,7 @@ import re
 import time
 from pathlib import Path
 
+from ..utils.expressions import resolve_params_in_text
 from ..utils.files import check_paths, is_inside
 from ..utils.infobool import condition_states
 from ..utils.xml import get_params, get_root_from_file
@@ -30,6 +31,35 @@ def _same_definition(a, b):
     return b is not None and (a.text or "").strip() == (b.text or "").strip() and dict(a.attrib) == dict(b.attrib)
 
 
+_PARAM_REF = re.compile(r"\$PARAM\[([^,\]]+)")
+
+
+def _param_uses(include_node):
+    """Yield (param, use) per $PARAM in the spliced body; forwards flag a bare $PARAM value."""
+    definition = include_node.find("definition")
+    body = definition if definition is not None else include_node
+    for node in body.iterdescendants():
+        if not isinstance(node.tag, str):
+            continue
+        parent = node.getparent()
+        target = parent.get("content", "") if parent.tag == "include" else ""
+        forward = node.get("name") if node.tag == "param" and target and "$" not in target else None
+        texts = [(None, node.text or "")]
+        texts += [(a, v) for a, v in node.attrib.items() if not a.startswith("_kdk_")]
+        for attr, value in texts:
+            if "$PARAM[" not in value:
+                continue
+            if forward and attr in (None, "value"):
+                use = ("forward", target, forward,
+                       resolve_params_in_text(value)[1] == "SINGLE_UNDEFINED")
+            elif attr is None:
+                use = ("tag", node.tag)
+            else:
+                use = ("attr", attr)
+            for match in _PARAM_REF.finditer(value):
+                yield match.group(1).strip(), use
+
+
 class Skin(Addon):
     """A Kodi skin: includes, colors, fonts, and resolved windows."""
 
@@ -109,9 +139,8 @@ class Skin(Addon):
         return self._resource_loader
 
     def _build_include_param_roles(self):
-        """Role of each $PARAM per include body: tag, attribute, forward to a nested call, multi."""
+        """Build each include body's $PARAM roles: tag, attribute, forward to nested call, multi."""
         result = {}
-        param_re = re.compile(r"\$PARAM\[([^,\]]+)")
 
         def mark(roles, pname, new_role):
             existing = roles.get(pname)
@@ -122,38 +151,12 @@ class Skin(Addon):
             else:
                 roles[pname] = "multi"
 
-        def role_for(node):
-            parent = node.getparent() if hasattr(node, "getparent") else None
-            if (node.tag == "param" and parent is not None
-                    and parent.tag == "include" and parent.get("content")):
-                target_inc = parent.get("content")
-                target_param = node.get("name") or ""
-                if target_inc and target_param:
-                    return ("forward", target_inc, target_param)
-            return None
-
         for folder, includes_for_folder in self.include_map.items():
             folder_result = {}
             for inc_name, (inc_node, _defaults, _file) in includes_for_folder.items():
                 roles: dict = {}
-                for node in inc_node.iter():
-                    if node is inc_node:
-                        continue
-                    parent = node.getparent() if hasattr(node, "getparent") else None
-                    if (node.tag == "param" and parent is inc_node):
-                        continue
-                    text = (node.text or "")
-                    if "$PARAM[" in text:
-                        forward_role = role_for(node)
-                        for match in param_re.finditer(text):
-                            pname = match.group(1).strip()
-                            mark(roles, pname, forward_role or ("tag", node.tag))
-                    for attr_name, attr_value in node.attrib.items():
-                        if attr_name.startswith("_kdk_") or "$PARAM[" not in attr_value:
-                            continue
-                        for match in param_re.finditer(attr_value):
-                            pname = match.group(1).strip()
-                            mark(roles, pname, ("attr", attr_name))
+                for pname, use in _param_uses(inc_node):
+                    mark(roles, pname, use[:3])
                 if roles:
                     folder_result[inc_name] = roles
             if folder_result:
@@ -189,6 +192,52 @@ class Skin(Addon):
 
         return role
 
+    def include_params(self, folder, include_name):
+        """Each param the include declares or uses, as (name, default, used directly, forwards)."""
+        entry = self.include_map.get(folder, {}).get(include_name)
+        if entry is None:
+            return []
+        node, defaults, _file = entry
+        uses: dict[str, list] = {}
+        for param, use in _param_uses(node):
+            uses.setdefault(param, []).append(use)
+        for param in defaults:
+            uses.setdefault(param, [])
+        rows = []
+        for param, found in uses.items():
+            default = defaults.get(param)
+            forwards = []
+            for use in found:
+                if use[0] != "forward":
+                    continue
+                _, target, target_param, alone = use
+                # what the target gets when a call leaves the param out; a default passes itself
+                value = None
+                if default is None and alone:
+                    value = self._omitted_value(folder, target, target_param, {(include_name, param)})
+                if (target, target_param, value) not in forwards:
+                    forwards.append((target, target_param, value))
+            direct = any(use[0] != "forward" for use in found)
+            rows.append((param, default, direct, forwards))
+        return rows
+
+    def _omitted_value(self, folder, include_name, param, seen):
+        """Value a param takes when a call omits it; None unless one default reaches every use."""
+        entry = self.include_map.get(folder, {}).get(include_name)
+        if entry is None or (include_name, param) in seen:
+            return None
+        node, defaults, _file = entry
+        if param in defaults:
+            return defaults[param]
+        values = set()
+        for found, use in _param_uses(node):
+            if found != param:
+                continue
+            if use[0] != "forward" or not use[3]:
+                return None
+            values.add(self._omitted_value(folder, use[1], use[2], seen | {(include_name, param)}))
+        return values.pop() if len(values) == 1 else None
+
     def _load_colors_and_fonts(self):
         """Load colors and fonts through the resource reader, dropping the validation index."""
         from ..coredata import kodi_colors_xml

{kdk-3.2.0 → kdk-3.3.1}/src/kdk/libs/validation/urls.py

@@ -11,7 +11,7 @@ _VALUE_KEY = re.compile(r'(?:%22|")value(?:%22|")\s*(?:%3A|:)', re.IGNORECASE)
 _VALUE_END = re.compile(r'%5D|%7D|[\]}]', re.IGNORECASE)
 _EXPRESSION = re.compile(r'\$(ESC)?(INFO|VAR)\[')
 _PLUGIN_QUERY = re.compile(r'plugin://[^\s"\'?]*\?', re.IGNORECASE)
-_URL_END = re.compile(r'[\s"\',)]')
+_URL_END = re.compile(r'["\',)]')
 # an '&' that starts no key=value pair, or a '|', inside a value
 _DATA_SEPARATOR = re.compile(r'&(?![\w.-]+=)|\|')
 # the key of the last pair a text opens, as in ?key= or &key=
@@ -23,6 +23,10 @@ _ENCODER = re.compile(r'get_encoded_string\b.*?\bwindow_prop=([^&"\s,)]+)', re.I
 _PROPERTY = re.compile(r'window(?:\([^)]*\))?\.property\((.+)\)$', re.IGNORECASE)
 _SKIN_STRING = re.compile(r'skin\.string\((.+)\)$', re.IGNORECASE)
 _ITEM_PROPERTY = re.compile(r'container\((\d+)\)\.listitem\w*(?:\([^)]*\))?\.property\((.+)\)$', re.IGNORECASE)
+_ITEM_LABEL = re.compile(r'container\((\d+)\)\.listitem\w*(?:\([^)]*\))?\.label$', re.IGNORECASE)
+# script.skinvariables fills a list with one item per && path, its label URL-encoded
+_ENCODER_LIST = re.compile(r'\binfo=get_encoded_string\b', re.IGNORECASE)
+_ONLY_VAR = re.compile(r'\s*\$VAR\[([^\]]+)\]\s*$')
 # an edit control's text as typed; no other control answers Index(1)
 _TYPED = re.compile(r'control\.getlabel\(\s*\d+\s*\)\.index\(\s*1\s*\)$', re.IGNORECASE)
 # characters a URL query or a JSON string cannot carry unencoded
@@ -47,7 +51,7 @@ def _plain(name):
 
 
 def _url_end(text, pos):
-    """Index where the URL starting before the position ends: a space, quote, comma or ')'."""
+    """Index where the URL starting before the position ends: a quote, comma or ')'."""
     found = _URL_END.search(text, pos)
     return found.start() if found else len(text)
 
@@ -58,7 +62,7 @@ def _worst(kinds):
 
 
 def value_sources(paths):
-    """Each value the skin stores per property, skin string and static item property, by name."""
+    """Each value the skin stores per property, skin string, static item property and list id."""
     sources = {}
     for path in paths:
         root = get_root_from_file(path)
@@ -72,6 +76,11 @@ def value_sources(paths):
                 if control is not None and (control.get("id") or "").isdigit():
                     key = f"item:{control.get('id')}:{element.get('name').casefold()}"
                     sources.setdefault(key, []).append(element.text or "")
+            parent = element.getparent()
+            if element.tag == "content" and parent is not None and parent.tag == "control":
+                control_id = parent.get("id") or ""
+                if control_id.isdigit():
+                    sources.setdefault(f"content:{control_id}", []).append((element.text or "").strip())
             for text in [element.text or ""] + list(element.attrib.values()):
                 for name, args in builtin_calls(text, ("SetProperty", "Skin.SetString")):
                     if not args or "$" in args[0]:
@@ -171,8 +180,25 @@ class UrlValues:
             return SAFE if _plain(found.group(1)) else UNTRACED
         if _TYPED.search(info):
             return TYPED
+        found = _ITEM_LABEL.search(info)
+        if found and self._encoder_list(found.group(1)):
+            return SAFE
         return SAFE if _plain(info.rsplit(".", 1)[-1]) else RAW
 
+    def _encoder_list(self, control_id):
+        """True when lists with the id exist and the encoder fills each one."""
+        paths = self.sources.get(f"content:{control_id}")
+        return bool(paths) and all(self._encoder_path(path, frozenset()) for path in paths)
+
+    def _encoder_path(self, text, seen):
+        """True when a list path calls the encoder, or is only a $VAR whose every value does."""
+        if _ENCODER_LIST.search(text):
+            return True
+        found = _ONLY_VAR.match(text)
+        name = found.group(1).strip() if found else ""
+        values = self.variables.get(name) if name not in seen else None
+        return bool(values) and all(self._encoder_path(value, seen | {name}) for value in values)
+
     def _stored_kind(self, key, seen):
         """Kind of a property, skin string or static item property, from every value it holds."""
         if key in seen:

{kdk-3.2.0 → kdk-3.3.1/src/kdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kdk
-Version: 3.2.0
+Version: 3.3.1
 Summary: Kodi skin validation tool - CLI and GUI
 Author-email: MikeSiLVO <mikesilvo164@gmail.com>
 License-Expression: GPL-3.0-or-later
@@ -54,7 +54,7 @@ contain the same code; the GUI build runs without a console window, so
 double-clicking it doesn't open a terminal. No Python install needed.
 
 Download them from the [Releases page](https://github.com/MikeSiLVO/kdk/releases).
-`<version>` is the release tag, such as `v3.2.0`:
+`<version>` is the release tag, such as `v3.3.1`:
 
 - **Windows (x86_64)**: `kdk-gui-<version>-windows-x86_64.exe` and
   `kdk-cli-<version>-windows-x86_64.exe`.
@@ -196,7 +196,7 @@ still points at the right file.
 Run it on `ubuntu-latest`. Windows runners check text files out with CRLF line
 endings, which File Integrity reports as errors.
 
-## Silencing a finding
+## Muting a finding
 
 An XML comment mutes warnings the skin has already judged, the way a
 `# type: ignore` does in Python. `kdk-ignore-file` covers the whole file it sits

{kdk-3.2.0 → kdk-3.3.1}/tests/test_urls.py

@@ -16,11 +16,35 @@ PATH = "videodb://movies/titles/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22fi
        "%22operator%22%3A%22is%22%2C%22value%22%3A{value}%7D%5D%7D%2C%22type%22%3A%22movies%22%7D"
 
 
+ENCODER = ("plugin://script.skinvariables/?info=get_encoded_string&unencoded_paths=true"
+           "&&$INFO[ListItem.Label]&&$INFO[ListItem.Title]")
+
+
 def path(value, field="title"):
     """An xsp path with a single "is" rule, percent-encoded as skins write it."""
     return PATH.format(field=field, value=value)
 
 
+def url_rows(home, includes="<includes/>"):
+    """The xsp and plugin URL rows a one-window skin with that Home.xml and Includes.xml gives."""
+    files = {
+        "addon.xml": '<addon id="skin.t" version="1.0.0"><requires><import addon="xbmc.gui" '
+                     'version="5.17.0"/></requires><extension point="xbmc.gui.skin">'
+                     '<res folder="16x9" default="true"/></extension></addon>',
+        "16x9/Includes.xml": includes,
+        "16x9/Home.xml": home,
+    }
+    with tempfile.TemporaryDirectory() as skin:
+        for rel, text in files.items():
+            os.makedirs(os.path.dirname(os.path.join(skin, rel)), exist_ok=True)
+            with open(os.path.join(skin, rel), "w", encoding="utf-8") as f:
+                f.write(text)
+        provider = InfoProvider()
+        provider.settings = {}
+        provider.init_addon(skin)
+        return [r for r in provider.check_values() if r.get("rule", "").startswith(("xml.xsp", "xml.plugin"))]
+
+
 class TestUrlValues(unittest.TestCase):
     """Sorting of each runtime value in a rule's value list into raw, untraced or safe."""
 
@@ -78,7 +102,17 @@ class TestUrlValues(unittest.TestCase):
                 f.write('<window><controls><control type="list" id="9110"><content>'
                         '<item><label>a</label><property name="Dir">$INFO[ListItem.Director]</property></item>'
                         '</content></control></controls></window>')
-            self.assertEqual(value_sources([path]), {"item:9110:dir": ["$INFO[ListItem.Director]"]})
+            self.assertEqual(value_sources([path]), {"item:9110:dir": ["$INFO[ListItem.Director]"], "content:9110": [""]})
+
+    def test_scan_reads_each_list_path_by_id(self):
+        with tempfile.TemporaryDirectory() as folder:
+            path = os.path.join(folder, "Home.xml")
+            with open(path, "w", encoding="utf-8") as f:
+                f.write('<window><controls><control type="list" id="4001"><content>'
+                        f'{ENCODER.replace("&", "&amp;")}</content></control>'
+                        '<control type="list"><content>videodb://movies/titles/</content></control>'
+                        '</controls></window>')
+            self.assertEqual(value_sources([path]), {"content:4001": [ENCODER]})
 
     def test_keyboard_skin_string_is_raw(self):
         self.assertEqual(self.kinds("%5B%22$INFO[Skin.String(search)]%22%5D", {"skin:search": ["keyboard"]}),
@@ -102,7 +136,7 @@ class TestUrlRows(unittest.TestCase):
     """Xsp and plugin URL rows: errors for raw or escaped typed values, warnings for the rest."""
 
     def test_rows(self):
-        """Check the rule, severity and subject of every URL fault in one window."""
+        """Test the rule, severity and subject of every URL fault in one window."""
         home = (
             '<window><controls>'
             '<control type="button" id="10">'
@@ -125,22 +159,7 @@ class TestUrlRows(unittest.TestCase):
             '<control type="list" id="56"><content>' + path("%5B%22$INFO[Control.GetLabel(9).Index(1)]%22%5D").replace("&", "&amp;")
             + '</content></control>'
             '</controls></window>')
-        files = {
-            "addon.xml": '<addon id="skin.t" version="1.0.0"><requires><import addon="xbmc.gui" '
-                         'version="5.17.0"/></requires><extension point="xbmc.gui.skin">'
-                         '<res folder="16x9" default="true"/></extension></addon>',
-            "16x9/Includes.xml": "<includes/>",
-            "16x9/Home.xml": home,
-        }
-        with tempfile.TemporaryDirectory() as skin:
-            for rel, text in files.items():
-                os.makedirs(os.path.dirname(os.path.join(skin, rel)), exist_ok=True)
-                with open(os.path.join(skin, rel), "w", encoding="utf-8") as f:
-                    f.write(text)
-            provider = InfoProvider()
-            provider.settings = {}
-            provider.init_addon(skin)
-            rows = [r for r in provider.check_values() if r.get("rule", "").startswith(("xml.xsp", "xml.plugin"))]
+        rows = url_rows(home)
         found = sorted((r["rule"], r["severity"], r["subject"]) for r in rows)
         self.assertEqual(found, [
             ("xml.plugin-typed-text", "warning", "$INFO[Control.GetLabel(312).Index(1)]"),
@@ -156,6 +175,29 @@ class TestUrlRows(unittest.TestCase):
         self.assertIn("'Law & Order' empties the list", error)
         self.assertIn("URL-encode it first", error)
 
+    def test_encoder_list_labels_in_a_plugin_url(self):
+        """The labels of an encoder list pass through variables unreported."""
+        includes = (
+            '<includes>'
+            '<variable name="Path_Encoded_Label"><value>$INFO[Container(4001).ListItemAbsolute(0).Label]</value></variable>'
+            '<variable name="Path_Raw_Label"><value>$INFO[Container(4002).ListItemAbsolute(0).Label]</value></variable>'
+            '<variable name="Path_Youtube_Query"><value>$VAR[Path_Encoded_Label]</value></variable>'
+            '</includes>')
+        home = (
+            '<window><controls>'
+            '<control type="list" id="4001"><content>' + ENCODER.replace("&", "&amp;") + '</content></control>'
+            '<control type="list" id="4002"><content>videodb://tvshows/titles/</content></control>'
+            '<control type="button" id="10">'
+            '<onclick>ActivateWindow(Videos,plugin://plugin.video.youtube/kodion/search/query/'
+            '?q=$VAR[Path_Youtube_Query],return)</onclick>'
+            '<onclick>ActivateWindow(Videos,plugin://plugin.video.youtube/kodion/search/query/'
+            '?q=$VAR[Path_Raw_Label],return)</onclick>'
+            '</control>'
+            '</controls></window>')
+        rows = url_rows(home, includes)
+        self.assertEqual(sorted((r["rule"], r["subject"]) for r in rows),
+                         [("xml.plugin-unencoded", "$INFO[Container(4002).ListItemAbsolute(0).Label]")])
+
 
 class TestPluginValues(unittest.TestCase):
     """Runtime values in a plugin URL's query, which the add-on splits on & and decodes."""
@@ -180,6 +222,10 @@ class TestPluginValues(unittest.TestCase):
         text = 'RunPlugin("plugin://script.skinvariables/?info=get_encoded_string&window_prop=E&&$INFO[ListItem.Label]")'
         self.assertEqual(self.kinds(text), [])
 
+    def test_a_space_stays_inside_the_query(self):
+        self.assertEqual(self.kinds("plugin://p/?q=$INFO[ListItem.Artist] $INFO[ListItem.Album] Album"),
+                         [("$INFO[ListItem.Artist]", RAW, None), ("$INFO[ListItem.Album]", RAW, None)])
+
     def test_only_the_query_counts(self):
         self.assertEqual(self.kinds("plugin://x/$INFO[ListItem.Title]/"), [])
         self.assertEqual(self.kinds("RunPlugin(plugin://x/?a=b) + $INFO[ListItem.Title]"), [])
@@ -199,6 +245,26 @@ class TestPluginValues(unittest.TestCase):
         self.assertEqual(self.kinds("plugin://p/?genre=$VAR[Genre]", variables=variables),
                          [("$VAR[Genre]", RAW, None)])
 
+    def test_labels_of_an_encoder_list_are_safe(self):
+        """An encoder list holds an encoded label per item."""
+        sources = {"content:4001": [ENCODER]}
+        variables = {"Path_Encoded_Label": ["$INFO[Container(4001).ListItemAbsolute(0).Label]"],
+                     "Path_Youtube_Query": ["$VAR[Path_Encoded_Label]"], "Encoder": [ENCODER]}
+        self.assertEqual(self.kinds("plugin://p/?q=$VAR[Path_Youtube_Query]", sources, variables), [])
+        self.assertEqual(self.kinds("plugin://p/?q=$INFO[Container(4001).ListItem(1).Label]", sources), [])
+        self.assertEqual(self.kinds("plugin://p/?q=$INFO[Container(4001).ListItem.Label]",
+                                    {"content:4001": ["$VAR[Encoder]"]}, variables), [])
+
+    def test_labels_of_other_lists_stay_raw(self):
+        label = "$INFO[Container(4001).ListItemAbsolute(0).Label]"
+        text = f"plugin://p/?q={label}"
+        self.assertEqual(self.kinds(text), [(label, RAW, None)])
+        self.assertEqual(self.kinds(text, {"content:4001": ["videodb://movies/titles/"]}), [(label, RAW, None)])
+        self.assertEqual(self.kinds(text, {"content:4001": [ENCODER, ""]}), [(label, RAW, None)])
+        self.assertEqual(self.kinds(text, {"content:4001": ["$VAR[Missing]"]}), [(label, RAW, None)])
+        self.assertEqual(self.kinds("plugin://p/?q=$INFO[Container(4001).ListItem.Title]", {"content:4001": [ENCODER]}),
+                         [("$INFO[Container(4001).ListItem.Title]", RAW, None)])
+
     def test_time_date_and_sort_words_need_no_encoding(self):
         self.assertEqual(self.kinds("plugin://p/?t=$INFO[System.Time(hh)]&d=$INFO[System.Date]"
                                     "&s=$INFO[Container.SortMethod]&o=$INFO[Container.SortOrder]"), [])