Skip to content

Commit 516e0a1

Browse files
delivrancedelivrance
committed
Simplify None checks for file uploads
1 parent b745ce9 commit 516e0a1

File tree

8 files changed

+18
-15
lines changed

8 files changed

+18
-15
lines changed

‎pyrogram/client/client.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1783,6 +1783,9 @@ def save_file(
17831783
Raises:
17841784
RPCError: In case of a Telegram RPC error.
17851785
"""
1786+
if path is None:
1787+
return None
1788+
17861789
part_size = 512 * 1024
17871790

17881791
if isinstance(path, str):

‎pyrogram/client/methods/messages/edit_message_media.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def edit_message_media(
109109
peer=self.resolve_peer(chat_id),
110110
media=types.InputMediaUploadedDocument(
111111
mime_type=self.guess_mime_type(media.media) or "video/mp4",
112-
thumb=None if media.thumb is None else self.save_file(media.thumb),
112+
thumb=self.save_file(media.thumb),
113113
file=self.save_file(media.media),
114114
attributes=[
115115
types.DocumentAttributeVideo(
@@ -146,7 +146,7 @@ def edit_message_media(
146146
peer=self.resolve_peer(chat_id),
147147
media=types.InputMediaUploadedDocument(
148148
mime_type=self.guess_mime_type(media.media) or "audio/mpeg",
149-
thumb=None if media.thumb is None else self.save_file(media.thumb),
149+
thumb=self.save_file(media.thumb),
150150
file=self.save_file(media.media),
151151
attributes=[
152152
types.DocumentAttributeAudio(
@@ -182,7 +182,7 @@ def edit_message_media(
182182
peer=self.resolve_peer(chat_id),
183183
media=types.InputMediaUploadedDocument(
184184
mime_type=self.guess_mime_type(media.media) or "video/mp4",
185-
thumb=None if media.thumb is None else self.save_file(media.thumb),
185+
thumb=self.save_file(media.thumb),
186186
file=self.save_file(media.media),
187187
attributes=[
188188
types.DocumentAttributeVideo(
@@ -220,7 +220,7 @@ def edit_message_media(
220220
peer=self.resolve_peer(chat_id),
221221
media=types.InputMediaUploadedDocument(
222222
mime_type=self.guess_mime_type(media.media) or "application/zip",
223-
thumb=None if media.thumb is None else self.save_file(media.thumb),
223+
thumb=self.save_file(media.thumb),
224224
file=self.save_file(media.media),
225225
attributes=[
226226
types.DocumentAttributeFilename(

‎pyrogram/client/methods/messages/send_animation.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def progress(current, total):
167167
try:
168168
if isinstance(animation, str):
169169
if os.path.isfile(animation):
170-
thumb = None if thumb is None else self.save_file(thumb)
170+
thumb = self.save_file(thumb)
171171
file = self.save_file(animation, progress=progress, progress_args=progress_args)
172172
media = types.InputMediaUploadedDocument(
173173
mime_type=self.guess_mime_type(animation) or "video/mp4",
@@ -191,7 +191,7 @@ def progress(current, total):
191191
else:
192192
media = utils.get_input_media_from_file_id(animation, file_ref, 10)
193193
else:
194-
thumb = None if thumb is None else self.save_file(thumb)
194+
thumb = self.save_file(thumb)
195195
file = self.save_file(animation, progress=progress, progress_args=progress_args)
196196
media = types.InputMediaUploadedDocument(
197197
mime_type=self.guess_mime_type(animation.name) or "video/mp4",

‎pyrogram/client/methods/messages/send_audio.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def progress(current, total):
167167
try:
168168
if isinstance(audio, str):
169169
if os.path.isfile(audio):
170-
thumb = None if thumb is None else self.save_file(thumb)
170+
thumb = self.save_file(thumb)
171171
file = self.save_file(audio, progress=progress, progress_args=progress_args)
172172
media = types.InputMediaUploadedDocument(
173173
mime_type=self.guess_mime_type(audio) or "audio/mpeg",
@@ -189,7 +189,7 @@ def progress(current, total):
189189
else:
190190
media = utils.get_input_media_from_file_id(audio, file_ref, 9)
191191
else:
192-
thumb = None if thumb is None else self.save_file(thumb)
192+
thumb = self.save_file(thumb)
193193
file = self.save_file(audio, progress=progress, progress_args=progress_args)
194194
media = types.InputMediaUploadedDocument(
195195
mime_type=self.guess_mime_type(audio.name) or "audio/mpeg",

‎pyrogram/client/methods/messages/send_document.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def progress(current, total):
147147
try:
148148
if isinstance(document, str):
149149
if os.path.isfile(document):
150-
thumb = None if thumb is None else self.save_file(thumb)
150+
thumb = self.save_file(thumb)
151151
file = self.save_file(document, progress=progress, progress_args=progress_args)
152152
media = types.InputMediaUploadedDocument(
153153
mime_type=self.guess_mime_type(document) or "application/zip",
@@ -165,7 +165,7 @@ def progress(current, total):
165165
else:
166166
media = utils.get_input_media_from_file_id(document, file_ref, 5)
167167
else:
168-
thumb = None if thumb is None else self.save_file(thumb)
168+
thumb = self.save_file(thumb)
169169
file = self.save_file(document, progress=progress, progress_args=progress_args)
170170
media = types.InputMediaUploadedDocument(
171171
mime_type=self.guess_mime_type(document.name) or "application/zip",

‎pyrogram/client/methods/messages/send_media_group.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def send_media_group(
119119
peer=self.resolve_peer(chat_id),
120120
media=types.InputMediaUploadedDocument(
121121
file=self.save_file(i.media),
122-
thumb=None if i.thumb is None else self.save_file(i.thumb),
122+
thumb=self.save_file(i.thumb),
123123
mime_type=self.guess_mime_type(i.media) or "video/mp4",
124124
attributes=[
125125
types.DocumentAttributeVideo(

‎pyrogram/client/methods/messages/send_video.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def progress(current, total):
164164
try:
165165
if isinstance(video, str):
166166
if os.path.isfile(video):
167-
thumb = None if thumb is None else self.save_file(thumb)
167+
thumb = self.save_file(thumb)
168168
file = self.save_file(video, progress=progress, progress_args=progress_args)
169169
media = types.InputMediaUploadedDocument(
170170
mime_type=self.guess_mime_type(video) or "video/mp4",
@@ -187,7 +187,7 @@ def progress(current, total):
187187
else:
188188
media = utils.get_input_media_from_file_id(video, file_ref, 4)
189189
else:
190-
thumb = None if thumb is None else self.save_file(thumb)
190+
thumb = self.save_file(thumb)
191191
file = self.save_file(video, progress=progress, progress_args=progress_args)
192192
media = types.InputMediaUploadedDocument(
193193
mime_type=self.guess_mime_type(video.name) or "video/mp4",

‎pyrogram/client/methods/messages/send_video_note.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def send_video_note(
131131
try:
132132
if isinstance(video_note, str):
133133
if os.path.isfile(video_note):
134-
thumb = None if thumb is None else self.save_file(thumb)
134+
thumb = self.save_file(thumb)
135135
file = self.save_file(video_note, progress=progress, progress_args=progress_args)
136136
media = types.InputMediaUploadedDocument(
137137
mime_type=self.guess_mime_type(video_note) or "video/mp4",
@@ -149,7 +149,7 @@ def send_video_note(
149149
else:
150150
media = utils.get_input_media_from_file_id(video_note, file_ref, 13)
151151
else:
152-
thumb = None if thumb is None else self.save_file(thumb)
152+
thumb = self.save_file(thumb)
153153
file = self.save_file(video_note, progress=progress, progress_args=progress_args)
154154
media = types.InputMediaUploadedDocument(
155155
mime_type=self.guess_mime_type(video_note.name) or "video/mp4",

0 commit comments

Comments
 (0)