warp-beacon 2.6.64__tar.gz → 2.6.66__tar.gz

{warp_beacon-2.6.64/warp_beacon.egg-info → warp_beacon-2.6.66}/PKG-INFO

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

warp_beacon-2.6.66/warp_beacon/__version__.py

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

{warp_beacon-2.6.64 → warp_beacon-2.6.66}/warp_beacon/scraper/instagram/instagram.py

@@ -41,6 +41,7 @@ class InstagramScraper(ScraperAbstract):
 	client_session_id = ""
 
 	def __init__(self, client_session_id: str, account: tuple, proxy: dict=None) -> None:
+		self._download_progress_threshold = 20
 		self.client_session_id = client_session_id
 		super().__init__(account, proxy)
 		#
@@ -334,7 +335,9 @@ class InstagramScraper(ScraperAbstract):
 					self.status_pipe.send({
 						"action": "report_download_status",
 						"report_type": ReportType.ANNOUNCE,
-						"label": "Collecting meta information ..."
+						"label": "Collecting meta information ...",
+						"chat_id": self.job.chat_id,
+						"message_id": self.job.placeholder_message_id
 					})
 					media_info = self.download_hndlr(self.cl.media_info, media_id, use_cache=False)
 					logging.info("media_type is '%d', product_type is '%s'", media_info.media_type, media_info.product_type)
@@ -429,14 +432,16 @@ class InstagramScraper(ScraperAbstract):
 	
 	def download_progress(self, total: int | None, bytes_transferred: int, path: Path) -> None:
 		percentage_of_completion = round(bytes_transferred / (total or 1) * 100)
-		logging.debug("[Download] IG file %s, %d", str(path), percentage_of_completion)
-		msg = {
-			"action": "report_download_status",
-			"current": bytes_transferred,
-			"total": total or 0,
-			"message_id": self.job.placeholder_message_id,
-			"chat_id": self.job.chat_id,
-			"completed": bool(total and bytes_transferred >= total),
-			"report_type": ReportType.PROGRESS
-		}
-		self.status_pipe.send(msg)
+		if total == 0 or percentage_of_completion >= self._download_progress_threshold:
+			logging.debug("[Download] IG file %s, %d", str(path), percentage_of_completion)
+			msg = {
+				"action": "report_download_status",
+				"current": bytes_transferred,
+				"total": total or 0,
+				"message_id": self.job.placeholder_message_id,
+				"chat_id": self.job.chat_id,
+				"completed": percentage_of_completion >= 100,
+				"report_type": ReportType.PROGRESS
+			}
+			self.status_pipe.send(msg)
+			self._download_progress_threshold += 20

{warp_beacon-2.6.64 → warp_beacon-2.6.66}/warp_beacon/telegram/download_status.py

@@ -22,7 +22,8 @@ class DownloadStatus(object):
 			message_id=msg.get("message_id", 0),
 			chat_id=msg.get("chat_id", 0),
 			operation="Downloading",
-			report_type=msg.get("report_type", ReportType.PROGRESS)
+			report_type=msg.get("report_type", ReportType.PROGRESS),
+			label=msg.get("label", "")
 		)
 
 	def on_status(self) -> None:

{warp_beacon-2.6.64 → warp_beacon-2.6.66}/warp_beacon/telegram/edit_message.py

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

{warp_beacon-2.6.64 → warp_beacon-2.6.66/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.64/warp_beacon/__version__.py

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