LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-02-25 16:00:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Try to handle TimeoutError during file download

Browse Source
This commit is contained in:
Lonami Exo 2021-01-24 01:36:10 +01:00
parent b1d6bd564e
commit fa99f6a1af
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
telethon/client/downloads.py
View File

@ -23,6 +23,8 @@ if typing.TYPE_CHECKING:
MIN_CHUNK_SIZE = 4096 MIN_CHUNK_SIZE = 4096
MAX_CHUNK_SIZE = 512 * 1024 MAX_CHUNK_SIZE = 512 * 1024
# 2021-01-15, users reported that `errors.TimeoutError` can occur while downloading files.
TIMED_OUT_SLEEP = 1
class _DirectDownloadIter(RequestIter): class _DirectDownloadIter(RequestIter):
async def _init( async def _init(
@ -36,6 +38,7 @@ class _DirectDownloadIter(RequestIter):
self._chunk_size = chunk_size self._chunk_size = chunk_size
self._last_part = None self._last_part = None
self._msg_data = msg_data self._msg_data = msg_data
self._timed_out = False
self._exported = dc_id and self.client.session.dc_id != dc_id self._exported = dc_id and self.client.session.dc_id != dc_id
if not self._exported: if not self._exported:
@ -70,11 +73,22 @@ class _DirectDownloadIter(RequestIter):
async def _request(self): async def _request(self):
try: try:
result = await self.client._call(self._sender, self.request) result = await self.client._call(self._sender, self.request)
self._timed_out = False
if isinstance(result, types.upload.FileCdnRedirect): if isinstance(result, types.upload.FileCdnRedirect):
raise NotImplementedError # TODO Implement raise NotImplementedError # TODO Implement
else: else:
return result.bytes return result.bytes
except errors.TimeoutError as e:
if self._timed_out:
self.client._log[__name__].warning('Got two timeouts in a row while downloading file')
raise
self._timed_out = True
self.client._log[__name__].info('Got timeout while downloading file, retrying once')
await asyncio.sleep(TIMED_OUT_SLEEP)
return await self._request()
except errors.FileMigrateError as e: except errors.FileMigrateError as e:
self.client._log[__name__].info('File lives in another DC') self.client._log[__name__].info('File lives in another DC')
self._sender = await self.client._borrow_exported_sender(e.new_dc) self._sender = await self.client._borrow_exported_sender(e.new_dc)