pywiim 2.2.6__tar.gz → 2.2.7__tar.gz

{pywiim-2.2.6/pywiim.egg-info → pywiim-2.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pywiim
-Version: 2.2.6
+Version: 2.2.7
 Summary: Python library for WiiM/LinkPlay device communication
 Author-email: Michael Cumming <mjcumming@gmail.com>
 License: MIT

{pywiim-2.2.6 → pywiim-2.2.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pywiim"
-version = "2.2.6"
+version = "2.2.7"
 description = "Python library for WiiM/LinkPlay device communication"
 readme = "README.md"
 requires-python = ">=3.11"

{pywiim-2.2.6 → pywiim-2.2.7}/pywiim/__init__.py

@@ -87,7 +87,7 @@ from .profiles import (
 from .role import RoleDetectionResult, detect_role
 from .state import GroupStateSynchronizer, StateSynchronizer
 
-__version__ = "2.2.6"
+__version__ = "2.2.7"
 __all__ = [
     # Main client
     "WiiMClient",

{pywiim-2.2.6 → pywiim-2.2.7}/pywiim/player/coverart.py

@@ -244,10 +244,14 @@ class CoverArtManager:
             current_signature and self._last_track_signature and current_signature != self._last_track_signature
         )
 
-        # Check if metadata needs enrichment (title/artist/album are Unknown)
+        # Check if metadata needs enrichment (title/artist/album are present but Unknown)
         # This is common with Bluetooth AVRCP where getPlayerStatusEx returns "Unknown"
         # but getMetaInfo has the actual track info
-        needs_metadata_enrichment = is_invalid_metadata(title) or is_invalid_metadata(artist)
+        needs_metadata_enrichment = (
+            ("title" in merged_state and is_invalid_metadata(title))
+            or ("artist" in merged_state and is_invalid_metadata(artist))
+            or ("album" in merged_state and is_invalid_metadata(album))
+        )
 
         if track_changed:
             self._last_track_signature = current_signature
@@ -270,29 +274,30 @@ class CoverArtManager:
         has_track_metadata = bool(title or artist or album)
         needs_artwork_enrichment = not has_valid_artwork and has_track_metadata
         should_fetch_metadata = (
-            (track_changed and not has_valid_artwork)
-            or needs_metadata_enrichment
-            or needs_artwork_enrichment
+            (track_changed and not has_valid_artwork) or needs_metadata_enrichment or needs_artwork_enrichment
         )
 
         if should_fetch_metadata:
             # Cancel any existing fetch task
-            if self._artwork_fetch_task and not self._artwork_fetch_task.done():
+            current_task = asyncio.current_task()
+            if (
+                self._artwork_fetch_task
+                and not self._artwork_fetch_task.done()
+                and self._artwork_fetch_task is not current_task
+            ):
                 self._artwork_fetch_task.cancel()
 
-            # Start background task to fetch metadata/artwork
-            try:
-                loop = asyncio.get_event_loop()
-                self._artwork_fetch_task = loop.create_task(self._fetch_artwork_from_metainfo(merged_state))
-                if needs_metadata_enrichment:
-                    _LOGGER.debug("Metadata is Unknown, fetching enrichment sources")
-                elif needs_artwork_enrichment:
-                    _LOGGER.debug("Artwork missing with track metadata, fetching enrichment sources")
-                else:
-                    _LOGGER.debug("Track changed, fetching enrichment sources")
-            except RuntimeError:
-                # No event loop available (sync context) - will fetch on next poll
-                _LOGGER.debug("No event loop available, metadata will be fetched on next poll")
+            if current_task:
+                self._artwork_fetch_task = current_task
+
+            if needs_metadata_enrichment:
+                _LOGGER.debug("Metadata is Unknown, fetching enrichment sources")
+            elif needs_artwork_enrichment:
+                _LOGGER.debug("Artwork missing with track metadata, fetching enrichment sources")
+            else:
+                _LOGGER.debug("Track changed, fetching enrichment sources")
+
+            await self._fetch_artwork_from_metainfo(merged_state)
 
         if not self._last_track_signature and current_signature:
             # First track detected
@@ -347,6 +352,7 @@ class CoverArtManager:
                     encoded = quote(cache_key)
                     sep = "&" if "?" in str(artwork_url) else "?"
                     artwork_url = f"{artwork_url}{sep}cache={encoded}"
+                update["image_url"] = artwork_url
                 update["entity_picture"] = artwork_url
 
         if update:
@@ -367,7 +373,7 @@ class CoverArtManager:
                 self.player._status_model.artist = merged.get("artist")
             if "album" in update:
                 self.player._status_model.album = merged.get("album")
-            if "entity_picture" in update:
+            if "image_url" in update or "entity_picture" in update:
                 image_url = merged.get("image_url")
                 self.player._status_model.entity_picture = image_url
                 self.player._status_model.cover_url = image_url
@@ -427,7 +433,7 @@ class CoverArtManager:
                     if update:
                         self._apply_metadata_update(update, source_name="getMetaInfo")
 
-            if not update.get("entity_picture"):
+            if not (update.get("image_url") or update.get("entity_picture")):
                 await self._fetch_artwork_from_getinfoex(merged_state)
         except asyncio.CancelledError:
             # Task was cancelled (new track change detected)

{pywiim-2.2.6 → pywiim-2.2.7}/pywiim/player/statemgr.py

@@ -983,11 +983,7 @@ class StateManager:
 
         # HTTP polling path: enrich artwork/metadata when missing (e.g. Arylic GetInfoEx)
         merged = self.player._state_synchronizer.get_merged_state()
-        try:
-            loop = asyncio.get_event_loop()
-            loop.create_task(self.player._coverart_mgr.enrich_metadata_on_track_change(merged))
-        except RuntimeError:
-            _LOGGER.debug("No event loop available for metadata enrichment after refresh")
+        await self.player._coverart_mgr.enrich_metadata_on_track_change(merged)
 
         # Notify callback
         if self.player._on_state_changed:

{pywiim-2.2.6 → pywiim-2.2.7}/pywiim/upnp/client.py

@@ -9,6 +9,7 @@ from __future__ import annotations
 import asyncio
 import logging
 import ssl
+from collections.abc import Callable
 from datetime import timedelta
 from typing import Any, cast
 
@@ -818,9 +819,9 @@ class UpnpClient:
 
                     parsed.update(parse_didl_metadata(track_metadata))
                 _LOGGER.debug("GetInfoEx result for %s: has_artwork=%s", self.host, bool(parsed.get("image_url")))
-                return parsed
-        except UpnpError:
-            raise
+                if parsed.get("image_url"):
+                    return parsed
+                _LOGGER.debug("GetInfoEx action for %s returned no artwork; trying raw SOAP", self.host)
         except Exception as err:
             _LOGGER.debug("GetInfoEx via async_upnp_client failed for %s: %s", self.host, err)
 
@@ -829,7 +830,7 @@ class UpnpClient:
     async def _get_info_ex_raw(
         self,
         service_type: str,
-        parse_response: Any,
+        parse_response: Callable[[str], dict[str, Any]],
     ) -> dict[str, Any]:
         """Call LinkPlay GetInfoEx via raw SOAP when SCPD does not advertise it."""
         control_url = getattr(self._av_transport_service, "control_url", None)

{pywiim-2.2.6 → pywiim-2.2.7}/pywiim/upnp/metadata.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import logging
+import re
 from html import unescape
 from typing import Any
 from urllib.parse import urlparse
@@ -10,6 +11,8 @@ from xml.etree import ElementTree as ET
 
 _LOGGER = logging.getLogger(__name__)
 
+_BARE_AMPERSAND_RE = re.compile(r"&(?!#\d+;|#x[0-9a-fA-F]+;|[A-Za-z][A-Za-z0-9]+;)")
+
 
 def is_valid_image_url(url: str | None) -> bool:
     """Return True when value is a usable HTTP/HTTPS artwork URL."""
@@ -39,7 +42,7 @@ def parse_didl_metadata(didl_xml: str, *, allow_clear: bool = False) -> dict[str
         return changes
 
     try:
-        didl_xml = unescape(didl_xml)
+        didl_xml = _BARE_AMPERSAND_RE.sub("&", unescape(didl_xml))
         root = ET.fromstring(didl_xml)
 
         namespaces = {

{pywiim-2.2.6 → pywiim-2.2.7/pywiim.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pywiim
-Version: 2.2.6
+Version: 2.2.7
 Summary: Python library for WiiM/LinkPlay device communication
 Author-email: Michael Cumming <mjcumming@gmail.com>
 License: MIT