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

Fix upload_file not seeking streams back

Browse Source 
This would cause issues in _cache_media since utils.is_image fails
in the second pass (it respects the stream's position, and the user
may rightfully pass a stream that should be read only from one pos).
This commit is contained in:
Lonami Exo 2019-03-06 09:24:50 +01:00
parent fcfebf75a3
commit 758556cd30
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
telethon/client/uploads.py
View File

@ -384,7 +384,17 @@ class UploadMethods(ButtonMethods, MessageParseMethods, UserMethods):
elif isinstance(file, bytes): elif isinstance(file, bytes):
file_size = len(file) file_size = len(file)
else: else:
file = file.read() if isinstance(file, io.IOBase) and file.seekable():
pos = file.tell()
else:
pos = None
# TODO Don't load the entire file in memory always
data = file.read()
if pos is not None:
file.seek(pos)
file = data
file_size = len(file) file_size = len(file)
# File will now either be a string or bytes # File will now either be a string or bytes