From d15469d2b80480e25c674989af78040340627ddd Mon Sep 17 00:00:00 2001 From: Tari <65512380+Tari-dev@users.noreply.github.com> Date: Tue, 22 Feb 2022 15:35:22 +0530 Subject: [PATCH 1/6] Close Spotify session --- pomice/spotify/client.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pomice/spotify/client.py b/pomice/spotify/client.py index 5487168..cc3cf21 100644 --- a/pomice/spotify/client.py +++ b/pomice/spotify/client.py @@ -48,6 +48,8 @@ class Client: self._bearer_token = data["access_token"] self._expiry = time.time() + (int(data["expires_in"]) - 10) self._bearer_headers = {"Authorization": f"Bearer {self._bearer_token}"} + + async def search(self, *, query: str): if not self._bearer_token or time.time() >= self._expiry: @@ -102,3 +104,7 @@ class Client: next_page_url = next_data["next"] return Playlist(data, tracks) + + async def close(self): + await self.session.close() + From 292f956bfcd694c2f21dca515a6ec537a3d02fb0 Mon Sep 17 00:00:00 2001 From: Tari <65512380+Tari-dev@users.noreply.github.com> Date: Tue, 22 Feb 2022 15:39:18 +0530 Subject: [PATCH 2/6] Close Spotify on node.disconnect --- pomice/pool.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pomice/pool.py b/pomice/pool.py index 2d4998d..672946c 100644 --- a/pomice/pool.py +++ b/pomice/pool.py @@ -256,6 +256,9 @@ class Node: """ for player in self.players.copy().values(): await player.destroy() + + if self._spotify_client: + await self._spotify_client.close() await self._websocket.close() del self._pool.nodes[self._identifier] From b43d12b2ad5993a19662e0a2376c64799295e1d6 Mon Sep 17 00:00:00 2001 From: Tari <65512380+Tari-dev@users.noreply.github.com> Date: Tue, 22 Feb 2022 15:44:33 +0530 Subject: [PATCH 3/6] Close Spotify on node.disconnect --- pomice/pool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pomice/pool.py b/pomice/pool.py index 672946c..4a7d01b 100644 --- a/pomice/pool.py +++ b/pomice/pool.py @@ -257,7 +257,7 @@ class Node: for player in self.players.copy().values(): await player.destroy() - if self._spotify_client: + if self._spotify_client_id an self._spotify_client_secret: await self._spotify_client.close() await self._websocket.close() From d0fa15267a6f63b345e299539f980abe90e0de67 Mon Sep 17 00:00:00 2001 From: Tari <65512380+Tari-dev@users.noreply.github.com> Date: Tue, 22 Feb 2022 16:48:30 +0530 Subject: [PATCH 4/6] typo --- pomice/pool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pomice/pool.py b/pomice/pool.py index 4a7d01b..121bf38 100644 --- a/pomice/pool.py +++ b/pomice/pool.py @@ -257,7 +257,7 @@ class Node: for player in self.players.copy().values(): await player.destroy() - if self._spotify_client_id an self._spotify_client_secret: + if self._spotify_client_id and self._spotify_client_secret: await self._spotify_client.close() await self._websocket.close() From 6342bd0e56b1667c0cfdeb611ecbacfea96269ee Mon Sep 17 00:00:00 2001 From: Tari <65512380+Tari-dev@users.noreply.github.com> Date: Tue, 22 Feb 2022 17:12:00 +0530 Subject: [PATCH 5/6] update pool.py --- pomice/pool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pomice/pool.py b/pomice/pool.py index 121bf38..c8bae75 100644 --- a/pomice/pool.py +++ b/pomice/pool.py @@ -262,7 +262,7 @@ class Node: await self._websocket.close() del self._pool.nodes[self._identifier] - self.available = False + self._available = False self._task.cancel() async def build_track( From c3b840db2ccafff86492eefe0fab4ac9cd542d4e Mon Sep 17 00:00:00 2001 From: Tari <65512380+Tari-dev@users.noreply.github.com> Date: Tue, 22 Feb 2022 17:13:58 +0530 Subject: [PATCH 6/6] fix a bug --- pomice/pool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pomice/pool.py b/pomice/pool.py index c8bae75..a966382 100644 --- a/pomice/pool.py +++ b/pomice/pool.py @@ -261,7 +261,7 @@ class Node: await self._spotify_client.close() await self._websocket.close() - del self._pool.nodes[self._identifier] + del self._pool._nodes[self._identifier] self._available = False self._task.cancel()