warp-beacon 2.6.55__tar.gz → 2.6.57__tar.gz

{warp_beacon-2.6.55/warp_beacon.egg-info → warp_beacon-2.6.57}/PKG-INFO

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

warp_beacon-2.6.57/warp_beacon/__version__.py

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

{warp_beacon-2.6.55 → warp_beacon-2.6.57}/warp_beacon/telegram/edit_message.py

@@ -106,18 +106,18 @@ 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, progress=progress_bar_thumb.progress_callback, progress_args=(chat_id, message_id, "Uploaded", "thumbnail",))
+			#progress_bar_thumb = ProgressBar(self.client)
+			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, progress=progress_bar_thumb.progress_callback, progress_args=(chat_id, message_id, "Uploaded", "thumbnail",))
+			#progress_bar_thumb = ProgressBar(self.client)
+			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, progress=progress_bar_thumb.progress_callback, progress_args=(chat_id, message_id, "Uploaded", "thumbnail",))
+			#progress_bar_thumb = ProgressBar(self.client)
+			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.55 → warp_beacon-2.6.57}/warp_beacon/telegram/progress_bar.py

@@ -61,15 +61,15 @@ class ProgressBar(object):
 			logging.exception("Error in edit_message_caption", exc_info=exc)
 
 	async def progress_callback(self, current: int, total: int, chat_id: int | str, message_id: int, operation: str, label: str = "") -> None:
-		if self.complete:
-			return
 		percent = 0
 		if total:
 			percent = round(current * 100 / (total or 1))
+		if percent >= 100:
+			return
 		if total == 0 or percent >= self._next_threshold:
 			#pbar = self.make_progress_bar(percent, 100, 25)
 			pbar = self.make_emoji_progress_bar(percent, 14)
-			logging.info("[%s] Operation: %s %d%%", label or operation, operation, round(percent))
+			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
@@ -77,8 +77,8 @@ class ProgressBar(object):
 					self.client.edit_message_caption(chat_id, message_id, f"{pbar} <b>{operation}</b> {label}", ParseMode.HTML)
 				)
 				task.add_done_callback(self._on_edit_done)
-			#except MessageNotModified:
-				#logging.warning("bad_request_400.MessageNotModified")
+			except MessageNotModified:
+				logging.warning("bad_request_400.MessageNotModified")
 			except Exception as e:
 				logging.warning("An error occurred while setup task to update progress bar")
 				logging.exception(e)

{warp_beacon-2.6.55 → warp_beacon-2.6.57/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.55/warp_beacon/__version__.py

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