warp-beacon 2.6.77__py3-none-any.whl → 2.6.79__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.6.77"
+__version__ = "2.6.79"
 

warp_beacon/telegram/edit_message.py

@@ -1,3 +1,5 @@
+import re
+
 from pyrogram.client import Client
 from pyrogram.types import InputMedia, InputMediaAudio, InputMediaPhoto, InputMediaVideo, InputMediaAnimation, InlineKeyboardMarkup
 from pyrogram import raw
@@ -9,6 +11,7 @@ from warp_beacon.telegram.types import ReportType
 class EditMessage(object):
 	def __init__(self, client: Client) -> None:
 		self.client = client
+		self.base64_str_tpl = re.compile(r"[A-Za-z0-9\-_]{30,}")
 
 	def get_wrapped_video(self, raw_file: raw.base.InputFile, raw_thumb: raw.base.InputFile, media: InputMediaVideo, file_name: str = None) -> raw.types.InputMediaUploadedDocument:
 		return raw.types.InputMediaUploadedDocument(
@@ -72,18 +75,8 @@ class EditMessage(object):
 			]
 		)
 
-	#async def upload_with_progress(self,
-	#	media: InputMedia | InputMediaAudio | InputMediaPhoto | InputMediaVideo | InputMediaAnimation,
-	#	chat_id: int | str,
-	#	message_id: int,
-	#	file_name: str
-	#) -> raw.base.InputFile:
-	#	progress_bar = ProgressBar(self.client)
-	#	progress_id = f"{chat_id}:{message_id}:{file_name}"
-	#	self.progress_bars[progress_id] = progress_bar
-	#	raw_file = await self.client.save_file(path=media.media, progress=progress_bar.progress_callback, progress_args=(chat_id, message_id, file_name,))
-	#	del self.progress_bars[progress_id]
-	#	return raw_file
+	def looks_like_token(self, s: str) -> bool:
+		return bool(re.fullmatch(self.base64_str_tpl, s))
 
 	async def edit(self,
 		chat_id: int | str,
@@ -92,9 +85,14 @@ class EditMessage(object):
 		reply_markup: InlineKeyboardMarkup = None,
 		file_name: str = None
 	) -> None:
-		progress_bar = ProgressBar(self.client)
-		#await progress_bar.progress_callback(current=0, total=0, chat_id=chat_id, message_id=message_id, operation="Uploading", label=file_name, report_type=ReportType.PROGRESS)
-		raw_file = await self.client.save_file(path=media.media, progress=progress_bar.progress_callback, progress_args=(chat_id, message_id, "Uploading", ReportType.PROGRESS, file_name))
+		is_looks_like_token = self.looks_like_token(media.media)
+		raw_file = None
+		if not is_looks_like_token:
+			progress_bar = ProgressBar(self.client)
+			#await progress_bar.progress_callback(current=0, total=0, chat_id=chat_id, message_id=message_id, operation="Uploading", label=file_name, report_type=ReportType.PROGRESS)
+			raw_file = await self.client.save_file(path=media.media, progress=progress_bar.progress_callback, progress_args=(chat_id, message_id, "Uploading", ReportType.PROGRESS, file_name))
+		else:
+			raw_file = media.media
 
 		caption = media.caption
 		parse_mode = media.parse_mode
@@ -107,17 +105,23 @@ class EditMessage(object):
 		raw_media = None
 		if isinstance(media, types.InputMediaVideo):
 			#progress_bar_thumb = ProgressBar(self.client)
-			raw_file_thumb = await self.client.save_file(path=media.thumb)
+			raw_file_thumb = None
+			if not is_looks_like_token:
+				raw_file_thumb = await self.client.save_file(path=media.thumb)
 			raw_media = self.get_wrapped_video(raw_file=raw_file, raw_thumb=raw_file_thumb, media=media, file_name=file_name)
 		elif isinstance(media, types.InputMediaPhoto):
 			raw_media = self.get_wrapped_photo(raw_file=raw_file, media=media)
 		elif isinstance(media, types.InputMediaAudio):
 			#progress_bar_thumb = ProgressBar(self.client)
-			raw_file_thumb = await self.client.save_file(path=media.thumb)
+			raw_file_thumb = None
+			if not is_looks_like_token:
+				raw_file_thumb = await self.client.save_file(path=media.thumb)
 			raw_media = self.get_wrapped_audio(raw_file=raw_file, raw_thumb=raw_file_thumb, media=media, file_name=file_name)
 		elif isinstance(media, types.InputMediaAnimation):
 			#progress_bar_thumb = ProgressBar(self.client)
-			raw_file_thumb = await self.client.save_file(path=media.thumb)
+			raw_file_thumb = None
+			if not is_looks_like_token:
+				raw_file_thumb = await self.client.save_file(path=media.thumb)
 			raw_media = self.get_wrapped_animation(raw_file=raw_file, raw_thumb=raw_file_thumb, media=media, file_name=file_name)
 
 		peer = await self.client.resolve_peer(chat_id)

{warp_beacon-2.6.77.dist-info → warp_beacon-2.6.79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warp_beacon
-Version: 2.6.77
+Version: 2.6.79
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev

{warp_beacon-2.6.77.dist-info → warp_beacon-2.6.79.dist-info}/RECORD

@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=LO-sp6GFaflUgrx9X2TOLNWU7hjk8t0Vx8TPlHz-ZwE,24
+warp_beacon/__version__.py,sha256=fIHRv6Lh_-_MPXE4cWurV7F1_97JtHjki9EwiHNmOYk,24
 warp_beacon/warp_beacon.py,sha256=ED43vNzdjDUJ_9qLCbri0bjWLWEJ69BENGj9i7G6AvM,342
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -44,7 +44,7 @@ warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 warp_beacon/telegram/bot.py,sha256=W13hyJD89ozZallLq0NIb9c3uh1Hov8Axi7ab7LkE3A,19128
 warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJbND_dX5Fhwkv0,1549
 warp_beacon/telegram/download_status.py,sha256=JNevX0VQh39fX98fjM9j_nm0Ribj8f3tfa6kxpeNapQ,1484
-warp_beacon/telegram/edit_message.py,sha256=y96-fkj5jKtEu68Bj5sGj7A06sFlXXfhfiyNdpPgqAU,5479
+warp_beacon/telegram/edit_message.py,sha256=6DX8eJV70MG_b79WbuJG55qLBs66boElzYdCr8zpMeI,5380
 warp_beacon/telegram/handlers.py,sha256=uvR6TPHSqdSxigp3wR-ewiE6t3TvVcbVLVcYGwkgD2s,9559
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
 warp_beacon/telegram/progress_bar.py,sha256=VBF_qwjOCu0mXN-r_Us4M7qoDWoyvjrw2R2TLgFvTKM,4858
@@ -52,9 +52,9 @@ warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDH
 warp_beacon/telegram/types.py,sha256=Kvdng6uCF1HRoqQgGW1ZYYPJoVuYkFb-LDvMBbW5Hjk,89
 warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
 warp_beacon/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
-warp_beacon-2.6.77.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.6.77.dist-info/METADATA,sha256=Owqtm1gjZXAirAMDl1zv5GQDfYYtz4JjxsCZP5halM0,22706
-warp_beacon-2.6.77.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-warp_beacon-2.6.77.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.6.77.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
-warp_beacon-2.6.77.dist-info/RECORD,,
+warp_beacon-2.6.79.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.79.dist-info/METADATA,sha256=QwJFaKW7mFd8WU4WPTiCxFad6znDUgItYvUKHdxdQTQ,22706
+warp_beacon-2.6.79.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+warp_beacon-2.6.79.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.79.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
+warp_beacon-2.6.79.dist-info/RECORD,,