LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-03-13 07:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Sort thumbs to ensure -1 is largest

Browse Source 
Closes #1519.
This commit is contained in:
Lonami Exo 2020-08-11 23:14:31 +02:00
parent 0cefc73448
commit e19aa44d5c
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
telethon/client/downloads.py
View File

@ -310,13 +310,20 @@ class DownloadMethods:
The parameter should be an integer index between ``0`` and The parameter should be an integer index between ``0`` and
``len(sizes)``. ``0`` will download the smallest thumbnail, ``len(sizes)``. ``0`` will download the smallest thumbnail,
and ``len(sizes) - 1`` will download the largest thumbnail. and ``len(sizes) - 1`` will download the largest thumbnail.
You can also use negative indices. You can also use negative indices, which work the same as
they do in Python's `list`.
You can also pass the :tl:`PhotoSize` instance to use. You can also pass the :tl:`PhotoSize` instance to use.
Alternatively, the thumb size type `str` may be used.
In short, use ``thumb=0`` if you want the smallest thumbnail In short, use ``thumb=0`` if you want the smallest thumbnail
and ``thumb=-1`` if you want the largest thumbnail. and ``thumb=-1`` if you want the largest thumbnail.
.. note::
The largest thumbnail may be a video instead of a photo,
as they are available since layer 116 and are bigger than
any of the photos.
Returns Returns
`None` if no media was provided, or if it was Empty. On success `None` if no media was provided, or if it was Empty. On success
the file path is returned since it may differ from the one given. the file path is returned since it may differ from the one given.
@ -630,6 +637,24 @@ class DownloadMethods:
@staticmethod @staticmethod
def _get_thumb(thumbs, thumb): def _get_thumb(thumbs, thumb):
# Seems Telegram has changed the order and put `PhotoStrippedSize`
# last while this is the smallest (layer 116). Ensure we have the
# sizes sorted correctly with a custom function.
def sort_thumbs(thumb):
if isinstance(thumb, types.PhotoStrippedSize):
return 1, len(thumb.bytes)
if isinstance(thumb, types.PhotoCachedSize):
return 1, len(thumb.bytes)
if isinstance(thumb, types.PhotoSize):
return 1, thumb.size
if isinstance(thumb, types.VideoSize):
return 2, thumb.size
# Empty size or invalid should go last
return 0, 0
thumbs = list(sorted(thumbs, key=sort_thumbs))
if thumb is None: if thumb is None:
return thumbs[-1] return thumbs[-1]
elif isinstance(thumb, int): elif isinstance(thumb, int):