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

Make sure file_dir is created

Browse Source
This commit is contained in:
Eric Blundell 2018-03-20 08:05:41 -05:00
parent b9f623921d
commit 4ae9a5ad38
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pyrogram/client/client.py
View File

@ -512,6 +512,10 @@ class Client:
try: try:
media, file_dir, file_name, done, progress, path = media media, file_dir, file_name, done, progress, path = media
if file_dir is not None:
# Make file_dir if it was specified
os.makedirs(file_dir, exist_ok=True)
if isinstance(media, types.MessageMediaDocument): if isinstance(media, types.MessageMediaDocument):
document = media.document document = media.document
@ -2620,7 +2624,8 @@ class Client:
file_name: str = None, file_name: str = None,
file_dir: str = 'downloads', 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.
Args: Args:
@ -2636,7 +2641,8 @@ class Client:
file_dir (:obj:`str`, optional): file_dir (:obj:`str`, optional):
Specify a directory to place the file in if no *file_name* is specified. 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 If *file_dir* is *None*, the current working directory is used. The default
value is the "downloads" folder in the current working directory. value is the "downloads" folder in the current working directory. The
directory tree will be created if it does not exist.
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.
@ -2658,6 +2664,7 @@ class Client:
Raises: Raises:
:class:`pyrogram.Error` :class:`pyrogram.Error`
:class:`ValueError` if both file_name and file_dir are specified.
""" """
if file_name is not None and file_dir is not None: if file_name is not None and file_dir is not None:
@ -2685,6 +2692,7 @@ class Client:
def download_photo(self, def download_photo(self,
photo: types.Photo or types.UserProfilePhoto or types.ChatPhoto, photo: types.Photo or types.UserProfilePhoto or types.ChatPhoto,
file_name: str = None, file_name: str = None,
file_dir: str = None,
block: bool = True): block: bool = True):
"""Use this method to download a photo not contained inside a Message. """Use this method to download a photo not contained inside a Message.
For example, a photo of a User or a Chat/Channel. For example, a photo of a User or a Chat/Channel.
@ -2696,7 +2704,16 @@ class Client:
The photo object. The photo object.
file_name (:obj:`str`, optional): file_name (:obj:`str`, optional):
Specify a custom *file_name* to be used. 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
photo to be placed. If not specified, the photo 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 photo 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. The
directory tree will be created if it does not exist.
block (:obj:`bool`, optional): block (:obj:`bool`, optional):
Blocks the code execution until the photo has been downloaded. Blocks the code execution until the photo has been downloaded.
@ -2722,7 +2739,7 @@ class Client:
)] )]
) )
return self.download_media(photo, file_name, block) return self.download_media(photo, file_name, file_dir, block)
def add_contacts(self, contacts: list): def add_contacts(self, contacts: list):
"""Use this method to add contacts to your Telegram address book. """Use this method to add contacts to your Telegram address book.