mir/pyrogram
2
0
Fork 0
mirror of https://github.com/pyrogram/pyrogram synced 2025-08-27 20:37:54 +00:00
Code Issues Releases Wiki Activity

Add file_dir parameter to client.download_media

Browse Source
This commit is contained in:
Eric Blundell 2018-03-20 07:34:38 -05:00
parent 19b1bbb942
commit 6bb004fc83
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pyrogram/client/client.py
View File

@ -510,7 +510,7 @@ class Client:
break break
try: try:
media, file_name, done, progress, path = media media, file_dir, file_name, done, progress, path = media
if isinstance(media, types.MessageMediaDocument): if isinstance(media, types.MessageMediaDocument):
document = media.document document = media.document
@ -536,6 +536,8 @@ class Client:
elif isinstance(i, types.DocumentAttributeAnimated): elif isinstance(i, types.DocumentAttributeAnimated):
file_name = file_name.replace("doc", "gif") file_name = file_name.replace("doc", "gif")
file_name = os.path.join(file_dir if file_dir is not None else '', file_name)
self.get_file( self.get_file(
dc_id=document.dc_id, dc_id=document.dc_id,
id=document.id, id=document.id,
@ -558,6 +560,8 @@ class Client:
self.rnd_id() self.rnd_id()
) )
file_name = os.path.join(file_dir if file_dir is not None else '', file_name)
photo_loc = photo.sizes[-1].location photo_loc = photo.sizes[-1].location
self.get_file( self.get_file(
@ -2614,6 +2618,7 @@ class Client:
def download_media(self, def download_media(self,
message: types.Message, message: types.Message,
file_name: str = None, file_name: str = None,
file_dir: str = 'downloads',
block: bool = True, block: bool = True,
progress: callable = None): progress: callable = None):
"""Use this method to download the media from a Message. """Use this method to download the media from a Message.
@ -2624,6 +2629,14 @@ class Client:
file_name (:obj:`str`, optional): file_name (:obj:`str`, optional):
Specify a custom *file_name* to be used instead of the one provided by Telegram. Specify a custom *file_name* to be used instead of the one provided by Telegram.
This parameter is expected to be a full file path to the location you want the
file to be placed. If not specified, the file will be put into the directory
specified by *file_dir* with a generated name.
file_dir (:obj:`str`, optional):
Specify a directory to place the file in if no *file_name* is specified.
If *file_dir* is *None*, the current working directory is used. The default
value is the "downloads" folder in the current working directory.
block (:obj:`bool`, optional): block (:obj:`bool`, optional):
Blocks the code execution until the file has been downloaded. Blocks the code execution until the file has been downloaded.
@ -2656,7 +2669,7 @@ class Client:
media = message media = message
if media is not None: if media is not None:
self.download_queue.put((media, file_name, done, progress, path)) self.download_queue.put((media, file_dir, file_name, done, progress, path))
else: else:
return return