pywiim 2.3.2__tar.gz → 2.3.3__tar.gz

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

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

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

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

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

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

{pywiim-2.3.2 → pywiim-2.3.3}/pywiim/player/__init__.py

@@ -987,12 +987,16 @@ class Player(PlayerBase):
 
     @property
     def queue_count(self) -> int | None:
-        """Total number of tracks in queue (from HTTP API plicount field)."""
+        """Total tracks in queue (HTTP plicount, or PlayQueue overlay)."""
         return self._properties.queue_count
 
     @property
     def queue_position(self) -> int | None:
-        """Current track position in queue (from HTTP API plicurr field)."""
+        """Current queue position (HTTP plicurr, or PlayQueue overlay).
+
+        Overlay is 0-based to match play_queue()/get_queue() item positions.
+        HTTP plicount/plicurr stay 0/empty on the PlayQueue path (ADR 004).
+        """
         return self._properties.queue_position
 
     @property

{pywiim-2.3.2 → pywiim-2.3.3}/pywiim/player/base.py

@@ -148,6 +148,10 @@ class PlayerBase:
         # Last played URL tracking (for media_title fallback)
         self._last_played_url: str | None = None
 
+        # PlayQueue overlay when HTTP plicount/plicurr stay empty (ADR 004)
+        self._playqueue_count: int | None = None
+        self._playqueue_position: int | None = None
+
         # Cover art cache (in-memory, keyed by URL hash)
         # Format: {url_hash: (image_bytes, content_type, timestamp)}
         self._cover_art_cache: dict[str, tuple[bytes, str, float]] = {}

{pywiim-2.3.2 → pywiim-2.3.3}/pywiim/player/media.py

@@ -8,6 +8,7 @@ from html import unescape
 from typing import TYPE_CHECKING, Any, Literal
 from xml.etree import ElementTree as ET
 
+from ..api.loop_mode import resolve_loop_mode_mapping_for_player
 from ..exceptions import WiiMError
 from ..upnp.playqueue import (
     CURRENT_QUEUE,
@@ -507,10 +508,76 @@ class MediaControl:
             },
         )
 
+    def _playqueue_loop_mode(self) -> int:
+        """PlayQueue LoopMode: 4 = play through once; map shuffle/repeat when set."""
+        try:
+            mapping = resolve_loop_mode_mapping_for_player(self.player)
+            shuffle = bool(self.player.shuffle_state)
+            repeat = (self.player.repeat_mode or "off").lower()
+            return mapping.to_loop_mode(
+                shuffle=shuffle,
+                repeat_one=repeat == "one",
+                repeat_all=repeat == "all",
+            )
+        except Exception:
+            return 4
+
+    async def _playqueue_apply_loop_mode(self) -> None:
+        """Enable PlayQueue auto-advance via SetQueueLoopMode if advertised."""
+        upnp = self.player._upnp_client
+        if not upnp or not service_has_action(upnp.play_queue, "SetQueueLoopMode"):
+            return
+        mode = self._playqueue_loop_mode()
+        try:
+            await self._playqueue_call("SetQueueLoopMode", {"LoopMode": mode})
+            _LOGGER.debug("Set PlayQueue loop mode %s on %s", mode, self.player.host)
+        except Exception as err:
+            _LOGGER.debug("SetQueueLoopMode failed on %s: %s", self.player.host, err)
+
+    def _playqueue_set_overlay(self, *, count: int | None = None, position: int | None = None) -> None:
+        if count is not None:
+            self.player._playqueue_count = count
+        if position is not None:
+            self.player._playqueue_position = position
+
+    async def _playqueue_sync_overlay(self, *, items: list[dict[str, Any]] | None = None) -> None:
+        """Refresh overlay from GetQueueIndex / BrowseQueue (ADR 004)."""
+        if items is not None:
+            self._playqueue_set_overlay(count=len(items))
+        try:
+            result = await self._playqueue_call("GetQueueIndex", {"QueueName": CURRENT_QUEUE})
+        except Exception as err:
+            _LOGGER.debug("GetQueueIndex overlay failed on %s: %s", self.player.host, err)
+            result = None
+        if result:
+            if items is None:
+                track_nums = result.get("TrackNums")
+                if track_nums is not None:
+                    try:
+                        self._playqueue_set_overlay(count=int(track_nums))
+                    except (TypeError, ValueError):
+                        pass
+            current = result.get("CurrentIndex")
+            if current is not None:
+                try:
+                    idx = int(current)
+                    # CurrentIndex is 1-based
+                    self._playqueue_set_overlay(position=max(idx - 1, 0) if idx > 0 else None)
+                except (TypeError, ValueError):
+                    pass
+        if items is None and self.player._playqueue_count is None:
+            try:
+                result = await self._playqueue_call("BrowseQueue", {"QueueName": CURRENT_QUEUE})
+                parsed = parse_queue_context((result or {}).get("QueueContext", "") or "")
+                self._playqueue_set_overlay(count=len(parsed))
+            except Exception as err:
+                _LOGGER.debug("BrowseQueue overlay failed on %s: %s", self.player.host, err)
+
     async def _playqueue_add(self, url: str, metadata: str = "") -> None:
         """Add URL to the end of CurrentQueue without starting playback."""
         await self._playqueue_ensure()
         await self._playqueue_append(url, metadata)
+        await self._playqueue_sync_overlay()
         _LOGGER.debug("Added URL to PlayQueue on %s", self.player.host)
 
     async def _playqueue_insert_next(self, url: str, metadata: str = "") -> None:
@@ -525,6 +592,7 @@ class MediaControl:
         except Exception as err:
             _LOGGER.debug("GetQueueIndex failed on %s, appending after index 1: %s", self.player.host, err)
         await self._playqueue_append(url, metadata, start_index=start_index)
+        await self._playqueue_sync_overlay()
         _LOGGER.debug("Inserted URL next in PlayQueue on %s", self.player.host)
 
     async def _playqueue_get(self) -> list[dict[str, Any]]:
@@ -535,6 +603,7 @@ class MediaControl:
             _LOGGER.debug("PlayQueue BrowseQueue empty or failed on %s: %s", self.player.host, err)
             return []
         items = parse_queue_context((result or {}).get("QueueContext", "") or "")
+        await self._playqueue_sync_overlay(items=items)
         _LOGGER.debug("Retrieved %d PlayQueue items from %s", len(items), self.player.host)
         return items
 
@@ -852,6 +921,9 @@ class MediaControl:
                     "PlayQueueWithIndex",
                     {"QueueName": CURRENT_QUEUE, "Index": queue_position + 1},
                 )
+                await self._playqueue_apply_loop_mode()
+                self._playqueue_set_overlay(position=queue_position)
+                await self._playqueue_sync_overlay()
                 _LOGGER.debug(
                     "Started PlayQueue playback at position %d on %s",
                     queue_position,
@@ -925,6 +997,7 @@ class MediaControl:
                         "Action": "",
                     },
                 )
+                await self._playqueue_sync_overlay()
                 _LOGGER.debug(
                     "Removed PlayQueue item at position %d from %s",
                     queue_position,
@@ -984,6 +1057,8 @@ class MediaControl:
         if self._use_playqueue_enqueue():
             try:
                 await self._playqueue_call("DeleteQueue", {"QueueName": CURRENT_QUEUE})
+                self.player._playqueue_count = 0
+                self.player._playqueue_position = None
                 _LOGGER.debug("Cleared PlayQueue on %s", self.player.host)
                 return
             except Exception as err:

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

@@ -480,31 +480,42 @@ class PlayerProperties:
 
         return DEFAULT_WIIM_LOGO_URL
 
-    @property
-    def queue_count(self) -> int | None:
-        """Total number of tracks in queue (from HTTP API plicount field)."""
+    def _http_queue_int(self, field: str) -> int | None:
         if self.player._status_model is None:
             return None
-        count = getattr(self.player._status_model, "queue_count", None)
-        if count is not None:
-            try:
-                return int(count)
-            except (TypeError, ValueError):
-                return None
-        return None
+        value = getattr(self.player._status_model, field, None)
+        if value is None:
+            return None
+        try:
+            return int(value)
+        except (TypeError, ValueError):
+            return None
+
+    @property
+    def queue_count(self) -> int | None:
+        """Total tracks in queue (HTTP plicount, or PlayQueue overlay)."""
+        http = self._http_queue_int("queue_count")
+        overlay = self.player._playqueue_count
+        if http:
+            return http
+        if overlay is not None:
+            return overlay
+        return http
 
     @property
     def queue_position(self) -> int | None:
-        """Current track position in queue (from HTTP API plicurr field)."""
-        if self.player._status_model is None:
-            return None
-        position = getattr(self.player._status_model, "queue_position", None)
-        if position is not None:
-            try:
-                return int(position)
-            except (TypeError, ValueError):
-                return None
-        return None
+        """Current queue position (HTTP plicurr, or PlayQueue overlay).
+
+        Overlay is 0-based to match play_queue()/get_queue() item positions.
+        HTTP plicount/plicurr stay 0/empty on the PlayQueue path (ADR 004).
+        """
+        http = self._http_queue_int("queue_position")
+        overlay = self.player._playqueue_position
+        if http:
+            return http
+        if overlay is not None:
+            return overlay
+        return http
 
     @property
     def media_sample_rate(self) -> int | None:

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

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