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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warp_beacon
-Version: 2.6.53
+Version: 2.6.55
 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

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

{warp_beacon-2.6.53 → warp_beacon-2.6.55}/warp_beacon/scraper/abstract.py

@@ -12,16 +12,16 @@ from PIL import Image
 from pillow_heif import register_heif_opener
 
 class ScraperAbstract(ABC):
-	original_gai_family = None
-	send_message_to_admin_func: Callable = lambda: None
-	request_yt_auth: Callable = lambda: None
-	status_pipe: multiprocessing.connection.Connection = None
-	auth_event = None
-	account = None
-	account_index = 0
-	proxy = None
-
-	def __init__(self, account: tuple, proxy: dict=None) -> None:
+	def __init__(self, account: tuple, proxy: dict = None) -> None:
+		self.original_gai_family = None
+		self.send_message_to_admin_func: Callable = lambda: None
+		self.request_yt_auth: Callable = lambda: None
+		self.status_pipe: multiprocessing.connection.Connection = None
+		self.auth_event = None
+		self.account = None
+		self.account_index = 0
+		self.proxy = None
+		self.job = None
 		self._gai_lock = multiprocessing.Lock()
 		self.account_index = account[0]
 		self.account = account[1]

{warp_beacon-2.6.53 → warp_beacon-2.6.55}/warp_beacon/scraper/instagram/instagram.py

@@ -304,10 +304,13 @@ class InstagramScraper(ScraperAbstract):
 
 	def download(self, job: DownloadJob) -> Optional[list[dict]]:
 		res = []
+		self.job = job
 		while True:
 			try:
 				scrap_type, media_id = self.scrap(job.url)
 				if scrap_type == "media":
+					#self.status_pipe.send({"action": "report_download_status", "current": 0, "total": 0,
+					#				"message_id": self.job.placeholder_message_id, "chat_id": self.job.chat_id, "label": "Collection meta information ..."})
 					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)
 					if media_info.media_type == 2 and media_info.product_type == "clips": # Reels

{warp_beacon-2.6.53 → warp_beacon-2.6.55}/warp_beacon/scraper/youtube/abstract.py

@@ -35,8 +35,6 @@ class YoutubeAbstract(ScraperAbstract):
 	DOWNLOAD_DIR = "/tmp"
 	YT_SESSION_FILE = '/var/warp_beacon/yt_session_%d.json'
 
-	job = None
-
 	def __init__(self, account: tuple, proxy: dict=None) -> None:
 		super().__init__(account, proxy)
 		self._download_progress_threshold = 20
@@ -321,10 +319,10 @@ class YoutubeAbstract(ScraperAbstract):
 
 		return yt_dlp.YoutubeDL(ydl_opts)
 	
-	def _download(self, _: str, timeout: int = 60) -> list:
+	def _download(self, url: str, session: bool = True, thumbnail: Optional[io.BytesIO] = None, timeout: int = 60) -> list:
 		raise NotImplementedError("You should to implement _download method")
 	
-	def _download_yt_dlp(self, _: str, timeout: int = 60) -> list:
+	def _download_yt_dlp(self, url: str, thumbnail: Optional[io.BytesIO] = None, timeout: int = 60) -> list:
 		raise NotImplementedError("You should to implement _download_yt_dlp method")
 
 	def download(self, job: DownloadJob) -> list:

{warp_beacon-2.6.53 → warp_beacon-2.6.55}/warp_beacon/telegram/progress_bar.py

@@ -1,5 +1,6 @@
 import logging
 
+import asyncio
 import hashlib
 
 from pyrogram.enums import ParseMode
@@ -34,31 +35,52 @@ class ProgressBar(object):
 		percent = frac * 100
 		return f"<b>[{pbar}] {round(percent)}%</b>"
 	
-	def make_emoji_progress_bar(self, current: int, total: int, length: int = 10) -> str:
+	def make_emoji_progress_bar(self, percent: int, length: int = 10) -> str:
 		"""
-		Returns string:
-		[🟩🟩🟩⬜️⬜️⬜️⬜️⬜️⬜️⬜️] 30%
-		length — common number of emoji cells
+		Builds an emoji progress bar.
+
+		Args:
+			percent: int from 0 to 100
+			length: total number of emoji cells
+
+		Returns:
+			String like "[🟩🟩🟩⬜️⬜️⬜️⬜️⬜️⬜️⬜️] 30%"
 		"""
-		frac = (current / total) if total else 0
-		filled_count = int(frac * length)
-		empty_count = length - filled_count
-		pbar = "🟩" * filled_count + "⬜️" * empty_count
-		percent = frac * 100
-		return f"[{pbar}] {round(percent)}%"
+		filled = int(percent * length / 100 + 0.5)
+		empty  = length - filled
+		bar = "🟩" * filled + "⬜️" * empty
+		return f"[{bar}] {percent}%"
+
+	def _on_edit_done(self, task: asyncio.Task) -> None:
+		exc = task.exception()
+		if not exc:
+			return
+		if isinstance(exc, MessageNotModified):
+			logging.warning("bad_request_400.MessageNotModified")
+		else:
+			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:
-		percent = current * 100 / (total or 1)
+		if self.complete:
+			return
+		percent = 0
+		if total:
+			percent = round(current * 100 / (total or 1))
 		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)
+			pbar = self.make_emoji_progress_bar(percent, 14)
+			logging.info("[%s] Operation: %s %d%%", label or operation, operation, round(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(self._on_edit_done)
+			#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.53 → warp_beacon-2.6.55/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.53/warp_beacon/__version__.py

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