warp-beacon 2.6.52__tar.gz → 2.6.54__tar.gz

{warp_beacon-2.6.52/warp_beacon.egg-info → warp_beacon-2.6.54}/PKG-INFO

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

warp_beacon-2.6.54/warp_beacon/__version__.py

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

{warp_beacon-2.6.52 → warp_beacon-2.6.54}/warp_beacon/scraper/youtube/abstract.py

@@ -243,8 +243,15 @@ class YoutubeAbstract(ScraperAbstract):
 		bytes_downloaded = total_size - bytes_remaining
 		percentage_of_completion = bytes_downloaded / (total_size or 1) * 100
 		if total_size == 0 or percentage_of_completion >= self._download_progress_threshold:
-			self.status_pipe.send({"action": "report_download_status", "current": bytes_downloaded, "total": total_size,
-									"message_id": self.job.placeholder_message_id, "chat_id": self.job.chat_id})
+			msg = {
+				"action": "report_download_status",
+				"current": bytes_downloaded,
+				"total": total_size,
+				"message_id": self.job.placeholder_message_id,
+				"chat_id": self.job.chat_id,
+				"completed": percentage_of_completion >= 100
+			}
+			self.status_pipe.send(msg)
 			logging.debug("[Download worker] Downloaded %d%%", percentage_of_completion)
 			if total_size > 0:
 				self._download_progress_threshold += 20

{warp_beacon-2.6.52 → warp_beacon-2.6.54}/warp_beacon/telegram/download_status.py

@@ -39,4 +39,5 @@ class DownloadStatus(object):
 		else:
 			progress_bar = self.progress_bars[a_key]
 		task = self.client.loop.create_task(self.handle_message(msg, progress_bar))
-		task.add_done_callback(lambda _: progress_bar.is_complete() and self.progress_bars.pop(a_key, None))
+		if msg.get("completed", False):
+			task.add_done_callback(lambda _: self.progress_bars.pop(a_key, None))

{warp_beacon-2.6.52 → warp_beacon-2.6.54}/warp_beacon/telegram/progress_bar.py

@@ -52,13 +52,25 @@ class ProgressBar(object):
 		if total == 0 or percent >= self._next_threshold:
 			#pbar = self.make_progress_bar(percent, 100, 25)
 			pbar = self.make_emoji_progress_bar(percent, 100, 14)
-			logging.info("[%s] Uploaded to Telegram %d%%", label or operation, percent)
+			logging.info("[%s] Operation: %s %d%%", label or operation, operation, percent)
 			try:
-				await self.client.edit_message_caption(chat_id, message_id, f"{pbar} <b>{operation}</b> {label}", ParseMode.HTML)
-			except MessageNotModified:
-				logging.warning("bad_request_400.MessageNotModified")
+				#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
+				task = self.client.loop.create_task(
+					self.client.edit_message_caption(chat_id, message_id, f"{pbar} <b>{operation}</b> {label}", ParseMode.HTML)
+				)
+				task.add_done_callback(
+					lambda t: (
+						(exc := t.exception()) and
+						(isinstance(exc, MessageNotModified)
+							and logging.warning("bad_request_400.MessageNotModified")
+							or logging.exception("Error in edit_message_caption", exc_info=exc))
+					)
+				)
+			#except MessageNotModified:
+				#logging.warning("bad_request_400.MessageNotModified")
 			except Exception as e:
-				logging.warning("An error occurred while updating progress bar")
+				logging.warning("An error occurred while setup task to update progress bar")
 				logging.exception(e)
 			if total > 0:
 				self._next_threshold += 20

{warp_beacon-2.6.52 → warp_beacon-2.6.54/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.52/warp_beacon/__version__.py

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