pywiim 2.3.1__tar.gz → 2.3.2__tar.gz

{pywiim-2.3.1/pywiim.egg-info → pywiim-2.3.2}/PKG-INFO

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

{pywiim-2.3.1 → pywiim-2.3.2}/pyproject.toml

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

{pywiim-2.3.1 → pywiim-2.3.2}/pywiim/__init__.py

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

{pywiim-2.3.1 → pywiim-2.3.2}/pywiim/api/base.py

@@ -489,7 +489,15 @@ class BaseWiiMClient:
                     except Exception:  # noqa: BLE001
                         pass  # Device info not available, continue without it
 
-                    raise WiiMRequestError(
+                    error_cls = (
+                        WiiMConnectionError
+                        if isinstance(
+                            err,
+                            (aiohttp.ClientConnectorError, aiohttp.ServerDisconnectedError, WiiMConnectionError),
+                        )
+                        else WiiMRequestError
+                    )
+                    raise error_cls(
                         f"Request failed after {retry_count} attempts: {err}",
                         endpoint=endpoint,
                         attempts=retry_count,

{pywiim-2.3.1 → pywiim-2.3.2}/pywiim/player/properties.py

@@ -238,11 +238,22 @@ class PlayerProperties:
     # === Media Metadata ===
 
     def _status_field(self, *names: str) -> str | None:
-        """Return the first non-empty attribute from merged state or cached status."""
-        # First try merged state (combines HTTP + UPnP)
-        merged = self.player._state_synchronizer.get_merged_state()
+        """Return the first non-empty attribute from merged state or cached status.
+
+        Only fall back to the raw cached status for names the synchronizer has
+        never resolved. If it resolved a name to no value (live stream, source
+        change), that decision must not be overridden by leftover firmware
+        fields still sitting on ``_status_model`` (wiim #263).
+        """
+        state_obj = self.player._state_synchronizer.get_state_object()
+        names_unresolved_by_synchronizer: list[str] = []
         for n in names:
-            val = merged.get(n)
+            field = getattr(state_obj, n, None)
+            if field is None:
+                names_unresolved_by_synchronizer.append(n)
+                continue
+
+            val = field.value
             if val is not None:
                 # Field-aware filtering: artwork fields must be valid URLs,
                 # other metadata must be non-placeholder values.
@@ -269,11 +280,18 @@ class PlayerProperties:
                 if val not in (None, ""):
                     return str(val) if val is not None else None
 
-        # Fallback to cached status if synchronizer has no data yet
-        if self.player._status_model is None:
+        # Fallback to cached status only before the first merge. After that the
+        # raw status model is a leftover firmware snapshot and must not reopen
+        # fields the synchronizer already decided are empty (wiim #263).
+        if (
+            self.player._status_model is None
+            or not names_unresolved_by_synchronizer
+            or state_obj.http_last_update is not None
+            or state_obj.upnp_last_update is not None
+        ):
             return None
 
-        for n in names:
+        for n in names_unresolved_by_synchronizer:
             if hasattr(self.player._status_model, n):
                 val = getattr(self.player._status_model, n)
                 if n in {"image_url", "entity_picture", "cover_url"}:

{pywiim-2.3.1 → pywiim-2.3.2}/pywiim/profiles.py

@@ -520,18 +520,7 @@ def get_device_profile(device_info: DeviceInfo) -> DeviceProfile:
                 device_info.firmware,
             )
             # Return a modified profile with WiFi Direct enabled
-            return DeviceProfile(
-                vendor=profile.vendor,
-                generation=profile.generation,
-                display_name=profile.display_name,
-                loop_mode_scheme=profile.loop_mode_scheme,
-                state_sources=profile.state_sources,
-                connection=profile.connection,
-                endpoints=profile.endpoints,
-                grouping=GroupingConfig(
-                    uses_wifi_direct=True,
-                ),
-            )
+            return replace(profile, grouping=GroupingConfig(uses_wifi_direct=True))
 
         return profile
 
@@ -553,17 +542,11 @@ def get_device_profile(device_info: DeviceInfo) -> DeviceProfile:
             device_info.wmrm_version,
             device_info.firmware,
         )
-        return DeviceProfile(
-            vendor=profile.vendor,
+        return replace(
+            profile,
             generation="gen1",
             display_name=f"{profile.display_name} (Gen1)",
-            loop_mode_scheme=profile.loop_mode_scheme,
-            state_sources=profile.state_sources,
-            connection=profile.connection,
-            endpoints=profile.endpoints,
-            grouping=GroupingConfig(
-                uses_wifi_direct=True,
-            ),
+            grouping=GroupingConfig(uses_wifi_direct=True),
         )
 
     return profile

{pywiim-2.3.1 → pywiim-2.3.2}/pywiim/state.py

@@ -951,10 +951,17 @@ class StateSynchronizer:
         Firmware often keeps the previous source's metadata in getPlayerStatusEx
         (Spotify → network stream). Clearing here prevents a permanently stale track.
         """
+        now = time.time()
         for field_name in ("title", "artist", "album", "image_url", "duration"):
             self._http_state.pop(field_name, None)
             self._upnp_state.pop(field_name, None)
-            setattr(self._merged_state, field_name, None)
+            # Keep a resolved-to-None field so Player._status_field does not
+            # fall back to leftover firmware values on _status_model (#263).
+            setattr(
+                self._merged_state,
+                field_name,
+                TimestampedField(value=None, source="http", timestamp=now),
+            )
 
     def _should_clear_metadata(self) -> bool:
         """Determine if metadata should be cleared.

{pywiim-2.3.1 → pywiim-2.3.2/pywiim.egg-info}/PKG-INFO

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