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

{python-didl-lite-1.4.0 → python_didl_lite-1.5.0}/PKG-INFO

@@ -1,24 +1,26 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-didl-lite
-Version: 1.4.0
+Version: 1.5.0
 Summary: DIDL-Lite (Digital Item Declaration Language) tools for Python
-Home-page: https://github.com/StevenLooman/python-didl-lite
-Author: Steven Looman
-Author-email: steven.looman@gmail.com
-License: UNKNOWN
-Platform: UNKNOWN
+Author-email: Steven Looman <steven.looman@gmail.com>
+License-Expression: Apache-2.0
+Project-URL: GitHub: repo, https://github.com/StevenLooman/python-didl-lite
+Keywords: DIDL,DIDL-lite
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.10
 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
 
 DIDL-Lite (Digital Item Declaration Language) tools for Python
 ==============================================================
@@ -44,3 +46,14 @@ DIDL-Lite resources and documents:
 * `mpeg21-didl <http://xml.coverpages.org/mpeg21-didl.html>`_
 
 
+Releasing
+---------
+
+Steps for releasing:
+
+- Switch to development: ``git checkout master``
+- Do a pull: ``git pull``
+- Run towncrier: ``towncrier build --version <version>``
+- Commit towncrier results: ``git commit -m "Towncrier"``
+- Run bump2version (note that this creates a new commit + tag): ``bump2version --tag major/minor/patch``
+- Push to github: ``git push && git push --tags``

{python-didl-lite-1.4.0 → python_didl_lite-1.5.0}/README.rst

@@ -20,3 +20,16 @@ DIDL-Lite resources and documents:
 * `UPnP-av-ContentDirectory-v2-Service <http://upnp.org/specs/av/UPnP-av-ContentDirectory-v2-Service.pdf>`_
 * `didl-lite-v2.xsd <http://www.upnp.org/schemas/av/didl-lite-v2.xsd>`_
 * `mpeg21-didl <http://xml.coverpages.org/mpeg21-didl.html>`_
+
+
+Releasing
+---------
+
+Steps for releasing:
+
+- Switch to development: ``git checkout master``
+- Do a pull: ``git pull``
+- Run towncrier: ``towncrier build --version <version>``
+- Commit towncrier results: ``git commit -m "Towncrier"``
+- Run bump2version (note that this creates a new commit + tag): ``bump2version --tag major/minor/patch``
+- Push to github: ``git push && git push --tags``

{python-didl-lite-1.4.0 → python_didl_lite-1.5.0}/didl_lite/__init__.py

@@ -2,3 +2,5 @@
 """DIDL-Lite (Digital Item Declaration Language) tools for Python."""
 
 from didl_lite import didl_lite  # noqa: F401
+
+__version__ = "1.5.0"

{python-didl-lite-1.4.0 → python_didl_lite-1.5.0}/didl_lite/didl_lite.py

@@ -2,6 +2,7 @@
 """DIDL-Lite (Digital Item Declaration Language) tools for Python."""
 # pylint: disable=too-many-lines
 
+import re
 from typing import (
     Any,
     Dict,
@@ -86,7 +87,7 @@ class DidlObject:
         **properties: Any,
     ) -> None:
         """Initialize."""
-        # pylint: disable=invalid-name,redefined-builtin,too-many-arguments
+        # pylint: disable=invalid-name,redefined-builtin,too-many-arguments,too-many-positional-arguments
         properties["id"] = id
         properties["parent_id"] = parent_id
         properties["class"] = self.upnp_class
@@ -627,7 +628,7 @@ class Container(DidlObject, list):
         **properties: Any,
     ) -> None:
         """Initialize."""
-        # pylint: disable=redefined-builtin,too-many-arguments
+        # pylint: disable=redefined-builtin,too-many-arguments,too-many-positional-arguments
         super().__init__(id, parent_id, descriptors, xml_el, strict, **properties)
         self.extend(children)
 
@@ -929,7 +930,7 @@ class Resource:
         xml_el: Optional[ET.Element] = None,
     ) -> None:
         """Initialize."""
-        # pylint: disable=too-many-arguments
+        # pylint: disable=too-many-arguments,too-many-positional-arguments
         self.uri = uri
         self.protocol_info = protocol_info
         self.import_uri = import_uri
@@ -1007,7 +1008,7 @@ class Descriptor:
         xml_el: Optional[ET.Element] = None,
     ) -> None:
         """Initialize."""
-        # pylint: disable=invalid-name,redefined-builtin,too-many-arguments
+        # pylint: disable=invalid-name,redefined-builtin,too-many-arguments,too-many-positional-arguments
         self.id = id
         self.name_space = name_space
         self.type = type
@@ -1073,7 +1074,27 @@ def to_xml_string(*objects: DidlObject) -> bytes:
 def from_xml_string(
     xml_string: str, strict: bool = True
 ) -> List[Union[DidlObject, Descriptor]]:
-    """Convert XML string to DIDL Objects."""
+    """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))
+
+        # Find all defined namespaces, e.g., xmlns:prefix=...
+        defined_prefixes = set(re.findall(r"xmlns:([a-zA-Z0-9]+)=", 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)
+
+    # Proceed with parsing using the (potentially) patched xml_string
     xml_el = defusedxml.ElementTree.fromstring(xml_string)
     return from_xml_el(xml_el, strict)
 
@@ -1094,7 +1115,13 @@ def from_xml_el(
         # construct item
         upnp_class = child_el.find("./upnp:class", NAMESPACES)
         if upnp_class is None or not upnp_class.text:
-            continue
+            if strict:
+                continue
+            # WiiM Pro and possibly other Linkplay devices emit
+            # upnp_class above the item element instead of inside it
+            upnp_class = xml_el.find("./upnp:class", NAMESPACES)
+            if upnp_class is None or not upnp_class.text:
+                continue
         didl_object_type = type_by_upnp_class(upnp_class.text, strict)
         if didl_object_type is None:
             if strict:

python_didl_lite-1.5.0/pyproject.toml

@@ -0,0 +1,63 @@
+[build-system]
+build-backend = "setuptools.build_meta"
+requires = ["setuptools>=77.0"]
+
+[project]
+name = "python-didl-lite"
+license = "Apache-2.0"
+license-files = ["LICENSE.txt"]
+description = "DIDL-Lite (Digital Item Declaration Language) tools for Python"
+readme = "README.rst"
+authors = [{ name = "Steven Looman", email = "steven.looman@gmail.com" }]
+keywords = [
+    "DIDL",
+    "DIDL-lite"
+]
+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",
+]
+requires-python = ">=3.10"
+dependencies = [
+    "defusedxml>=0.6.0",
+]
+dynamic = ["version"]
+
+[project.urls]
+"GitHub: repo" = "https://github.com/StevenLooman/python-didl-lite"
+
+[project.optional-dependencies]
+test = [
+    "pytest==9.0.2",
+]
+
+[tool.setuptools]
+packages = ["didl_lite"]
+
+[tool.setuptools.dynamic]
+version = { attr = "didl_lite.__version__" }
+
+[tool.setuptools.package-data]
+didl_lite = ["py.typed"]
+
+[tool.flake8]
+max-line-length = 99
+
+[tool.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

{python-didl-lite-1.4.0 → python_didl_lite-1.5.0}/python_didl_lite.egg-info/PKG-INFO

@@ -1,24 +1,26 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-didl-lite
-Version: 1.4.0
+Version: 1.5.0
 Summary: DIDL-Lite (Digital Item Declaration Language) tools for Python
-Home-page: https://github.com/StevenLooman/python-didl-lite
-Author: Steven Looman
-Author-email: steven.looman@gmail.com
-License: UNKNOWN
-Platform: UNKNOWN
+Author-email: Steven Looman <steven.looman@gmail.com>
+License-Expression: Apache-2.0
+Project-URL: GitHub: repo, https://github.com/StevenLooman/python-didl-lite
+Keywords: DIDL,DIDL-lite
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.10
 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
 
 DIDL-Lite (Digital Item Declaration Language) tools for Python
 ==============================================================
@@ -44,3 +46,14 @@ DIDL-Lite resources and documents:
 * `mpeg21-didl <http://xml.coverpages.org/mpeg21-didl.html>`_
 
 
+Releasing
+---------
+
+Steps for releasing:
+
+- Switch to development: ``git checkout master``
+- Do a pull: ``git pull``
+- Run towncrier: ``towncrier build --version <version>``
+- Commit towncrier results: ``git commit -m "Towncrier"``
+- Run bump2version (note that this creates a new commit + tag): ``bump2version --tag major/minor/patch``
+- Push to github: ``git push && git push --tags``

{python-didl-lite-1.4.0 → python_didl_lite-1.5.0}/python_didl_lite.egg-info/SOURCES.txt

@@ -1,7 +1,7 @@
 LICENSE.md
 README.rst
+pyproject.toml
 setup.cfg
-setup.py
 didl_lite/__init__.py
 didl_lite/didl_lite.py
 didl_lite/py.typed

python_didl_lite-1.5.0/python_didl_lite.egg-info/requires.txt

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

python_didl_lite-1.5.0/setup.cfg

@@ -0,0 +1,51 @@
+[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
+

{python-didl-lite-1.4.0 → python_didl_lite-1.5.0}/tests/test_didl_lite.py

@@ -654,3 +654,71 @@ class TestDidlLite:
         assert hasattr(item, "otherItem")
         assert not hasattr(item, "other_item")
         assert item.otherItem == "otherItem"
+
+    def test_item_improper_class_nesting(self) -> None:
+        """
+        Test item from XML that has upnp_class element above item.
+
+        Cater for WiiM Pro and possibly other Linkplay devices that
+        emit upnp_class above the item element instead of inside it
+        """
+        didl_string = """
+<DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/"
+    xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/">
+    <upnp:class>object.item.audioItem.musicTrack</upnp:class>
+    <item id="0">
+        <res protocolInfo="protocol_info"></res>
+        <dc:title>Music Track Title</dc:title>
+        <dc:creator>Music Track Creator</dc:creator>
+        <upnp:artist>Artist</upnp:artist>
+        <upnp:album>Album</upnp:album>
+    </item>
+</DIDL-Lite>"""
+        items = didl_lite.from_xml_string(didl_string, strict=False)
+        assert len(items) == 1
+
+        item = items[0]
+        assert isinstance(item, didl_lite.MusicTrack)
+
+    def test_from_xml_string_unbound_prefix(self) -> None:
+        """Test from_xml_string with unbound namespace prefix."""
+        # The key fix is adding: xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"
+        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/" '
+            'xmlns:dlna="urn:schemas-dlna-org:metadata-1-0/">'
+            '<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>"
+        )
+
+        # This call should not throw ParseError when strict=False.
+        objs = didl_lite.from_xml_string(broken_xml, strict=False)
+
+        assert len(objs) == 1
+        assert objs[0].title == "Test Title"
+        # Check that the temporary namespace is correctly assigned.
+        assert "sub_title" in objs[0].__dict__
+        assert objs[0].sub_title == "Test Subtitle"
+        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(
+            id="1",
+            parent_id="0",
+            title="Test",
+            restricted="0",
+            artist="My Artist",
+            genre="My Genre",
+        )
+
+        xml = didl_lite.to_xml_string(track)
+
+        assert b"<upnp:artist>My Artist</upnp:artist>" in xml
+        assert b"<upnp:genre>My Genre</upnp:genre>" in xml

python-didl-lite-1.4.0/python_didl_lite.egg-info/requires.txt

@@ -1 +0,0 @@
-defusedxml>=0.6.0

python-didl-lite-1.4.0/setup.cfg

@@ -1,26 +0,0 @@
-[bdist_wheel]
-python-tag = py3
-
-[metadata]
-license_file = LICENSE.md
-
-[flake8]
-max-line-length = 99
-
-[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
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

python-didl-lite-1.4.0/setup.py

@@ -1,51 +0,0 @@
-"""Setup."""
-
-import os.path
-
-from setuptools import setup
-
-here = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(here, "README.rst"), encoding="utf-8") as f:
-    LONG_DESCRIPTION = f.read()
-with open(os.path.join(here, "README.rst"), encoding="utf-8") as f:
-    DESCRIPTION = f.readline().strip()
-
-
-INSTALL_REQUIRES = [
-    "defusedxml>=0.6.0",
-]
-
-
-TEST_REQUIRES = [
-    "pytest~=7.4.3",
-]
-
-
-setup(
-    name="python-didl-lite",
-    version="1.4.0",
-    description=DESCRIPTION,
-    long_description=LONG_DESCRIPTION,
-    long_description_content_type="text/x-rst",
-    url="https://github.com/StevenLooman/python-didl-lite",
-    author="Steven Looman",
-    author_email="steven.looman@gmail.com",
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: Apache Software License",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-    ],
-    packages=["didl_lite"],
-    package_data={
-        "didl_lite": ["py.typed"],
-    },
-    python_requires=">=3.8",
-    install_requires=INSTALL_REQUIRES,
-    tests_require=TEST_REQUIRES,
-)