Xtao-Labs/MTPyroger
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Dan 2020-07-09 00:20:46 +02:00
parent 6b2d6ffacf
commit 4a8e6fb855
12 changed files with 216 additions and 544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
pyrogram/client/client.py
View File

@ -15,7 +15,7 @@
# #
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import io
import logging import logging
import math import math
import os import os
@ -1231,9 +1231,9 @@ class Client(Methods, BaseClient):
temp_file_path = "" temp_file_path = ""
final_file_path = "" final_file_path = ""
path = [None]
try: try:
data, done, progress, progress_args, out, path, to_file = packet data, directory, file_name, done, progress, progress_args, path = packet
temp_file_path = self.get_file( temp_file_path = self.get_file(
media_type=data.media_type, media_type=data.media_type,
@ -1250,15 +1250,13 @@ class Client(Methods, BaseClient):
file_size=data.file_size, file_size=data.file_size,
is_big=data.is_big, is_big=data.is_big,
progress=progress, progress=progress,
progress_args=progress_args, progress_args=progress_args
out=out
) )
if to_file:
final_file_path = out.name if temp_file_path:
else: final_file_path = os.path.abspath(re.sub("\\\\", "/", os.path.join(directory, file_name)))
final_file_path = '' os.makedirs(directory, exist_ok=True)
if to_file: shutil.move(temp_file_path, final_file_path)
out.close()
except Exception as e: except Exception as e:
log.error(e, exc_info=True) log.error(e, exc_info=True)
@ -1715,7 +1713,7 @@ class Client(Methods, BaseClient):
def save_file( def save_file(
self, self,
path: Union[str, io.IOBase], path: str,
file_id: int = None, file_id: int = None,
file_part: int = 0, file_part: int = 0,
progress: callable = None, progress: callable = None,
@ -1767,20 +1765,9 @@ class Client(Methods, BaseClient):
Raises: Raises:
RPCError: In case of a Telegram RPC error. RPCError: In case of a Telegram RPC error.
ValueError: if path is not str or file-like readable object
""" """
part_size = 512 * 1024 part_size = 512 * 1024
if isinstance(path, str): file_size = os.path.getsize(path)
fp = open(path, 'rb')
filename = os.path.basename(path)
elif hasattr(path, 'write'):
fp = path
filename = fp.name
else:
raise ValueError("Invalid path passed! Pass file pointer or path to file")
fp.seek(0, os.SEEK_END)
file_size = fp.tell()
fp.seek(0)
if file_size == 0: if file_size == 0:
raise ValueError("File size equals to 0 B") raise ValueError("File size equals to 0 B")
@ -1798,10 +1785,11 @@ class Client(Methods, BaseClient):
session.start() session.start()
try: try:
fp.seek(part_size * file_part) with open(path, "rb") as f:
f.seek(part_size * file_part)
while True: while True:
chunk = fp.read(part_size) chunk = f.read(part_size)
if not chunk: if not chunk:
if not is_big: if not is_big:
@ -1839,33 +1827,25 @@ class Client(Methods, BaseClient):
if progress: if progress:
progress(min(file_part * part_size, file_size), file_size, *progress_args) progress(min(file_part * part_size, file_size), file_size, *progress_args)
except Client.StopTransmission: except Client.StopTransmission:
if isinstance(path, str):
fp.close()
raise raise
except Exception as e: except Exception as e:
if isinstance(path, str):
fp.close()
log.error(e, exc_info=True) log.error(e, exc_info=True)
else: else:
if isinstance(path, str):
fp.close()
if is_big: if is_big:
return types.InputFileBig( return types.InputFileBig(
id=file_id, id=file_id,
parts=file_total_parts, parts=file_total_parts,
name=filename, name=os.path.basename(path),
) )
else: else:
return types.InputFile( return types.InputFile(
id=file_id, id=file_id,
parts=file_total_parts, parts=file_total_parts,
name=filename, name=os.path.basename(path),
md5_checksum=md5_sum md5_checksum=md5_sum
) )
finally: finally:
if isinstance(path, str):
fp.close()
session.stop() session.stop()
def get_file( def get_file(
@ -1884,8 +1864,7 @@ class Client(Methods, BaseClient):
file_size: int, file_size: int,
is_big: bool, is_big: bool,
progress: callable, progress: callable,
progress_args: tuple = (), progress_args: tuple = ()
out: io.IOBase = None
) -> str: ) -> str:
with self.media_sessions_lock: with self.media_sessions_lock:
session = self.media_sessions.get(dc_id, None) session = self.media_sessions.get(dc_id, None)
@ -1971,10 +1950,7 @@ class Client(Methods, BaseClient):
limit = 1024 * 1024 limit = 1024 * 1024
offset = 0 offset = 0
file_name = "" file_name = ""
if not out:
f = tempfile.NamedTemporaryFile("wb", delete=False)
else:
f = out
try: try:
r = session.send( r = session.send(
functions.upload.GetFile( functions.upload.GetFile(
@ -1985,7 +1961,7 @@ class Client(Methods, BaseClient):
) )
if isinstance(r, types.upload.File): if isinstance(r, types.upload.File):
if hasattr(f, "name"): with tempfile.NamedTemporaryFile("wb", delete=False) as f:
file_name = f.name file_name = f.name
while True: while True:
@ -2000,7 +1976,6 @@ class Client(Methods, BaseClient):
if progress: if progress:
progress( progress(
min(offset, file_size) min(offset, file_size)
if file_size != 0 if file_size != 0
else offset, else offset,
@ -2028,7 +2003,7 @@ class Client(Methods, BaseClient):
self.media_sessions[r.dc_id] = cdn_session self.media_sessions[r.dc_id] = cdn_session
try: try:
if hasattr(f, "name"): with tempfile.NamedTemporaryFile("wb", delete=False) as f:
file_name = f.name file_name = f.name
while True: while True:
@ -2083,7 +2058,6 @@ class Client(Methods, BaseClient):
if progress: if progress:
progress( progress(
min(offset, file_size) min(offset, file_size)
if file_size != 0 if file_size != 0
else offset, else offset,
@ -2100,7 +2074,6 @@ class Client(Methods, BaseClient):
log.error(e, exc_info=True) log.error(e, exc_info=True)
try: try:
if out:
os.remove(file_name) os.remove(file_name)
except OSError: except OSError:
pass pass

13
pyrogram/client/methods/messages/download_media.py
View File

@ -17,9 +17,7 @@
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import binascii import binascii
import io
import os import os
import re
import struct import struct
import time import time
from datetime import datetime from datetime import datetime
@ -39,7 +37,6 @@ class DownloadMedia(BaseClient):
message: Union["pyrogram.Message", str], message: Union["pyrogram.Message", str],
file_ref: str = None, file_ref: str = None,
file_name: str = DEFAULT_DOWNLOAD_DIR, file_name: str = DEFAULT_DOWNLOAD_DIR,
out: io.IOBase = None,
block: bool = True, block: bool = True,
progress: callable = None, progress: callable = None,
progress_args: tuple = () progress_args: tuple = ()
@ -61,9 +58,6 @@ class DownloadMedia(BaseClient):
You can also specify a path for downloading files in a custom location: paths that end with "/" You can also specify a path for downloading files in a custom location: paths that end with "/"
are considered directories. All non-existent folders will be created automatically. are considered directories. All non-existent folders will be created automatically.
out (``io.IOBase``, *optional*):
A custom *file-like object* to be used when downloading file. Overrides file_name
block (``bool``, *optional*): block (``bool``, *optional*):
Blocks the code execution until the file has been downloaded. Blocks the code execution until the file has been downloaded.
Defaults to True. Defaults to True.
@ -244,13 +238,6 @@ class DownloadMedia(BaseClient):
extension extension
) )
if not out:
out = open(os.path.abspath(re.sub("\\\\", "/", os.path.join(directory, file_name))), 'wb')
os.makedirs(directory, exist_ok=True)
to_file = True
else:
to_file = False
self.download_queue.put((data, done, progress, progress_args, out, path, to_file))
# Cast to string because Path objects aren't supported by Python 3.5 # Cast to string because Path objects aren't supported by Python 3.5
self.download_queue.put((data, str(directory), str(file_name), done, progress, progress_args, path)) self.download_queue.put((data, str(directory), str(file_name), done, progress, progress_args, path))

153
pyrogram/client/methods/messages/send_animated_sticker.py
View File

@ -1,153 +0,0 @@
# Pyrogram - Telegram MTProto API Client Library for Python
# Copyright (C) 2017-2019 Dan Tès <https://github.com/delivrance>
#
# This file is part of Pyrogram.
#
# Pyrogram is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published
# by the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Pyrogram is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import io
import os
from typing import Union
import pyrogram
from pyrogram.api import functions, types
from pyrogram.client.ext import BaseClient, utils
from pyrogram.errors import FilePartMissing
class SendAnimatedSticker(BaseClient):
def send_animated_sticker(
self,
chat_id: Union[int, str],
animated_sticker: Union[str, io.IOBase],
disable_notification: bool = None,
reply_to_message_id: int = None,
reply_markup: Union[
"pyrogram.InlineKeyboardMarkup",
"pyrogram.ReplyKeyboardMarkup",
"pyrogram.ReplyKeyboardRemove",
"pyrogram.ForceReply"
] = None,
progress: callable = None,
progress_args: tuple = ()
) -> Union["pyrogram.Message", None]:
"""Send .tgs animated stickers.
Parameters:
chat_id (``int`` | ``str``):
Unique identifier (int) or username (str) of the target chat.
For your personal cloud (Saved Messages) you can simply use "me" or "self".
For a contact that exists in your Telegram address book you can use his phone number (str).
animated_sticker (``str`` | file-like object):
Animated sticker to send.
Pass a file_id as string to send a animated sticker that exists on the Telegram servers,
pass an HTTP URL as a string for Telegram to get a .webp animated sticker file from the Internet, or
pass a file path as string to upload a new animated sticker that exists on your local machine.
pass a readable file-like object with .name
disable_notification (``bool``, *optional*):
Sends the message silently.
Users will receive a notification with no sound.
reply_to_message_id (``int``, *optional*):
If the message is a reply, ID of the original message.
reply_markup (:obj:`InlineKeyboardMarkup` | :obj:`ReplyKeyboardMarkup` | :obj:`ReplyKeyboardRemove` | :obj:`ForceReply`, *optional*):
Additional interface options. An object for an inline keyboard, custom reply keyboard,
instructions to remove reply keyboard or to force a reply from the user.
progress (``callable``, *optional*):
Pass a callback function to view the upload progress.
The function must take *(client, current, total, \*args)* as positional arguments (look at the section
below for a detailed description).
progress_args (``tuple``, *optional*):
Extra custom arguments for the progress callback function. Useful, for example, if you want to pass
a chat_id and a message_id in order to edit a message with the updated progress.
Other Parameters:
client (:obj:`Client`):
The Client itself, useful when you want to call other API methods inside the callback function.
current (``int``):
The amount of bytes uploaded so far.
total (``int``):
The size of the file.
*args (``tuple``, *optional*):
Extra custom arguments as defined in the *progress_args* parameter.
You can either keep *\*args* or add every single extra argument in your function signature.
Returns:
:obj:`Message` | ``None``: On success, the sent animated sticker message is returned, otherwise, in case the
upload is deliberately stopped with :meth:`~Client.stop_transmission`, None is returned.
Raises:
RPCError: In case of a Telegram RPC error.
"""
file = None
try:
if isinstance(animated_sticker, str):
if os.path.exists(animated_sticker):
file = self.save_file(animated_sticker, progress=progress, progress_args=progress_args)
media = types.InputMediaUploadedDocument(
mime_type=self.guess_mime_type(animated_sticker) or "application/x-tgsticker",
file=file,
attributes=[
types.DocumentAttributeFilename(file_name=os.path.basename(animated_sticker))
]
)
elif animated_sticker.startswith("http"):
media = types.InputMediaDocumentExternal(
url=animated_sticker
)
else:
media = utils.get_input_media_from_file_id(animated_sticker, 5)
elif hasattr(animated_sticker, "read"):
file = self.save_file(animated_sticker, progress=progress, progress_args=progress_args)
media = types.InputMediaUploadedDocument(
mime_type=self.guess_mime_type(animated_sticker.name) or "application/x-tgsticker",
file=file,
attributes=[
types.DocumentAttributeFilename(file_name=animated_sticker.name)
]
)
while True:
try:
r = self.send(
functions.messages.SendMedia(
peer=self.resolve_peer(chat_id),
media=media,
silent=disable_notification or None,
reply_to_msg_id=reply_to_message_id,
random_id=self.rnd_id(),
reply_markup=reply_markup.write() if reply_markup else None,
message=""
)
)
except FilePartMissing as e:
self.save_file(animated_sticker, file_id=file.id, file_part=e.x)
else:
for i in r.updates:
if isinstance(i, (types.UpdateNewMessage, types.UpdateNewChannelMessage)):
return pyrogram.Message._parse(
self, i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats}
)
except BaseClient.StopTransmission:
return None

27
pyrogram/client/methods/messages/send_animation.py
View File

@ -15,7 +15,7 @@
# #
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import io
import os import os
from typing import Union from typing import Union
@ -29,7 +29,6 @@ class SendAnimation(BaseClient):
def send_animation( def send_animation(
self, self,
chat_id: Union[int, str], chat_id: Union[int, str],
animation: Union[str, io.IOBase],
animation: str, animation: str,
file_ref: str = None, file_ref: str = None,
caption: str = "", caption: str = "",
@ -60,13 +59,11 @@ class SendAnimation(BaseClient):
For your personal cloud (Saved Messages) you can simply use "me" or "self". For your personal cloud (Saved Messages) you can simply use "me" or "self".
For a contact that exists in your Telegram address book you can use his phone number (str). For a contact that exists in your Telegram address book you can use his phone number (str).
animation (``str``| file-like object): animation (``str``):
Animation to send. Animation to send.
Pass a file_id as string to send an animation that exists on the Telegram servers, Pass a file_id as string to send an animation that exists on the Telegram servers,
pass an HTTP URL as a string for Telegram to get an animation from the Internet, or pass an HTTP URL as a string for Telegram to get an animation from the Internet, or
pass a file path as string to upload a new animation that exists on your local machine. pass a file path as string to upload a new animation that exists on your local machine.
pass a readable file-like object with .name
file_ref (``str``, *optional*): file_ref (``str``, *optional*):
A valid file reference obtained by a recently fetched media message. A valid file reference obtained by a recently fetched media message.
@ -166,7 +163,6 @@ class SendAnimation(BaseClient):
file = None file = None
try: try:
if isinstance(animation, str):
if os.path.exists(animation): if os.path.exists(animation):
thumb = None if thumb is None else self.save_file(thumb) thumb = None if thumb is None else self.save_file(thumb)
file = self.save_file(animation, progress=progress, progress_args=progress_args) file = self.save_file(animation, progress=progress, progress_args=progress_args)
@ -191,24 +187,7 @@ class SendAnimation(BaseClient):
) )
else: else:
media = utils.get_input_media_from_file_id(animation, file_ref, 10) media = utils.get_input_media_from_file_id(animation, file_ref, 10)
elif hasattr(animation, "read"):
thumb = None if thumb is None else self.save_file(thumb)
file = self.save_file(animation, progress=progress, progress_args=progress_args)
media = types.InputMediaUploadedDocument(
mime_type=self.guess_mime_type(animation.name) or "video/mp4",
file=file,
thumb=thumb,
attributes=[
types.DocumentAttributeVideo(
supports_streaming=True,
duration=duration,
w=width,
h=height
),
types.DocumentAttributeFilename(file_name=animation.name),
types.DocumentAttributeAnimated()
]
)
while True: while True:
try: try:
r = self.send( r = self.send(

23
pyrogram/client/methods/messages/send_audio.py
View File

@ -15,7 +15,7 @@
# #
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import io
import os import os
from typing import Union from typing import Union
@ -29,7 +29,6 @@ class SendAudio(BaseClient):
def send_audio( def send_audio(
self, self,
chat_id: Union[int, str], chat_id: Union[int, str],
audio: Union[str, io.IOBase],
audio: str, audio: str,
file_ref: str = None, file_ref: str = None,
caption: str = "", caption: str = "",
@ -61,12 +60,11 @@ class SendAudio(BaseClient):
For your personal cloud (Saved Messages) you can simply use "me" or "self". For your personal cloud (Saved Messages) you can simply use "me" or "self".
For a contact that exists in your Telegram address book you can use his phone number (str). For a contact that exists in your Telegram address book you can use his phone number (str).
audio (``str``, file-like object): audio (``str``):
Audio file to send. Audio file to send.
Pass a file_id as string to send an audio file that exists on the Telegram servers, Pass a file_id as string to send an audio file that exists on the Telegram servers,
pass an HTTP URL as a string for Telegram to get an audio file from the Internet, or pass an HTTP URL as a string for Telegram to get an audio file from the Internet, or
pass a file path as string to upload a new audio file that exists on your local machine. pass a file path as string to upload a new audio file that exists on your local machine.
pass a readable file-like object with .name
file_ref (``str``, *optional*): file_ref (``str``, *optional*):
A valid file reference obtained by a recently fetched media message. A valid file reference obtained by a recently fetched media message.
@ -165,7 +163,6 @@ class SendAudio(BaseClient):
file = None file = None
try: try:
if isinstance(audio, str):
if os.path.exists(audio): if os.path.exists(audio):
thumb = None if thumb is None else self.save_file(thumb) thumb = None if thumb is None else self.save_file(thumb)
file = self.save_file(audio, progress=progress, progress_args=progress_args) file = self.save_file(audio, progress=progress, progress_args=progress_args)
@ -188,22 +185,6 @@ class SendAudio(BaseClient):
) )
else: else:
media = utils.get_input_media_from_file_id(audio, file_ref, 9) media = utils.get_input_media_from_file_id(audio, file_ref, 9)
elif hasattr(audio, "read"):
thumb = None if thumb is None else self.save_file(thumb)
file = self.save_file(audio, progress=progress, progress_args=progress_args)
media = types.InputMediaUploadedDocument(
mime_type=self.guess_mime_type(audio.name) or "audio/mpeg",
file=file,
thumb=thumb,
attributes=[
types.DocumentAttributeAudio(
duration=duration,
performer=performer,
title=title
),
types.DocumentAttributeFilename(file_name=os.path.basename(audio.name))
]
)
while True: while True:
try: try:

19
pyrogram/client/methods/messages/send_document.py
View File

@ -15,7 +15,7 @@
# #
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import io
import os import os
from typing import Union from typing import Union
@ -29,7 +29,6 @@ class SendDocument(BaseClient):
def send_document( def send_document(
self, self,
chat_id: Union[int, str], chat_id: Union[int, str],
document: Union[str, io.IOBase],
document: str, document: str,
file_ref: str = None, file_ref: str = None,
thumb: str = None, thumb: str = None,
@ -56,13 +55,11 @@ class SendDocument(BaseClient):
For your personal cloud (Saved Messages) you can simply use "me" or "self". For your personal cloud (Saved Messages) you can simply use "me" or "self".
For a contact that exists in your Telegram address book you can use his phone number (str). For a contact that exists in your Telegram address book you can use his phone number (str).
document (``str`` | file-like object): document (``str``):
File to send. File to send.
Pass a file_id as string to send a file that exists on the Telegram servers, Pass a file_id as string to send a file that exists on the Telegram servers,
pass an HTTP URL as a string for Telegram to get a file from the Internet, or pass an HTTP URL as a string for Telegram to get a file from the Internet, or
pass a file path as string to upload a new file that exists on your local machine. pass a file path as string to upload a new file that exists on your local machine.
pass a readable file-like object with .name
file_ref (``str``, *optional*): file_ref (``str``, *optional*):
A valid file reference obtained by a recently fetched media message. A valid file reference obtained by a recently fetched media message.
@ -146,7 +143,6 @@ class SendDocument(BaseClient):
file = None file = None
try: try:
if isinstance(document, str):
if os.path.exists(document): if os.path.exists(document):
thumb = None if thumb is None else self.save_file(thumb) thumb = None if thumb is None else self.save_file(thumb)
file = self.save_file(document, progress=progress, progress_args=progress_args) file = self.save_file(document, progress=progress, progress_args=progress_args)
@ -164,17 +160,6 @@ class SendDocument(BaseClient):
) )
else: else:
media = utils.get_input_media_from_file_id(document, file_ref, 5) media = utils.get_input_media_from_file_id(document, file_ref, 5)
else:
thumb = None if thumb is None else self.save_file(thumb)
file = self.save_file(document, progress=progress, progress_args=progress_args)
media = types.InputMediaUploadedDocument(
mime_type=self.guess_mime_type(document.name) or "application/zip",
file=file,
thumb=thumb,
attributes=[
types.DocumentAttributeFilename(file_name=document.name)
]
)
while True: while True:
try: try:

13
pyrogram/client/methods/messages/send_photo.py
View File

@ -15,7 +15,7 @@
# #
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import io
import os import os
from typing import Union from typing import Union
@ -29,7 +29,6 @@ class SendPhoto(BaseClient):
def send_photo( def send_photo(
self, self,
chat_id: Union[int, str], chat_id: Union[int, str],
photo: Union[str, io.IOBase],
photo: str, photo: str,
file_ref: str = None, file_ref: str = None,
caption: str = "", caption: str = "",
@ -55,12 +54,11 @@ class SendPhoto(BaseClient):
For your personal cloud (Saved Messages) you can simply use "me" or "self". For your personal cloud (Saved Messages) you can simply use "me" or "self".
For a contact that exists in your Telegram address book you can use his phone number (str). For a contact that exists in your Telegram address book you can use his phone number (str).
photo (``str`` | file-like object): photo (``str``):
Photo to send. Photo to send.
Pass a file_id as string to send a photo that exists on the Telegram servers, Pass a file_id as string to send a photo that exists on the Telegram servers,
pass an HTTP URL as a string for Telegram to get a photo from the Internet, or pass an HTTP URL as a string for Telegram to get a photo from the Internet, or
pass a file path as string to upload a new photo that exists on your local machine. pass a file path as string to upload a new photo that exists on your local machine.
pass a readable file-like object with .name
file_ref (``str``, *optional*): file_ref (``str``, *optional*):
A valid file reference obtained by a recently fetched media message. A valid file reference obtained by a recently fetched media message.
@ -139,7 +137,6 @@ class SendPhoto(BaseClient):
file = None file = None
try: try:
if isinstance(photo, str):
if os.path.exists(photo): if os.path.exists(photo):
file = self.save_file(photo, progress=progress, progress_args=progress_args) file = self.save_file(photo, progress=progress, progress_args=progress_args)
media = types.InputMediaUploadedPhoto( media = types.InputMediaUploadedPhoto(
@ -153,12 +150,6 @@ class SendPhoto(BaseClient):
) )
else: else:
media = utils.get_input_media_from_file_id(photo, file_ref, 2) media = utils.get_input_media_from_file_id(photo, file_ref, 2)
elif hasattr(photo, "read"):
file = self.save_file(photo, progress=progress, progress_args=progress_args)
media = types.InputMediaUploadedPhoto(
file=file,
ttl_seconds=ttl_seconds
)
while True: while True:
try: try:

16
pyrogram/client/methods/messages/send_sticker.py
View File

@ -15,7 +15,7 @@
# #
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import io
import os import os
from typing import Union from typing import Union
@ -29,7 +29,6 @@ class SendSticker(BaseClient):
def send_sticker( def send_sticker(
self, self,
chat_id: Union[int, str], chat_id: Union[int, str],
sticker: Union[str, io.IOBase],
sticker: str, sticker: str,
file_ref: str = None, file_ref: str = None,
disable_notification: bool = None, disable_notification: bool = None,
@ -52,12 +51,11 @@ class SendSticker(BaseClient):
For your personal cloud (Saved Messages) you can simply use "me" or "self". For your personal cloud (Saved Messages) you can simply use "me" or "self".
For a contact that exists in your Telegram address book you can use his phone number (str). For a contact that exists in your Telegram address book you can use his phone number (str).
sticker (``str`` | file-like object): sticker (``str``):
Sticker to send. Sticker to send.
Pass a file_id as string to send a sticker that exists on the Telegram servers, Pass a file_id as string to send a sticker that exists on the Telegram servers,
pass an HTTP URL as a string for Telegram to get a .webp sticker file from the Internet, or pass an HTTP URL as a string for Telegram to get a .webp sticker file from the Internet, or
pass a file path as string to upload a new sticker that exists on your local machine. pass a file path as string to upload a new sticker that exists on your local machine.
pass a readable file-like object with .name
file_ref (``str``, *optional*): file_ref (``str``, *optional*):
A valid file reference obtained by a recently fetched media message. A valid file reference obtained by a recently fetched media message.
@ -115,7 +113,6 @@ class SendSticker(BaseClient):
file = None file = None
try: try:
if isinstance(sticker, str):
if os.path.exists(sticker): if os.path.exists(sticker):
file = self.save_file(sticker, progress=progress, progress_args=progress_args) file = self.save_file(sticker, progress=progress, progress_args=progress_args)
media = types.InputMediaUploadedDocument( media = types.InputMediaUploadedDocument(
@ -131,15 +128,6 @@ class SendSticker(BaseClient):
) )
else: else:
media = utils.get_input_media_from_file_id(sticker, file_ref, 8) media = utils.get_input_media_from_file_id(sticker, file_ref, 8)
elif hasattr(sticker, "read"):
file = self.save_file(sticker, progress=progress, progress_args=progress_args)
media = types.InputMediaUploadedDocument(
mime_type=self.guess_mime_type(sticker.name) or "image/webp",
file=file,
attributes=[
types.DocumentAttributeFilename(file_name=sticker.name)
]
)
while True: while True:
try: try:

24
pyrogram/client/methods/messages/send_video.py
View File

@ -15,7 +15,7 @@
# #
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import io
import os import os
from typing import Union from typing import Union
@ -29,7 +29,6 @@ class SendVideo(BaseClient):
def send_video( def send_video(
self, self,
chat_id: Union[int, str], chat_id: Union[int, str],
video: Union[str, io.IOBase],
video: str, video: str,
file_ref: str = None, file_ref: str = None,
caption: str = "", caption: str = "",
@ -60,12 +59,11 @@ class SendVideo(BaseClient):
For your personal cloud (Saved Messages) you can simply use "me" or "self". For your personal cloud (Saved Messages) you can simply use "me" or "self".
For a contact that exists in your Telegram address book you can use his phone number (str). For a contact that exists in your Telegram address book you can use his phone number (str).
video (``str`` | file-like object): video (``str``):
Video to send. Video to send.
Pass a file_id as string to send a video that exists on the Telegram servers, Pass a file_id as string to send a video that exists on the Telegram servers,
pass an HTTP URL as a string for Telegram to get a video from the Internet, or pass an HTTP URL as a string for Telegram to get a video from the Internet, or
pass a file path as string to upload a new video that exists on your local machine. pass a file path as string to upload a new video that exists on your local machine.
pass a readable file-like object with .name
file_ref (``str``, *optional*): file_ref (``str``, *optional*):
A valid file reference obtained by a recently fetched media message. A valid file reference obtained by a recently fetched media message.
@ -162,7 +160,6 @@ class SendVideo(BaseClient):
file = None file = None
try: try:
if isinstance(video, str):
if os.path.exists(video): if os.path.exists(video):
thumb = None if thumb is None else self.save_file(thumb) thumb = None if thumb is None else self.save_file(thumb)
file = self.save_file(video, progress=progress, progress_args=progress_args) file = self.save_file(video, progress=progress, progress_args=progress_args)
@ -186,23 +183,6 @@ class SendVideo(BaseClient):
) )
else: else:
media = utils.get_input_media_from_file_id(video, file_ref, 4) media = utils.get_input_media_from_file_id(video, file_ref, 4)
elif hasattr(video, "read"):
thumb = None if thumb is None else self.save_file(thumb)
file = self.save_file(video, progress=progress, progress_args=progress_args)
media = types.InputMediaUploadedDocument(
mime_type=self.guess_mime_type(video.name) or "video/mp4",
file=file,
thumb=thumb,
attributes=[
types.DocumentAttributeVideo(
supports_streaming=supports_streaming or None,
duration=duration,
w=width,
h=height
),
types.DocumentAttributeFilename(file_name=video.name)
]
)
while True: while True:
try: try:

23
pyrogram/client/methods/messages/send_video_note.py
View File

@ -15,7 +15,7 @@
# #
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import io
import os import os
from typing import Union from typing import Union
@ -29,7 +29,6 @@ class SendVideoNote(BaseClient):
def send_video_note( def send_video_note(
self, self,
chat_id: Union[int, str], chat_id: Union[int, str],
video_note: Union[str, io.IOBase],
video_note: str, video_note: str,
file_ref: str = None, file_ref: str = None,
duration: int = 0, duration: int = 0,
@ -55,12 +54,11 @@ class SendVideoNote(BaseClient):
For your personal cloud (Saved Messages) you can simply use "me" or "self". For your personal cloud (Saved Messages) you can simply use "me" or "self".
For a contact that exists in your Telegram address book you can use his phone number (str). For a contact that exists in your Telegram address book you can use his phone number (str).
video_note (``str``, file-like object): video_note (``str``):
Video note to send. Video note to send.
Pass a file_id as string to send a video note that exists on the Telegram servers, or Pass a file_id as string to send a video note that exists on the Telegram servers, or
pass a file path as string to upload a new video note that exists on your local machine. pass a file path as string to upload a new video note that exists on your local machine.
Sending video notes by a URL is currently unsupported. Sending video notes by a URL is currently unsupported.
pass a readable file-like object with .name
file_ref (``str``, *optional*): file_ref (``str``, *optional*):
A valid file reference obtained by a recently fetched media message. A valid file reference obtained by a recently fetched media message.
@ -130,7 +128,6 @@ class SendVideoNote(BaseClient):
file = None file = None
try: try:
if isinstance(video_note, str):
if os.path.exists(video_note): if os.path.exists(video_note):
thumb = None if thumb is None else self.save_file(thumb) thumb = None if thumb is None else self.save_file(thumb)
file = self.save_file(video_note, progress=progress, progress_args=progress_args) file = self.save_file(video_note, progress=progress, progress_args=progress_args)
@ -149,22 +146,6 @@ class SendVideoNote(BaseClient):
) )
else: else:
media = utils.get_input_media_from_file_id(video_note, file_ref, 13) media = utils.get_input_media_from_file_id(video_note, file_ref, 13)
elif hasattr(video_note, "read"):
thumb = None if thumb is None else self.save_file(thumb)
file = self.save_file(video_note, progress=progress, progress_args=progress_args)
media = types.InputMediaUploadedDocument(
mime_type=self.guess_mime_type(video_note.name) or "video/mp4",
file=file,
thumb=thumb,
attributes=[
types.DocumentAttributeVideo(
round_message=True,
duration=duration,
w=length,
h=length
)
]
)
while True: while True:
try: try:

19
pyrogram/client/methods/messages/send_voice.py
View File

@ -15,7 +15,7 @@
# #
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import io
import os import os
from typing import Union from typing import Union
@ -29,7 +29,6 @@ class SendVoice(BaseClient):
def send_voice( def send_voice(
self, self,
chat_id: Union[int, str], chat_id: Union[int, str],
voice: Union[str, io.IOBase],
voice: str, voice: str,
file_ref=None, file_ref=None,
caption: str = "", caption: str = "",
@ -55,12 +54,11 @@ class SendVoice(BaseClient):
For your personal cloud (Saved Messages) you can simply use "me" or "self". For your personal cloud (Saved Messages) you can simply use "me" or "self".
For a contact that exists in your Telegram address book you can use his phone number (str). For a contact that exists in your Telegram address book you can use his phone number (str).
voice (``str``, file-like object): voice (``str``):
Audio file to send. Audio file to send.
Pass a file_id as string to send an audio that exists on the Telegram servers, Pass a file_id as string to send an audio that exists on the Telegram servers,
pass an HTTP URL as a string for Telegram to get an audio from the Internet, or pass an HTTP URL as a string for Telegram to get an audio from the Internet, or
pass a file path as string to upload a new audio that exists on your local machine. pass a file path as string to upload a new audio that exists on your local machine.
pass a readable file-like object with .name
file_ref (``str``, *optional*): file_ref (``str``, *optional*):
A valid file reference obtained by a recently fetched media message. A valid file reference obtained by a recently fetched media message.
@ -134,7 +132,6 @@ class SendVoice(BaseClient):
file = None file = None
try: try:
if isinstance(voice, str):
if os.path.exists(voice): if os.path.exists(voice):
file = self.save_file(voice, progress=progress, progress_args=progress_args) file = self.save_file(voice, progress=progress, progress_args=progress_args)
media = types.InputMediaUploadedDocument( media = types.InputMediaUploadedDocument(
@ -153,18 +150,6 @@ class SendVoice(BaseClient):
) )
else: else:
media = utils.get_input_media_from_file_id(voice, file_ref, 3) media = utils.get_input_media_from_file_id(voice, file_ref, 3)
elif hasattr(voice, "read"):
file = self.save_file(voice, progress=progress, progress_args=progress_args)
media = types.InputMediaUploadedDocument(
mime_type=self.guess_mime_type(voice.name) or "audio/mpeg",
file=file,
attributes=[
types.DocumentAttributeAudio(
voice=True,
duration=duration
)
]
)
while True: while True:
try: try:

7
pyrogram/client/types/messages_and_media/message.py
View File

@ -15,7 +15,7 @@
# #
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import io
from functools import partial from functools import partial
from typing import List, Match, Union from typing import List, Match, Union
@ -2985,7 +2985,6 @@ class Message(Object, Update):
def download( def download(
self, self,
file_name: str = "", file_name: str = "",
out: io.IOBase = None,
block: bool = True, block: bool = True,
progress: callable = None, progress: callable = None,
progress_args: tuple = () progress_args: tuple = ()
@ -3010,9 +3009,6 @@ class Message(Object, Update):
You can also specify a path for downloading files in a custom location: paths that end with "/" You can also specify a path for downloading files in a custom location: paths that end with "/"
are considered directories. All non-existent folders will be created automatically. are considered directories. All non-existent folders will be created automatically.
out (``io.IOBase``, *optional*):
A custom *file-like object* to be used when downloading file. Overrides file_name
block (``bool``, *optional*): block (``bool``, *optional*):
Blocks the code execution until the file has been downloaded. Blocks the code execution until the file has been downloaded.
Defaults to True. Defaults to True.
@ -3049,7 +3045,6 @@ class Message(Object, Update):
return self._client.download_media( return self._client.download_media(
message=self, message=self,
file_name=file_name, file_name=file_name,
out=out,
block=block, block=block,
progress=progress, progress=progress,
progress_args=progress_args, progress_args=progress_args,