more refactoring upload media

Author: ZeN220

pyrogram/methods/messages/send_animation.py

@@ -17,7 +17,6 @@
 #  along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import re
 from datetime import datetime
 from typing import BinaryIO, Callable, List, Optional, Union
 
@@ -226,66 +225,34 @@ async def progress(current, total):
             reply_parameters=reply_parameters
         )
 
-        file = None
-
         try:
             if isinstance(animation, str):
-                if os.path.isfile(animation):
-                    thumb = await self.save_file(thumb)
-                    file = await self.save_file(animation, progress=progress, progress_args=progress_args)
-                    media = raw.types.InputMediaUploadedDocument(
-                        mime_type=self.guess_mime_type(animation) or "video/mp4",
-                        file=file,
-                        thumb=thumb,
-                        spoiler=has_spoiler,
-                        attributes=[
-                            raw.types.DocumentAttributeVideo(
-                                supports_streaming=True,
-                                duration=duration,
-                                w=width,
-                                h=height
-                            ),
-                            raw.types.DocumentAttributeFilename(file_name=file_name or os.path.basename(animation)),
-                            raw.types.DocumentAttributeAnimated()
-                        ]
-                    )
-                elif re.match("^https?://", animation):
-                    media = raw.types.InputMediaDocumentExternal(
-                        url=animation,
-                        spoiler=has_spoiler
-                    )
-                else:
-                    media = utils.get_input_media_from_file_id(animation, FileType.ANIMATION, has_spoiler=has_spoiler)
+                actual_file_name = file_name or os.path.basename(animation)
             else:
-                thumb = await self.save_file(thumb)
-                file = await self.save_file(animation, progress=progress, progress_args=progress_args)
-                media = raw.types.InputMediaUploadedDocument(
-                    mime_type=self.guess_mime_type(file_name or animation.name) or "video/mp4",
-                    file=file,
-                    thumb=thumb,
-                    spoiler=has_spoiler,
-                    attributes=[
-                        raw.types.DocumentAttributeVideo(
-                            supports_streaming=True,
-                            duration=duration,
-                            w=width,
-                            h=height
-                        ),
-                        raw.types.DocumentAttributeFilename(file_name=file_name or animation.name),
-                        raw.types.DocumentAttributeAnimated()
-                    ]
-                )
-
-            # Функция для обработки unsave после отправки
-            async def post_process(client, message):
-                if unsave and message.animation:
-                    document_id = utils.get_input_media_from_file_id(
-                        message.animation.file_id,
-                        FileType.ANIMATION,
-                    ).id
-                    await client.invoke(raw.functions.messages.SaveGif(id=document_id, unsave=True))
-
-            return await send_media(
+                actual_file_name = file_name or getattr(animation, 'name', 'animation.gif')
+
+            attributes = utils.make_document_attributes(
+                file_name=actual_file_name,
+                duration=duration,
+                width=width,
+                height=height,
+                supports_streaming=True,
+                animated=True,
+            )
+
+            media, file = await utils.prepare_media_for_upload(
+                client=self,
+                file=animation,
+                file_type=FileType.ANIMATION,
+                default_mime="video/mp4",
+                thumb=thumb,
+                attributes=attributes,
+                spoiler=has_spoiler,
+                progress=progress,
+                progress_args=progress_args,
+            )
+
+            message = await send_media(
                 client=self,
                 chat_id=chat_id,
                 media=media,
@@ -306,9 +273,16 @@ async def post_process(client, message):
                 suggested_post_parameters=suggested_post_parameters,
                 reply_markup=reply_markup,
                 file_reference=animation,
-                file_part_callback=lambda ref, part: self.save_file(ref, file_id=file.id, file_part=part),
-                use_parse_messages=False,  # Используем ручной парсинг для совместимости с unsave
-                post_process_callback=post_process if unsave else None,
+                file_part_callback=lambda ref, part: self.save_file(ref, file_id=file.id, file_part=part) if file else None,
+                use_parse_messages=False,
             )
+
+            if unsave and message.animation:
+                document_id = utils.get_input_media_from_file_id(
+                    message.animation.file_id,
+                    FileType.ANIMATION,
+                ).id
+                await self.invoke(raw.functions.messages.SaveGif(id=document_id, unsave=True))
+
         except StopTransmission:
             return None

pyrogram/methods/messages/send_audio.py

@@ -17,12 +17,11 @@
 #  along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import re
 from datetime import datetime
 from typing import BinaryIO, Callable, List, Optional, Union
 
 import pyrogram
-from pyrogram import StopTransmission, enums, raw, types, utils
+from pyrogram import StopTransmission, enums, types, utils
 from pyrogram.file_id import FileType
 from pyrogram.utils import handle_deprecated_reply_parameters, send_media
 
@@ -216,54 +215,35 @@ async def progress(current, total):
             reply_parameters=reply_parameters
         )
 
-        file = None
-
         try:
             if isinstance(audio, str):
-                if os.path.isfile(audio):
-                    mime_type = self.guess_mime_type(audio) or "audio/mpeg"
-                    if mime_type == "audio/ogg":
-                        mime_type = "audio/opus"
-                    thumb = await self.save_file(thumb)
-                    file = await self.save_file(audio, progress=progress, progress_args=progress_args)
-                    media = raw.types.InputMediaUploadedDocument(
-                        mime_type=mime_type,
-                        file=file,
-                        thumb=thumb,
-                        attributes=[
-                            raw.types.DocumentAttributeAudio(
-                                duration=duration,
-                                performer=performer,
-                                title=title
-                            ),
-                            raw.types.DocumentAttributeFilename(file_name=file_name or os.path.basename(audio))
-                        ]
-                    )
-                elif re.match("^https?://", audio):
-                    media = raw.types.InputMediaDocumentExternal(
-                        url=audio
-                    )
-                else:
-                    media = utils.get_input_media_from_file_id(audio, FileType.AUDIO)
+                actual_file_name = file_name or os.path.basename(audio)
             else:
-                mime_type = self.guess_mime_type(file_name or audio.name) or "audio/mpeg"
-                if mime_type == "audio/ogg":
-                    mime_type = "audio/opus"
-                thumb = await self.save_file(thumb)
-                file = await self.save_file(audio, progress=progress, progress_args=progress_args)
-                media = raw.types.InputMediaUploadedDocument(
-                    mime_type=mime_type,
-                    file=file,
-                    thumb=thumb,
-                    attributes=[
-                        raw.types.DocumentAttributeAudio(
-                            duration=duration,
-                            performer=performer,
-                            title=title
-                        ),
-                        raw.types.DocumentAttributeFilename(file_name=file_name or audio.name)
-                    ]
-                )
+                actual_file_name = file_name or getattr(audio, 'name', 'audio.mp3')
+
+            mime_type = self.guess_mime_type(actual_file_name) or "audio/mpeg"
+            if mime_type == "audio/ogg":
+                mime_type = "audio/opus"
+
+            attributes = utils.make_document_attributes(
+                file_name=actual_file_name,
+                duration=duration,
+                performer=performer,
+                title=title,
+            )
+
+            # Подготавливаем медиа
+            media, file = await utils.prepare_media_for_upload(
+                client=self,
+                file=audio,
+                file_type=FileType.AUDIO,
+                mime_type=mime_type,
+                default_mime="audio/mpeg",
+                thumb=thumb,
+                attributes=attributes,
+                progress=progress,
+                progress_args=progress_args,
+            )
 
             return await send_media(
                 client=self,
@@ -285,7 +265,7 @@ async def progress(current, total):
                 suggested_post_parameters=suggested_post_parameters,
                 reply_markup=reply_markup,
                 file_reference=audio,
-                file_part_callback=lambda ref, part: self.save_file(ref, file_id=file.id, file_part=part),
+                file_part_callback=lambda ref, part: self.save_file(ref, file_id=file.id, file_part=part) if file else None,
             )
         except StopTransmission:
             return None

pyrogram/methods/messages/send_document.py

@@ -17,12 +17,11 @@
 #  along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import re
 from datetime import datetime
 from typing import BinaryIO, Callable, List, Optional, Union
 
 import pyrogram
-from pyrogram import StopTransmission, enums, raw, types, utils
+from pyrogram import StopTransmission, enums, types, utils
 from pyrogram.file_id import FileType
 from pyrogram.utils import handle_deprecated_reply_parameters, send_media
 
@@ -202,39 +201,25 @@ async def progress(current, total):
             reply_parameters=reply_parameters
         )
 
-        file = None
-
         try:
             if isinstance(document, str):
-                if os.path.isfile(document):
-                    thumb = await self.save_file(thumb)
-                    file = await self.save_file(document, progress=progress, progress_args=progress_args)
-                    media = raw.types.InputMediaUploadedDocument(
-                        mime_type=self.guess_mime_type(document) or "application/zip",
-                        file=file,
-                        force_file=force_document or None,
-                        thumb=thumb,
-                        attributes=[
-                            raw.types.DocumentAttributeFilename(file_name=file_name or os.path.basename(document))
-                        ]
-                    )
-                elif re.match("^https?://", document):
-                    media = raw.types.InputMediaDocumentExternal(
-                        url=document
-                    )
-                else:
-                    media = utils.get_input_media_from_file_id(document, FileType.DOCUMENT)
+                actual_file_name = file_name or os.path.basename(document)
             else:
-                thumb = await self.save_file(thumb)
-                file = await self.save_file(document, progress=progress, progress_args=progress_args)
-                media = raw.types.InputMediaUploadedDocument(
-                    mime_type=self.guess_mime_type(file_name or document.name) or "application/zip",
-                    file=file,
-                    thumb=thumb,
-                    attributes=[
-                        raw.types.DocumentAttributeFilename(file_name=file_name or document.name)
-                    ]
-                )
+                actual_file_name = file_name or getattr(document, 'name', 'document')
+
+            attributes = utils.make_document_attributes(file_name=actual_file_name)
+
+            media, file = await utils.prepare_media_for_upload(
+                client=self,
+                file=document,
+                file_type=FileType.DOCUMENT,
+                default_mime="application/zip",
+                thumb=thumb,
+                attributes=attributes,
+                force_file=force_document,
+                progress=progress,
+                progress_args=progress_args,
+            )
 
             return await send_media(
                 client=self,
@@ -256,7 +241,7 @@ async def progress(current, total):
                 suggested_post_parameters=suggested_post_parameters,
                 reply_markup=reply_markup,
                 file_reference=document,
-                file_part_callback=lambda ref, part: self.save_file(ref, file_id=file.id, file_part=part),
+                file_part_callback=lambda ref, part: self.save_file(ref, file_id=file.id, file_part=part) if file else None,
             )
         except StopTransmission:
             return None

pyrogram/methods/messages/send_sticker.py

@@ -17,12 +17,11 @@
 #  along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import re
 from datetime import datetime
 from typing import BinaryIO, Callable, List, Optional, Union
 
 import pyrogram
-from pyrogram import StopTransmission, enums, raw, types, utils
+from pyrogram import StopTransmission, enums, types, utils
 from pyrogram.file_id import FileType
 from pyrogram.utils import handle_deprecated_reply_parameters, send_media
 
@@ -184,42 +183,26 @@ async def send_sticker(
             reply_parameters=reply_parameters
         )
 
-        file = None
-
         try:
             if isinstance(sticker, str):
-                if os.path.isfile(sticker):
-                    file = await self.save_file(sticker, progress=progress, progress_args=progress_args)
-                    media = raw.types.InputMediaUploadedDocument(
-                        mime_type=self.guess_mime_type(sticker) or "image/webp",
-                        file=file,
-                        attributes=[
-                            raw.types.DocumentAttributeFilename(file_name=os.path.basename(sticker)),
-                            raw.types.DocumentAttributeSticker(
-                                alt=emoji,
-                                stickerset=raw.types.InputStickerSetEmpty()
-                            ),
-                        ]
-                    )
-                elif re.match("^https?://", sticker):
-                    media = raw.types.InputMediaDocumentExternal(
-                        url=sticker
-                    )
-                else:
-                    media = utils.get_input_media_from_file_id(sticker, FileType.STICKER)
+                actual_file_name = os.path.basename(sticker) if os.path.isfile(sticker) else "sticker.webp"
             else:
-                file = await self.save_file(sticker, progress=progress, progress_args=progress_args)
-                media = raw.types.InputMediaUploadedDocument(
-                    mime_type=self.guess_mime_type(sticker.name) or "image/webp",
-                    file=file,
-                    attributes=[
-                        raw.types.DocumentAttributeFilename(file_name=sticker.name),
-                        raw.types.DocumentAttributeSticker(
-                            alt=emoji,
-                            stickerset=raw.types.InputStickerSetEmpty()
-                        ),
-                    ]
-                )
+                actual_file_name = getattr(sticker, 'name', 'sticker.webp')
+
+            attributes = utils.make_document_attributes(
+                file_name=actual_file_name,
+                sticker_alt=emoji,
+            )
+
+            media, file = await utils.prepare_media_for_upload(
+                client=self,
+                file=sticker,
+                file_type=FileType.STICKER,
+                default_mime="image/webp",
+                attributes=attributes,
+                progress=progress,
+                progress_args=progress_args,
+            )
 
             return await send_media(
                 client=self,
@@ -241,7 +224,7 @@ async def send_sticker(
                 suggested_post_parameters=suggested_post_parameters,
                 reply_markup=reply_markup,
                 file_reference=sticker,
-                file_part_callback=lambda ref, part: self.save_file(ref, file_id=file.id, file_part=part),
+                file_part_callback=lambda ref, part: self.save_file(ref, file_id=file.id, file_part=part) if file else None,
             )
         except StopTransmission:
             return None