feat: update state of players

ooliver1 · Oct 22, 2022 · 6bce46e · 6bce46e
1 parent 6663cf4
commit 6bce46e
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 8 deletions.
diff --git a/mafic/node.py b/mafic/node.py
@@ -257,7 +257,9 @@ async def _handle_msg(self, data: IncomingMessage) -> None:
                 _log.error(
                     "Could not find player for guild %s, discarding event.", guild_id
                 )
+                return
 
+            player.update_state(data["state"])
             # TODO: update player
         elif data["op"] == "stats":
             # TODO

diff --git a/mafic/player.py b/mafic/player.py
@@ -20,12 +20,27 @@
         VoiceServerUpdatePayload,
     )
     from .node import Node
+    from .typings import PlayerUpdateState
 
 
 _log = getLogger(__name__)
 
 
 class Player(VoiceProtocol):
+    __slots__ = (
+        "_connected",
+        "_guild_id",
+        "_last_update",
+        "_node",
+        "_ping",
+        "_position",
+        "_server_state",
+        "_session_id",
+        "channel",
+        "client",
+        "guild",
+    )
+
     def __init__(
         self,
         client: Client,
@@ -47,11 +62,39 @@ def __init__(
         self._session_id: str | None = None
         self._server_state: VoiceServerUpdatePayload | None = None
         self._connected: bool = False
+        self._position: int = 0
+        self._last_update: int = 0
+        self._ping = 0
 
     @property
     def connected(self) -> bool:
         return self._connected
 
+    @property
+    def position(self) -> int:
+        return self._position
+
+    @property
+    def ping(self) -> int:
+        return self._ping
+
+    @property
+    def node(self) -> Node:
+        if self._node is None:
+            _log.warning(
+                "Unable to use best node, player not connected, finding random node.",
+                extra={"guild": self._guild_id},
+            )
+            return NodePool.get_random_node()
+
+        return self._node
+
+    def update_state(self, state: PlayerUpdateState) -> None:
+        self._last_update = state["time"]
+        self._position = state.get("position", 0)
+        self._connected = state["connected"]
+        self._ping = state["ping"]
+
     # If people are so in love with the VoiceClient interface
     def is_connected(self):
         return self._connected
@@ -151,14 +194,7 @@ async def destroy(self) -> None:
     async def fetch_tracks(
         self, query: str, search_type: SearchType | str = SearchType.YOUTUBE
     ) -> list[Track] | Playlist | None:
-        if self._node is None:
-            _log.warning(
-                "Unable to use best node, player not connected, finding random node.",
-                extra={"guild": self._guild_id},
-            )
-            node = NodePool.get_random_node()
-        else:
-            node = self._node
+        node = self.node
 
         raw_type: str
         if isinstance(search_type, SearchType):

diff --git a/mafic/typings/incoming.py b/mafic/typings/incoming.py
@@ -14,8 +14,12 @@
     from .misc import FriendlyWithCause
 
 __all__ = (
+    "CPU",
     "EventPayload",
+    "FrameStats",
+    "Memory",
     "PlayerUpdatePayload",
+    "PlayerUpdateState",
     "StatsPayload",
     "IncomingMessage",
     "TrackEndEvent",