warp-beacon 2.6.59__tar.gz → 2.6.61__tar.gz

{warp_beacon-2.6.59/warp_beacon.egg-info → warp_beacon-2.6.61}/PKG-INFO

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

warp_beacon-2.6.61/warp_beacon/__version__.py

@@ -0,0 +1,2 @@
+__version__ = "2.6.61"
+

{warp_beacon-2.6.59 → warp_beacon-2.6.61}/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.
@@ -68,13 +76,18 @@ class ProgressBar(object):
 			return
 		if total == 0 or percent >= self._next_threshold:
 			#pbar = self.make_progress_bar(percent, 100, 25)
-			pbar = self.make_emoji_progress_bar(percent, 11)
+			pbar = self.make_emoji_progress_bar(percent, 10)
 			logging.info("[Progress bar]: Operation: %s %d%%", operation, percent)
 			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.59 → warp_beacon-2.6.61/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.59/warp_beacon/__version__.py

@@ -1,2 +0,0 @@
-__version__ = "2.6.59"
-