warp-beacon 2.6.60__py3-none-any.whl → 2.6.62__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.6.60"
+__version__ = "2.6.62"
 

warp_beacon/telegram/download_status.py

@@ -20,7 +20,7 @@ class DownloadStatus(object):
 			total=msg.get("total", 0),
 			message_id=msg.get("message_id", 0),
 			chat_id=msg.get("chat_id", 0),
-			operation="Downloaded"
+			operation="Downloading"
 		)
 
 	def on_status(self) -> None:

warp_beacon/telegram/edit_message.py

@@ -93,8 +93,8 @@ class EditMessage(object):
 		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="Uploaded", label=file_name)
-		raw_file = await self.client.save_file(path=media.media, progress=progress_bar.progress_callback, progress_args=(chat_id, message_id, "Uploaded", file_name,))
+		await progress_bar.progress_callback(current=0, total=0, chat_id=chat_id, message_id=message_id, operation="Uploading", label=file_name)
+		raw_file = await self.client.save_file(path=media.media, progress=progress_bar.progress_callback, progress_args=(chat_id, message_id, "Uploading", file_name,))
 
 		caption = media.caption
 		parse_mode = media.parse_mode

warp_beacon/telegram/progress_bar.py

@@ -34,7 +34,15 @@ class ProgressBar(object):
 		pbar = '█' * filled + half_block + '─' * (length - filled - len(half_block))
 		percent = frac * 100
 		return f"<b>[{pbar}] {round(percent)}%</b>"
-	
+
+	def format_size_si(self, bytes_num: int) -> str:
+		units = [("TB", 1024**4), ("GB", 1024**3), ("MB", 1024**2), ("KB", 1024), ("B", 1)]
+		for unit_name, unit_value in units:
+			if bytes_num >= unit_value:
+				value = bytes_num / unit_value
+				return f"{value:.2f} {unit_name}"
+		return "0 B"
+
 	def make_emoji_progress_bar(self, percent: int, length: int = 10) -> str:
 		"""
 		Builds an emoji progress bar.
@@ -73,8 +81,13 @@ class ProgressBar(object):
 			try:
 				#await self.client.edit_message_caption(chat_id, message_id, f"{pbar} <b>{operation}</b> {label}", ParseMode.HTML)
 				# we don't need to wait completion, waste of time and resources
+				text = f"{pbar}\n<b>{operation}</b>"
+				if label:
+					text += f"\n{label}"
+				if total:
+					text += f" {self.format_size_si(total)}"
 				task = self.client.loop.create_task(
-					self.client.edit_message_caption(chat_id, message_id, f"{pbar}\n<b>{operation}</b> {label}", ParseMode.HTML)
+					self.client.edit_message_caption(chat_id, message_id, text, ParseMode.HTML)
 				)
 				task.add_done_callback(self._on_edit_done)
 			except MessageNotModified:

{warp_beacon-2.6.60.dist-info → warp_beacon-2.6.62.dist-info}/METADATA

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

{warp_beacon-2.6.60.dist-info → warp_beacon-2.6.62.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=3IiQOKHk2RWOwguiFYFY-mBc8FYhULmWF_eZDMelcgc,24
+warp_beacon/__version__.py,sha256=09IBOKxWe42LVlV24GfMJOBKt0hFlSRUhV5Q52nzG_Y,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
@@ -42,17 +42,17 @@ warp_beacon/storage/mongo.py,sha256=qC4ZiO8XXvPnP0rJwz4CJx42pqFsyAjCiW10W5QdT6E,
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=dV0mRIOkA8dU0ECsmC_rZ33XQhVnkW2nZBNTxQ0Y6x4,1342
-warp_beacon/telegram/edit_message.py,sha256=SB3qKLCfO5mgeeASKVf9VY21JG0SuwuX8okQXPYA2Dk,5415
+warp_beacon/telegram/download_status.py,sha256=SIWIKPjNJwl13VxBZcN-YKB0bzWqrMxhVz5rWJM7Xek,1343
+warp_beacon/telegram/edit_message.py,sha256=L6YXPuR87aLBly0yUjS4XjXUbOtUQlrKEPKhzBVcjdI,5417
 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=yu_V-SW1Am364hSHSco_QhB7u-ehAWXZnOT2wvdl2Lg,3189
+warp_beacon/telegram/progress_bar.py,sha256=hVr-VmfVadRTRtzfChqCigCKT_4KRlKqT-dJxi5U9dc,3590
 warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDHTzP78Mx5tdvPPWs,969
 warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
 warp_beacon/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
-warp_beacon-2.6.60.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.6.60.dist-info/METADATA,sha256=ECam-k6h52qzvP1-JXKrQNI_5bQEVSA3ID1gsiKuMBU,22706
-warp_beacon-2.6.60.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-warp_beacon-2.6.60.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.6.60.dist-info/top_level.txt,sha256=2x4wBJ_HeeBt6Bsdu9C4tItXWqH8spX8jGSHpoL0IMw,1334
-warp_beacon-2.6.60.dist-info/RECORD,,
+warp_beacon-2.6.62.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.62.dist-info/METADATA,sha256=LpNvKWdS3weCwLpmT7Q9bjhYgrQ_SIYzMf0aJQ_abs0,22706
+warp_beacon-2.6.62.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+warp_beacon-2.6.62.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.62.dist-info/top_level.txt,sha256=2x4wBJ_HeeBt6Bsdu9C4tItXWqH8spX8jGSHpoL0IMw,1334
+warp_beacon-2.6.62.dist-info/RECORD,,