python-didl-lite 1.5.0__tar.gz → 1.5.2__tar.gz

{python_didl_lite-1.5.0 → python_didl_lite-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-didl-lite
-Version: 1.5.0
+Version: 1.5.2
 Summary: DIDL-Lite (Digital Item Declaration Language) tools for Python
 Author-email: Steven Looman <steven.looman@gmail.com>
 License-Expression: Apache-2.0
@@ -9,18 +9,16 @@ Keywords: DIDL,DIDL-lite
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Python: >=3.10
+Classifier: Programming Language :: Python :: 3.15
+Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
-License-File: LICENSE.md
 Requires-Dist: defusedxml>=0.6.0
 Provides-Extra: test
-Requires-Dist: pytest==9.0.2; extra == "test"
-Dynamic: license-file
+Requires-Dist: pytest==9.1.1; extra == "test"
 
 DIDL-Lite (Digital Item Declaration Language) tools for Python
 ==============================================================
@@ -51,7 +49,7 @@ Releasing
 
 Steps for releasing:
 
-- Switch to development: ``git checkout master``
+- Switch to master: ``git checkout master``
 - Do a pull: ``git pull``
 - Run towncrier: ``towncrier build --version <version>``
 - Commit towncrier results: ``git commit -m "Towncrier"``

{python_didl_lite-1.5.0 → python_didl_lite-1.5.2}/README.rst

@@ -27,7 +27,7 @@ Releasing
 
 Steps for releasing:
 
-- Switch to development: ``git checkout master``
+- Switch to master: ``git checkout master``
 - Do a pull: ``git pull``
 - Run towncrier: ``towncrier build --version <version>``
 - Commit towncrier results: ``git commit -m "Towncrier"``

{python_didl_lite-1.5.0 → python_didl_lite-1.5.2}/didl_lite/__init__.py

@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
 """DIDL-Lite (Digital Item Declaration Language) tools for Python."""
 
 from didl_lite import didl_lite  # noqa: F401
 
-__version__ = "1.5.0"
+__version__ = "1.5.2"

{python_didl_lite-1.5.0 → python_didl_lite-1.5.2}/didl_lite/didl_lite.py

@@ -1,21 +1,9 @@
-# -*- coding: utf-8 -*-
 """DIDL-Lite (Digital Item Declaration Language) tools for Python."""
 # pylint: disable=too-many-lines
 
 import re
-from typing import (
-    Any,
-    Dict,
-    Iterable,
-    List,
-    Mapping,
-    Optional,
-    Sequence,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-)
+from collections.abc import Iterable, Mapping, Sequence
+from typing import Any, Self
 from xml.etree import ElementTree as ET
 
 import defusedxml.ElementTree
@@ -29,11 +17,6 @@ from .utils import (
     to_camel_case,
 )
 
-TDO = TypeVar("TDO", bound="DidlObject")  # pylint: disable=invalid-name
-TC = TypeVar("TC", bound="Container")  # pylint: disable=invalid-name
-TD = TypeVar("TD", bound="Descriptor")  # pylint: disable=invalid-name
-TR = TypeVar("TR", bound="Resource")  # pylint: disable=invalid-name
-
 
 class DidlLiteException(Exception):
     """DIDL Lite Exception."""
@@ -42,16 +25,16 @@ class DidlLiteException(Exception):
 # region: DidlObjects
 
 # upnp_class to python type mapping
-_upnp_class_map: Dict[str, Type["DidlObject"]] = {}
-_upnp_class_map_lowercase: Dict[str, Type["DidlObject"]] = {}
+_upnp_class_map: dict[str, type["DidlObject"]] = {}
+_upnp_class_map_lowercase: dict[str, type["DidlObject"]] = {}
 
 
 class DidlObject:
     """DIDL Object."""
 
-    tag: Optional[str] = None
+    tag: str | None = None
     upnp_class: str = "object"
-    didl_properties_defs: List[Tuple[str, str, str]] = [
+    didl_properties_defs: list[tuple[str, str, str]] = [
         ("didl_lite", "@id", "R"),
         ("didl_lite", "@parentID", "R"),
         ("didl_lite", "@restricted", "R"),
@@ -64,12 +47,12 @@ class DidlObject:
 
     id: str
     parent_id: str
-    res: List["Resource"]
-    xml_el: Optional[ET.Element]
+    res: list["Resource"]
+    xml_el: ET.Element | None
     descriptors: Sequence["Descriptor"]
 
     @classmethod
-    def __init_subclass__(cls: Type["DidlObject"], **kwargs: Any) -> None:
+    def __init_subclass__(cls: type["DidlObject"], **kwargs: Any) -> None:
         """Create mapping of upnp_class to Python type for fast lookup."""
         super().__init_subclass__(**kwargs)
         assert cls.upnp_class not in _upnp_class_map
@@ -81,8 +64,8 @@ class DidlObject:
         self,
         id: str = "",
         parent_id: str = "",
-        descriptors: Optional[Sequence["Descriptor"]] = None,
-        xml_el: Optional[ET.Element] = None,
+        descriptors: Sequence["Descriptor"] | None = None,
+        xml_el: ET.Element | None = None,
         strict: bool = True,
         **properties: Any,
     ) -> None:
@@ -101,9 +84,7 @@ class DidlObject:
         self.xml_el = xml_el
         self.descriptors = descriptors if descriptors else []
 
-    def _ensure_required_properties(
-        self, strict: bool, properties: Mapping[str, Any]
-    ) -> None:
+    def _ensure_required_properties(self, strict: bool, properties: Mapping[str, Any]) -> None:
         """Check if all required properties are given."""
         if not strict:
             return
@@ -127,14 +108,14 @@ class DidlObject:
             setattr(self, key, value)
 
     @classmethod
-    def from_xml(cls: Type[TDO], xml_el: ET.Element, strict: bool = True) -> TDO:
+    def from_xml(cls, xml_el: ET.Element, strict: bool = True) -> Self:
         """
         Initialize from an XML node.
 
         I.e., parse XML and return instance.
         """
         # pylint: disable=too-many-locals
-        properties = {}  # type: Dict[str, Any]
+        properties: dict[str, Any] = {}
 
         # attributes
         for attr_key, attr_value in xml_el.attrib.items():
@@ -184,9 +165,7 @@ class DidlObject:
                 continue
             key = didl_property_def_key(property_def)
 
-            if (
-                getattr(self, key) is None or key == "res"
-            ):  # no resources, handled later on
+            if getattr(self, key) is None or key == "res":  # no resources, handled later on
                 continue
 
             tag = property_def[0] + ":" + property_def[1]
@@ -245,11 +224,7 @@ class DidlObject:
     def __repr__(self) -> str:
         """Evaluatable string representation of this object."""
         class_name = type(self).__name__
-        attr = ", ".join(
-            f"{key}={val!r}"
-            for key, val in self.__dict__.items()
-            if key not in ("class", "xml_el")
-        )
+        attr = ", ".join(f"{key}={val!r}" for key, val in self.__dict__.items() if key not in ("class", "xml_el"))
         return f"{class_name}({attr})"
 
 
@@ -321,6 +296,7 @@ class MusicTrack(AudioItem):
     didl_properties_defs = AudioItem.didl_properties_defs + [
         ("upnp", "artist", "O"),
         ("upnp", "album", "O"),
+        ("upnp", "albumArtURI", "O"),
         ("upnp", "originalTrackNumber", "O"),
         ("upnp", "playlist", "O"),
         ("upnp", "storageMedium", "O"),
@@ -621,8 +597,8 @@ class Container(DidlObject, list):
         self,
         id: str = "",
         parent_id: str = "",
-        descriptors: Optional[Sequence["Descriptor"]] = None,
-        xml_el: Optional[ET.Element] = None,
+        descriptors: Sequence["Descriptor"] | None = None,
+        xml_el: ET.Element | None = None,
         strict: bool = True,
         children: Iterable[DidlObject] = (),
         **properties: Any,
@@ -633,7 +609,7 @@ class Container(DidlObject, list):
         self.extend(children)
 
     @classmethod
-    def from_xml(cls: Type[TC], xml_el: ET.Element, strict: bool = True) -> TC:
+    def from_xml(cls, xml_el: ET.Element, strict: bool = True) -> Self:
         """
         Initialize from an XML node.
 
@@ -660,11 +636,7 @@ class Container(DidlObject, list):
     def __repr__(self) -> str:
         """Evaluatable string representation of this object."""
         class_name = type(self).__name__
-        attr = ", ".join(
-            f"{key}={val!r}"
-            for key, val in self.__dict__.items()
-            if key not in ("class", "xml_el")
-        )
+        attr = ", ".join(f"{key}={val!r}" for key, val in self.__dict__.items() if key not in ("class", "xml_el"))
         children_repr = ", ".join(repr(child) for child in self)
         return f"{class_name}({attr}, children=[{children_repr}])"
 
@@ -915,19 +887,19 @@ class Resource:
 
     def __init__(
         self,
-        uri: Optional[str],
-        protocol_info: Optional[str],
-        import_uri: Optional[str] = None,
-        size: Optional[str] = None,
-        duration: Optional[str] = None,
-        bitrate: Optional[str] = None,
-        sample_frequency: Optional[str] = None,
-        bits_per_sample: Optional[str] = None,
-        nr_audio_channels: Optional[str] = None,
-        resolution: Optional[str] = None,
-        color_depth: Optional[str] = None,
-        protection: Optional[str] = None,
-        xml_el: Optional[ET.Element] = None,
+        uri: str | None,
+        protocol_info: str | None,
+        import_uri: str | None = None,
+        size: str | None = None,
+        duration: str | None = None,
+        bitrate: str | None = None,
+        sample_frequency: str | None = None,
+        bits_per_sample: str | None = None,
+        nr_audio_channels: str | None = None,
+        resolution: str | None = None,
+        color_depth: str | None = None,
+        protection: str | None = None,
+        xml_el: ET.Element | None = None,
     ) -> None:
         """Initialize."""
         # pylint: disable=too-many-arguments,too-many-positional-arguments
@@ -946,7 +918,7 @@ class Resource:
         self.xml_el = xml_el
 
     @classmethod
-    def from_xml(cls: Type[TR], xml_el: ET.Element) -> TR:
+    def from_xml(cls, xml_el: ET.Element) -> Self:
         """Initialize from an XML node."""
         uri = xml_el.text
         protocol_info = xml_el.attrib.get("protocolInfo")
@@ -988,11 +960,7 @@ class Resource:
     def __repr__(self) -> str:
         """Evaluatable string representation of this object."""
         class_name = type(self).__name__
-        attr = ", ".join(
-            f"{key}={val!r}"
-            for key, val in self.__dict__.items()
-            if val is not None and key != "xml_el"
-        )
+        attr = ", ".join(f"{key}={val!r}" for key, val in self.__dict__.items() if val is not None and key != "xml_el")
         return f"{class_name}({attr})"
 
 
@@ -1003,9 +971,9 @@ class Descriptor:
         self,
         id: str,
         name_space: str,
-        type: Optional[str] = None,
-        text: Optional[str] = None,
-        xml_el: Optional[ET.Element] = None,
+        type: str | None = None,
+        text: str | None = None,
+        xml_el: ET.Element | None = None,
     ) -> None:
         """Initialize."""
         # pylint: disable=invalid-name,redefined-builtin,too-many-arguments,too-many-positional-arguments
@@ -1016,7 +984,7 @@ class Descriptor:
         self.xml_el = xml_el
 
     @classmethod
-    def from_xml(cls: Type[TD], xml_el: ET.Element) -> TD:
+    def from_xml(cls, xml_el: ET.Element) -> Self:
         """Initialize from an XML node."""
         id_ = xml_el.attrib["id"]
         name_space = xml_el.attrib["nameSpace"]
@@ -1045,11 +1013,7 @@ class Descriptor:
     def __repr__(self) -> str:
         """Evaluatable string representation of this object."""
         class_name = type(self).__name__
-        attr = ", ".join(
-            f"{key}={val!r}"
-            for key, val in self.__dict__.items()
-            if val is not None and key != "xml_el"
-        )
+        attr = ", ".join(f"{key}={val!r}" for key, val in self.__dict__.items() if val is not None and key != "xml_el")
         return f"{class_name}({attr})"
 
 
@@ -1071,45 +1035,51 @@ def to_xml_string(*objects: DidlObject) -> bytes:
     return ET.tostring(root_el)
 
 
-def from_xml_string(
-    xml_string: str, strict: bool = True
-) -> List[Union[DidlObject, Descriptor]]:
+def from_xml_string(xml_string: str, strict: bool = True) -> list[DidlObject | Descriptor]:
     """Parse DIDL-Lite XML string."""
     if not strict:
         # Find all prefixes used in tags, e.g., <prefix:tag ...>
-        used_prefixes = set(re.findall(r"<([a-zA-Z0-9]+):", xml_string))
+        used_prefixes = set(re.findall(r"<([A-Za-z_][\w.-]*):", xml_string))
 
         # Find all defined namespaces, e.g., xmlns:prefix=...
-        defined_prefixes = set(re.findall(r"xmlns:([a-zA-Z0-9]+)=", xml_string))
+        defined_prefixes = set(re.findall(r"xmlns:([A-Za-z_][\w.-]*)=", xml_string))
 
         # Identify prefixes used but not defined.
-        missing_prefixes = (
-            used_prefixes - defined_prefixes - {"DIDL-Lite", "dc", "upnp", "dlna"}
-        )
-
-        # Remove the "if missing_prefixes:" line and just keep the for loop
-        for prefix in missing_prefixes:
-            dlna_ns = 'xmlns:dlna="urn:schemas-dlna-org:metadata-1-0/"'
-            if dlna_ns in xml_string:
-                replacement = f'{dlna_ns} xmlns:{prefix}="http://tempuri.org/{prefix}/"'
-                xml_string = xml_string.replace(dlna_ns, replacement)
+        missing_prefixes = used_prefixes - defined_prefixes - {"DIDL-Lite", "dc", "upnp", "dlna"}
+
+        if missing_prefixes:
+            # Inject temporary namespace declarations into the DIDL-Lite root
+            # opening tag. Anchoring on the root element (always present in
+            # valid DIDL-Lite documents) instead of an optional `xmlns:dlna`
+            # allows us to recover XML from devices that omit the dlna
+            # namespace declaration entirely (observed on JBL Authentics and
+            # WiiM/LinkPlay players sending `<song:*>` without `xmlns:dlna`).
+            # The root itself may carry a prefix, as in `<didl:DIDL-Lite>`, so
+            # the match is captured and written back unchanged.
+            injections = " ".join(
+                f'xmlns:{prefix}="http://tempuri.org/{prefix}/"' for prefix in sorted(missing_prefixes)
+            )
+            xml_string = re.sub(
+                r"<((?:[A-Za-z_][\w.-]*:)?DIDL-Lite)\b",
+                lambda match: f"<{match.group(1)} {injections}",
+                xml_string,
+                count=1,
+            )
 
     # Proceed with parsing using the (potentially) patched xml_string
     xml_el = defusedxml.ElementTree.fromstring(xml_string)
     return from_xml_el(xml_el, strict)
 
 
-def from_xml_el(
-    xml_el: ET.Element, strict: bool = True
-) -> List[Union[DidlObject, Descriptor]]:
+def from_xml_el(xml_el: ET.Element, strict: bool = True) -> list[DidlObject | Descriptor]:
     """Convert XML Element to DIDL Objects."""
-    didl_objects = []  # type: List[Union[DidlObject, Descriptor]]
+    didl_objects: list[DidlObject | Descriptor] = []
 
     # items and containers, in order
     for child_el in xml_el:
-        if child_el.tag != expand_namespace_tag(
-            "didl_lite:item"
-        ) and child_el.tag != expand_namespace_tag("didl_lite:container"):
+        if child_el.tag != expand_namespace_tag("didl_lite:item") and child_el.tag != expand_namespace_tag(
+            "didl_lite:container"
+        ):
             continue
 
         # construct item
@@ -1139,9 +1109,7 @@ def from_xml_el(
 
 
 # upnp_class to python type mapping
-def type_by_upnp_class(
-    upnp_class: str, strict: bool = True
-) -> Optional[Type[DidlObject]]:
+def type_by_upnp_class(upnp_class: str, strict: bool = True) -> type[DidlObject] | None:
     """Get DidlObject-type by upnp_class.
 
     When strict is False, the upnp_class lookup will be done ignoring string

{python_didl_lite-1.5.0 → python_didl_lite-1.5.2}/didl_lite/utils.py

@@ -1,7 +1,7 @@
 """Utilities."""
 
+import functools
 import re
-from typing import Optional, Tuple
 
 NAMESPACES = {
     "didl_lite": "urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/",
@@ -27,7 +27,7 @@ def expand_namespace_tag(tag: str) -> str:
     return f"{{{namespace_uri}}}{tag}"
 
 
-def split_namespace_tag(namespaced_tag: str) -> Tuple[Optional[str], str]:
+def split_namespace_tag(namespaced_tag: str) -> tuple[str | None, str]:
     """
     Extract namespace and tag from namespaced-tag.
 
@@ -43,6 +43,10 @@ def split_namespace_tag(namespaced_tag: str) -> Tuple[Optional[str], str]:
     return namespace, tag
 
 
+# Cached: called for every attribute set on a DidlObject, with a small closed
+# set of property names. Bounded, as from_xml also passes names read from
+# documents received from other devices.
+@functools.lru_cache(maxsize=256)
 def to_camel_case(name: str) -> str:
     """Get camel case of name."""
     sub1 = re.sub("(.)([A-Z][a-z]+)", r"\1_\2", name)
@@ -61,7 +65,7 @@ def didl_property_key(didl_property_name: str) -> str:
     return to_camel_case(didl_property_name.replace("@", "_"))
 
 
-def didl_property_def_key(didl_property_def: Tuple[str, ...]) -> str:
+def didl_property_def_key(didl_property_def: tuple[str, ...]) -> str:
     """Get Python property key for didl_property_def."""
     if didl_property_def[1].startswith("@"):
         return to_camel_case(didl_property_def[1].replace("@", ""))

{python_didl_lite-1.5.0 → python_didl_lite-1.5.2}/pyproject.toml

@@ -17,13 +17,13 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
     "defusedxml>=0.6.0",
 ]
@@ -34,7 +34,7 @@ dynamic = ["version"]
 
 [project.optional-dependencies]
 test = [
-    "pytest==9.0.2",
+    "pytest==9.1.1",
 ]
 
 [tool.setuptools]
@@ -46,10 +46,8 @@ version = { attr = "didl_lite.__version__" }
 [tool.setuptools.package-data]
 didl_lite = ["py.typed"]
 
-[tool.flake8]
-max-line-length = 99
-
 [tool.mypy]
+python_version = "3.11"
 check_untyped_defs = true
 disallow_untyped_calls = true
 disallow_untyped_defs = true
@@ -61,3 +59,37 @@ warn_redundant_casts = true
 warn_return_any = true
 warn_unused_configs = true
 warn_unused_ignores = true
+
+[tool.ruff]
+line-length = 119
+
+[tool.ruff.lint]
+select = ["C901", "D", "E", "F", "I", "W"]
+ignore = ["D202"]
+
+[tool.ruff.lint.mccabe]
+max-complexity = 25
+
+[tool.ruff.lint.pydocstyle]
+convention = "pep257"
+
+[tool.ruff.lint.isort]
+known-first-party = ["didl_lite"]
+
+[tool.deptry]
+package_module_name_map = { "pytest" = "pytest" }
+
+[tool.deptry.per_rule_ignores]
+DEP002 = ["pytest"]
+
+[tool.pylint.format]
+max-line-length = 119
+
+[tool.pylint.basic]
+good-names = ["otherItem", "storageMedium"]
+
+[tool.codespell]
+ignore-words-list = "wan"
+
+[tool.coverage.run]
+source = ["didl_lite"]

{python_didl_lite-1.5.0 → python_didl_lite-1.5.2}/python_didl_lite.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-didl-lite
-Version: 1.5.0
+Version: 1.5.2
 Summary: DIDL-Lite (Digital Item Declaration Language) tools for Python
 Author-email: Steven Looman <steven.looman@gmail.com>
 License-Expression: Apache-2.0
@@ -9,18 +9,16 @@ Keywords: DIDL,DIDL-lite
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Python: >=3.10
+Classifier: Programming Language :: Python :: 3.15
+Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
-License-File: LICENSE.md
 Requires-Dist: defusedxml>=0.6.0
 Provides-Extra: test
-Requires-Dist: pytest==9.0.2; extra == "test"
-Dynamic: license-file
+Requires-Dist: pytest==9.1.1; extra == "test"
 
 DIDL-Lite (Digital Item Declaration Language) tools for Python
 ==============================================================
@@ -51,7 +49,7 @@ Releasing
 
 Steps for releasing:
 
-- Switch to development: ``git checkout master``
+- Switch to master: ``git checkout master``
 - Do a pull: ``git pull``
 - Run towncrier: ``towncrier build --version <version>``
 - Commit towncrier results: ``git commit -m "Towncrier"``

{python_didl_lite-1.5.0 → python_didl_lite-1.5.2}/python_didl_lite.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-LICENSE.md
 README.rst
 pyproject.toml
 setup.cfg

{python_didl_lite-1.5.0 → python_didl_lite-1.5.2}/python_didl_lite.egg-info/requires.txt

@@ -1,4 +1,4 @@
 defusedxml>=0.6.0
 
 [test]
-pytest==9.0.2
+pytest==9.1.1

python_didl_lite-1.5.2/setup.cfg

@@ -0,0 +1,14 @@
+[bumpversion]
+current_version = 1.5.2
+commit = True
+tag = False
+tag_name = {new_version}
+
+[bumpversion:file:didl_lite/__init__.py]
+search = __version__ = "{current_version}"
+replace = __version__ = "{new_version}"
+
+[egg_info]
+tag_build = 
+tag_date = 0
+

{python_didl_lite-1.5.0 → python_didl_lite-1.5.2}/tests/test_didl_lite.py

@@ -1,10 +1,9 @@
-# -*- coding: utf-8 -*-
 """Unit tests for didl_lite."""
 
 import pytest
 from defusedxml import ElementTree as ET
 
-from didl_lite import didl_lite
+from didl_lite import didl_lite, utils
 
 NAMESPACES = {
     "didl_lite": "urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/",
@@ -234,9 +233,7 @@ class TestDidlLite:
 
     def test_container_to_xml(self) -> None:
         """Test container to XML."""
-        container = didl_lite.Album(
-            id="0", parent_id="0", title="Audio Item Title", restricted="1"
-        )
+        container = didl_lite.Album(id="0", parent_id="0", title="Audio Item Title", restricted="1")
         resource = didl_lite.Resource("url", "protocol_info")
         item = didl_lite.AudioItem(
             id="0",
@@ -285,9 +282,7 @@ class TestDidlLite:
         # pylint: disable=import-outside-toplevel
         from didl_lite.didl_lite import Album, AudioItem, Resource
 
-        container = Album(
-            id="0", parent_id="0", title="Audio Item Title", restricted="1"
-        )
+        container = Album(id="0", parent_id="0", title="Audio Item Title", restricted="1")
         resource = Resource("url", "protocol_info")
         item = AudioItem(
             id="0",
@@ -427,9 +422,7 @@ class TestDidlLite:
 
     def test_descriptor_to_xml(self) -> None:
         """Test descriptor to XML."""
-        descriptor = didl_lite.Descriptor(
-            id="1", name_space="ns", type="type", text="Text"
-        )
+        descriptor = didl_lite.Descriptor(id="1", name_space="ns", type="type", text="Text")
         item = didl_lite.AudioItem(
             id="0",
             parent_id="0",
@@ -468,9 +461,7 @@ class TestDidlLite:
 
         descriptor_repr = repr(descriptor)
         descriptor_remade = eval(descriptor_repr)  # pylint: disable=eval-used
-        assert ET.tostring(descriptor.to_xml()) == ET.tostring(
-            descriptor_remade.to_xml()
-        )
+        assert ET.tostring(descriptor.to_xml()) == ET.tostring(descriptor_remade.to_xml())
 
     def test_item_order(self) -> None:
         """Test item ordering."""
@@ -608,9 +599,7 @@ class TestDidlLite:
 
     def test_default_properties_set(self) -> None:
         """Test defaults for item properties."""
-        item = didl_lite.VideoItem(
-            id="0", parent_id="0", title="Video Item Title", restricted="1"
-        )
+        item = didl_lite.VideoItem(id="0", parent_id="0", title="Video Item Title", restricted="1")
         assert hasattr(item, "genre_type")  # property is set
 
     def test_property_case(self) -> None:
@@ -707,6 +696,88 @@ class TestDidlLite:
         assert objs[0].sub_title == "Test Subtitle"
         assert isinstance(objs[0], didl_lite.MusicTrack)
 
+    def test_from_xml_string_unbound_prefix_without_dlna_namespace(self) -> None:
+        """Test unbound prefix recovery when xmlns:dlna is absent.
+
+        Regression: the previous implementation anchored the namespace
+        injection on an existing `xmlns:dlna` declaration. Devices such as
+        JBL Authentics and WiiM/LinkPlay players emit `<song:*>` tags
+        without declaring `xmlns:dlna`, leaving the unbound prefix in place
+        and breaking parsing even with strict=False.
+        """
+        broken_xml = (
+            '<DIDL-Lite xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/" '
+            'xmlns:dc="http://purl.org/dc/elements/1.1/" '
+            'xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/">'
+            '<item id="1" parentID="0" restricted="1">'
+            "<dc:title>Test Title</dc:title>"
+            "<song:subTitle>Test Subtitle</song:subTitle>"
+            "<upnp:class>object.item.audioItem.musicTrack</upnp:class>"
+            "</item>"
+            "</DIDL-Lite>"
+        )
+
+        objs = didl_lite.from_xml_string(broken_xml, strict=False)
+
+        assert len(objs) == 1
+        assert objs[0].title == "Test Title"
+        assert "sub_title" in objs[0].__dict__
+        assert objs[0].sub_title == "Test Subtitle"
+        assert isinstance(objs[0], didl_lite.MusicTrack)
+
+    def test_from_xml_string_unbound_prefix_with_prefixed_root(self) -> None:
+        """Test unbound prefix recovery when the root element carries a prefix.
+
+        The DIDL-Lite root may be written as `<didl:DIDL-Lite>` rather than
+        `<DIDL-Lite>`. The namespace injection has to recognise that form and
+        write the matched name back unchanged, otherwise the opening tag no
+        longer matches its closing tag.
+        """
+        broken_xml = (
+            '<didl:DIDL-Lite xmlns:didl="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/" '
+            'xmlns:dc="http://purl.org/dc/elements/1.1/" '
+            'xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/">'
+            '<didl:item id="1" parentID="0" restricted="1">'
+            "<dc:title>Test Title</dc:title>"
+            "<song:subTitle>Test Subtitle</song:subTitle>"
+            "<upnp:class>object.item.audioItem.musicTrack</upnp:class>"
+            "</didl:item>"
+            "</didl:DIDL-Lite>"
+        )
+
+        objs = didl_lite.from_xml_string(broken_xml, strict=False)
+
+        assert len(objs) == 1
+        assert objs[0].title == "Test Title"
+        assert objs[0].sub_title == "Test Subtitle"
+        assert isinstance(objs[0], didl_lite.MusicTrack)
+
+    def test_from_xml_string_unbound_prefix_with_ncname_characters(self) -> None:
+        """Test unbound prefix recovery for prefixes holding '-', '.' or '_'.
+
+        An XML namespace prefix is an NCName, so it may contain a hyphen, a
+        period or an underscore after its first character. Recovery has to
+        detect those prefixes as well, not only alphanumeric ones.
+        """
+        for prefix in ("my-song", "my.song", "my_song"):
+            broken_xml = (
+                '<DIDL-Lite xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/" '
+                'xmlns:dc="http://purl.org/dc/elements/1.1/" '
+                'xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/">'
+                '<item id="1" parentID="0" restricted="1">'
+                "<dc:title>Test Title</dc:title>"
+                f"<{prefix}:subTitle>Test Subtitle</{prefix}:subTitle>"
+                "<upnp:class>object.item.audioItem.musicTrack</upnp:class>"
+                "</item>"
+                "</DIDL-Lite>"
+            )
+
+            objs = didl_lite.from_xml_string(broken_xml, strict=False)
+
+            assert len(objs) == 1, f"prefix {prefix} was not recovered"
+            assert objs[0].title == "Test Title"
+            assert isinstance(objs[0], didl_lite.MusicTrack)
+
     def test_music_track_artist_and_genre(self) -> None:
         """Test MusicTrack artist and genre properties."""
         track = didl_lite.MusicTrack(
@@ -722,3 +793,13 @@ class TestDidlLite:
 
         assert b"<upnp:artist>My Artist</upnp:artist>" in xml
         assert b"<upnp:genre>My Genre</upnp:genre>" in xml
+
+    def test_to_camel_case_is_cached(self) -> None:
+        """Test to_camel_case is cached, and used cached through didl_lite."""
+        assert hasattr(utils.to_camel_case, "cache_info")
+        # didl_lite imports the name; it must be the cached function too.
+        assert didl_lite.to_camel_case is utils.to_camel_case
+
+        hits_before = utils.to_camel_case.cache_info().hits
+        didl_lite.MusicTrack(id="0", parent_id="0", title="Title", restricted="1")
+        assert utils.to_camel_case.cache_info().hits > hits_before

python_didl_lite-1.5.0/LICENSE.md

@@ -1,194 +0,0 @@
-Apache License
-==============
-
-_Version 2.0, January 2004_
-_&lt;<http://www.apache.org/licenses/>&gt;_
-
-### Terms and Conditions for use, reproduction, and distribution
-
-#### 1. Definitions
-
-“License” shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-“Licensor” shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-“Legal Entity” shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, “control” means **(i)** the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
-outstanding shares, or **(iii)** beneficial ownership of such entity.
-
-“You” (or “Your”) shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-“Source” form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-“Object” form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-“Work” shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-“Derivative Works” shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-“Contribution” shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-“submitted” means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as “Not a Contribution.”
-
-“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-#### 2. Grant of Copyright License
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
-
-#### 3. Grant of Patent License
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-#### 4. Redistribution
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-* **(a)** You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-* **(b)** You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-* **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-#### 5. Submission of Contributions
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-#### 6. Trademarks
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-#### 7. Disclaimer of Warranty
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-#### 8. Limitation of Liability
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-#### 9. Accepting Warranty or Additional Liability
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-_END OF TERMS AND CONDITIONS_
-
-### APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets `[]` replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same “printed page” as the copyright notice for easier identification within
-third-party archives.
-
-    Copyright [yyyy] [name of copyright owner]
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.

python_didl_lite-1.5.0/setup.cfg

@@ -1,51 +0,0 @@
-[bumpversion]
-current_version = 1.5.0
-commit = True
-tag = False
-tag_name = {new_version}
-
-[bumpversion:file:didl_lite/__init__.py]
-search = __version__ = "{current_version}"
-replace = __version__ = "{new_version}"
-
-[bdist_wheel]
-python-tag = py3
-
-[metadata]
-license_file = LICENSE.md
-
-[flake8]
-exclude = .venv,.git,.tox,docs,venv,bin,lib,deps,build
-max-line-length = 119
-max-complexity = 25
-ignore = 
-	E501,
-	W503,
-	E203,
-	D202,
-	W504
-noqa-require-code = True
-
-[mypy]
-check_untyped_defs = true
-disallow_untyped_calls = true
-disallow_untyped_defs = true
-disallow_incomplete_defs = true
-disallow_untyped_decorators = true
-no_implicit_optional = true
-warn_incomplete_stub = true
-warn_redundant_casts = true
-warn_return_any = true
-warn_unused_configs = true
-warn_unused_ignores = true
-
-[codespell]
-ignore-words-list = wan
-
-[coverage:run]
-source = didl_lite
-
-[egg_info]
-tag_build = 
-tag_date = 0
-