mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-10-25 02:23:04 +00:00
Code Issues Projects Releases Wiki Activity

Properly clean-up file objects when necessary instead of instantly.

Browse Source 
Fix #1770
This commit is contained in:
Rapptz
2019-03-02 05:52:22 -05:00
parent 076f9bcac7
commit 311788c7cb
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
discord/webhook.py
View File

@@ -104,26 +104,47 @@ class WebhookAdapter:
# mocks a ConnectionState for appropriate use for Message # mocks a ConnectionState for appropriate use for Message
return BaseUser(state=self.webhook._state, data=data) return BaseUser(state=self.webhook._state, data=data)
async def _wrap_coroutine_and_cleanup(self, coro, cleanup):
try:
return await coro
finally:
cleanup()
def execute_webhook(self, *, payload, wait=False, file=None, files=None): def execute_webhook(self, *, payload, wait=False, file=None, files=None):
cleanup = None
if file is not None: if file is not None:
multipart = { multipart = {
'file': file, 'file': (file.filename, file.open_file(), 'application/octet-stream'),
'payload_json': utils.to_json(payload) 'payload_json': utils.to_json(payload)
} }
data = None data = None
cleanup = file.close
elif files is not None: elif files is not None:
multipart = { multipart = {
'payload_json': utils.to_json(payload) 'payload_json': utils.to_json(payload)
} }
for i, file in enumerate(files, start=1): for i, file in enumerate(files, start=1):
multipart['file%i' % i] = file multipart['file%i' % i] = (file.filename, file.open_file(), 'application/octet-stream')
data = None data = None
def _anon():
for f in files:
f.close()
cleanup = _anon
else: else:
data = payload data = payload
multipart = None multipart = None
url = '%s?wait=%d' % (self._request_url, wait) url = '%s?wait=%d' % (self._request_url, wait)
try:
maybe_coro = self.request('POST', url, multipart=multipart, payload=data) maybe_coro = self.request('POST', url, multipart=multipart, payload=data)
finally:
if cleanup is not None:
if not asyncio.iscoroutine(maybe_coro):
cleanup()
else:
maybe_coro = self._wrap_coroutine_and_cleanup(maybe_coro, cleanup)
return self.handle_execution_response(maybe_coro, wait=wait) return self.handle_execution_response(maybe_coro, wait=wait)
class AsyncWebhookAdapter(WebhookAdapter): class AsyncWebhookAdapter(WebhookAdapter):
@@ -656,22 +677,7 @@ class Webhook:
if username: if username:
payload['username'] = username payload['username'] = username
if file is not None: return self._adapter.execute_webhook(wait=wait, file=file, files=files, payload=payload)
try:
to_pass = (file.filename, file.open_file(), 'application/octet-stream')
return self._adapter.execute_webhook(wait=wait, file=to_pass, payload=payload)
finally:
file.close()
elif files is not None:
try:
to_pass = [(file.filename, file.open_file(), 'application/octet-stream')
for file in files]
return self._adapter.execute_webhook(wait=wait, files=to_pass, payload=payload)
finally:
for file in files:
file.close()
else:
return self._adapter.execute_webhook(wait=wait, payload=payload)
def execute(self, *args, **kwargs): def execute(self, *args, **kwargs):
"""An alias for :meth:`~.Webhook.send`.""" """An alias for :meth:`~.Webhook.send`."""