From f6a0f5f979a8ea58ea22f7f8d7c95a85d4dfc5a0 Mon Sep 17 00:00:00 2001 From: blank X Date: Fri, 14 May 2021 06:11:54 +0000 Subject: [PATCH] Make offset divisible by limit (#3042) --- telethon/client/downloads.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/telethon/client/downloads.py b/telethon/client/downloads.py index f76129ee..1bce3062 100644 --- a/telethon/client/downloads.py +++ b/telethon/client/downloads.py @@ -142,12 +142,12 @@ class _DirectDownloadIter(RequestIter): class _GenericDownloadIter(_DirectDownloadIter): - async def _load_next_chunk(self, mask=MIN_CHUNK_SIZE - 1): + async def _load_next_chunk(self): # 1. Fetch enough for one chunk data = b'' # 1.1. ``bad`` is how much into the data we have we need to offset - bad = self.request.offset & mask + bad = self.request.offset % self.request.limit before = self.request.offset # 1.2. We have to fetch from a valid offset, so remove that bad part @@ -702,7 +702,8 @@ class DownloadMethods: if chunk_size == request_size \ and offset % MIN_CHUNK_SIZE == 0 \ - and stride % MIN_CHUNK_SIZE == 0: + and stride % MIN_CHUNK_SIZE == 0 \ + and offset % limit == 0: cls = _DirectDownloadIter self._log[__name__].info('Starting direct file download in chunks of ' '%d at %d, stride %d', request_size, offset, stride)