warp-beacon 2.7.10__tar.gz → 2.7.12__tar.gz

{warp_beacon-2.7.10/warp_beacon.egg-info → warp_beacon-2.7.12}/PKG-INFO

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

warp_beacon-2.7.12/warp_beacon/__version__.py

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

{warp_beacon-2.7.10 → warp_beacon-2.7.12}/warp_beacon/scraper/instagram/instagram.py

@@ -475,7 +475,7 @@ class InstagramScraper(ScraperAbstract):
 				"report_type": ReportType.PROGRESS
 			}
 			self.status_pipe.send(msg)
-			self._download_progress_threshold += 10
+			self._download_progress_threshold += 20
 
 	def report_seen(self, items: dict) -> None:
 		try:

{warp_beacon-2.7.10 → warp_beacon-2.7.12}/warp_beacon/scraper/youtube/abstract.py

@@ -245,7 +245,7 @@ class YoutubeAbstract(ScraperAbstract):
 			self.status_pipe.send(msg)
 			logging.debug("[Download worker] Downloaded %d%%", percentage_of_completion)
 			if total_size > 0:
-				self._download_progress_threshold += 10
+				self._download_progress_threshold += 20
 
 	def build_proxies(self, proxy_dsn: str) -> dict:
 		if not proxy_dsn:
@@ -310,7 +310,7 @@ class YoutubeAbstract(ScraperAbstract):
 				self.status_pipe.send(msg)
 				logging.debug("[Download worker][yt_dlp] Downloaded %d%%", percentage_of_completion)
 				if total_size > 0:
-					self._download_progress_threshold += 10
+					self._download_progress_threshold += 20
 
 	def build_yt_dlp(self, timeout: int = 60) -> yt_dlp.YoutubeDL:
 		auth_data = {}

{warp_beacon-2.7.10 → warp_beacon-2.7.12}/warp_beacon/telegram/progress_bar.py

@@ -98,39 +98,34 @@ class ProgressBar(object):
 		percent = 0
 		if total:
 			percent = round(current * 100 / (total or 1))
-		if percent > 100:
-			return
-		if percent >= 100 and operation == "Uploading":
+		if percent >= 100:
 			return
 		if total == 0 or percent == 0 or percent >= self._next_threshold:
 			#pbar = self.make_progress_bar(percent, 100, 25)
 			pbar = self.make_emoji_progress_bar(percent, 10)
 			logging.info("[Progress bar]: Operation: %s %d%%", operation, percent)
 			try:
-				fomatted_size = self.format_size_si(total)
+				formatted_size = self.format_size_si(total)
 				text = f"{pbar}\n{operation}"
 				if label:
 					text += f"\n<code>{label}</code>"
 				if total:
-					text += f" <b>{fomatted_size}</b>"
+					text += f" <b>{formatted_size}</b>"
 
 				# avoid duplicate render
-				if text == f"{chat_id}:{message_id}:{operation}:{label}:{fomatted_size}:{percent}":
+				if text == f"{chat_id}:{message_id}:{operation}:{label}:{formatted_size}:{percent}":
 					return
 
-				await self.client.edit_message_caption(chat_id, message_id, text, ParseMode.HTML)
-				self.rendered_text = f"{chat_id}:{message_id}:{operation}:{label}:{fomatted_size}:{percent}"
-				#task = self.client.loop.create_task(
-				#	self.client.edit_message_caption(chat_id, message_id, text, ParseMode.HTML)
-				#)
-				#task.add_done_callback(self._on_edit_done)
+				message = await self.client.edit_message_caption(chat_id, message_id, text, ParseMode.HTML)
+				logging.debug("Updated caption for message id '%d'", message.id)
+				self.rendered_text = f"{chat_id}:{message_id}:{operation}:{label}:{formatted_size}:{percent}"
 			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)
 			if total > 0 and percent != 0:
-				self._next_threshold += 15
+				self._next_threshold += 20
 
 	@staticmethod
 	def make_hash(chat_id: str | int, message_id: int, algorithm: str = 'sha256') -> str:

{warp_beacon-2.7.10 → warp_beacon-2.7.12/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.7.10/warp_beacon/__version__.py

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