mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-06-07 20:28:38 +00:00
Code Issues Projects Releases Wiki Activity

Re-add Client.wait_until_ready

Browse Source
This commit is contained in:
Rapptz 2017-01-29 20:32:37 -05:00
parent b27fab09eb
commit 8c896e9fbc
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
discord/client.py
View File

@ -120,6 +120,7 @@ class Client:
self.connection.shard_count = self.shard_count self.connection.shard_count = self.shard_count
self._closed = asyncio.Event(loop=self.loop) self._closed = asyncio.Event(loop=self.loop)
self._ready = asyncio.Event(loop=self.loop)
# if VoiceClient.warn_nacl: # if VoiceClient.warn_nacl:
# VoiceClient.warn_nacl = False # VoiceClient.warn_nacl = False
@ -149,6 +150,9 @@ class Client:
yield from self.ws.send_as_json(payload) yield from self.ws.send_as_json(payload)
def handle_ready(self):
self._ready.set()
def _resolve_invite(self, invite): def _resolve_invite(self, invite):
if isinstance(invite, Invite) or isinstance(invite, Object): if isinstance(invite, Invite) or isinstance(invite, Object):
return invite.id return invite.id
@ -189,6 +193,11 @@ class Client:
"""List[:class:`VoiceClient`]: Represents a list of voice connections.""" """List[:class:`VoiceClient`]: Represents a list of voice connections."""
return self.connection.voice_clients return self.connection.voice_clients
@property
def is_ready(self):
"""bool: Specifies if the client's internal cache is ready for use."""
return self._ready.is_set()
@asyncio.coroutine @asyncio.coroutine
def _run_event(self, coro, event_name, *args, **kwargs): def _run_event(self, coro, event_name, *args, **kwargs):
try: try:
@ -356,6 +365,10 @@ class Client:
except (ReconnectWebSocket, ResumeWebSocket) as e: except (ReconnectWebSocket, ResumeWebSocket) as e:
resume = type(e) is ResumeWebSocket resume = type(e) is ResumeWebSocket
log.info('Got ' + type(e).__name__) log.info('Got ' + type(e).__name__)
if not resume:
self._ready.clear()
self.ws = yield from DiscordWebSocket.from_client(self, shard_id=self.shard_id, self.ws = yield from DiscordWebSocket.from_client(self, shard_id=self.shard_id,
session=self.ws.session_id, session=self.ws.session_id,
sequence=self.ws.sequence, sequence=self.ws.sequence,
@ -389,6 +402,7 @@ class Client:
yield from self.http.close() yield from self.http.close()
self._closed.set() self._closed.set()
self._ready.clear()
@asyncio.coroutine @asyncio.coroutine
def start(self, *args, **kwargs): def start(self, *args, **kwargs):
@ -513,6 +527,14 @@ class Client:
# listeners/waiters # listeners/waiters
@asyncio.coroutine
def wait_until_ready(self):
"""|coro|
Waits until the client's internal cache is all ready.
"""
yield from self._ready.wait()
def wait_for(self, event, *, check=None, timeout=None): def wait_for(self, event, *, check=None, timeout=None):
"""|coro| """|coro|

2
examples/background_task.py
View File

@ -15,7 +15,7 @@ class MyClient(discord.Client):
print('------') print('------')
async def my_background_task(self): async def my_background_task(self):
await self.wait_for('ready') await self.wait_until_ready()
counter = 0 counter = 0
channel = self.get_channel(1234567) # channel ID goes here channel = self.get_channel(1234567) # channel ID goes here
while not self.is_closed: while not self.is_closed: