warp-beacon 2.6.54__py3-none-any.whl → 2.6.56__py3-none-any.whl

warp_beacon/__version__.py

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

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/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/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/telegram/progress_bar.py

@@ -1,5 +1,6 @@
 import logging
 
+import asyncio
 import hashlib
 
 from pyrogram.enums import ParseMode
@@ -34,41 +35,50 @@ 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] Operation: %s %d%%", label or operation, 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)
+				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")
+				#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 setup task to update progress bar")
 				logging.exception(e)

{warp_beacon-2.6.54.dist-info → warp_beacon-2.6.56.dist-info}/METADATA

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

{warp_beacon-2.6.54.dist-info → warp_beacon-2.6.56.dist-info}/RECORD

@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=n77-uVboGYOpzowD-4XvQrBJEhAfKpJcTLztmdsI4qA,24
+warp_beacon/__version__.py,sha256=AdfnWlDMAuzaQu721-Vo_OBbQvxz9el6tXYNoDcyzz4,24
 warp_beacon/warp_beacon.py,sha256=ED43vNzdjDUJ_9qLCbri0bjWLWEJ69BENGj9i7G6AvM,342
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -23,7 +23,7 @@ warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 warp_beacon/scheduler/instagram_human.py,sha256=0LaRUu0MBBuEOQeFzuq22HIYfJL9pTK_7udsXfef0Fk,8204
 warp_beacon/scheduler/scheduler.py,sha256=9OCh7Ta4wY_aTHGAOOZmaKXg56Ftx1N_aV1g6E3ZLKA,4941
 warp_beacon/scraper/__init__.py,sha256=buXmGcJnwCi0qGZAh3srcSbww0XvKyTACp_DW11e86Q,20225
-warp_beacon/scraper/abstract.py,sha256=wwmk2L1S4H9la8x74eN4svdG-BgOdE1tKrOv7jjFhXE,3043
+warp_beacon/scraper/abstract.py,sha256=Hr8BrLLG4AhVluKO50ryXy2T96goJ83ahXKRXnnQBn8,3110
 warp_beacon/scraper/account_selector.py,sha256=-tAbOIbM7sC9QafsgSe64RCWXewRO-RehEYsYSB3HGo,9727
 warp_beacon/scraper/exceptions.py,sha256=EKwoF0oH2xZWbNU-v8DOaWK5skKwa3s1yTIBdlcfMpc,1452
 warp_beacon/scraper/fail_handler.py,sha256=zcPK3ZVEsu6JmHYcWP7L3naTRK3gWFVRkpP84VBOtJs,964
@@ -31,9 +31,9 @@ warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5
 warp_beacon/scraper/utils.py,sha256=xJfCVhiLjVPoFVupE10sTzX7UpgNWbx2EeYIsoYXGDk,43
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/captcha.py,sha256=9UYziuqB3Tsat_ET6ex-cnZDbi6yCnsXHSpmE8MuUHk,4651
-warp_beacon/scraper/instagram/instagram.py,sha256=zbkF-1lU5lxJ_2m8i8mGRX0EQMLVSflsOafBM1FEC6s,15588
+warp_beacon/scraper/instagram/instagram.py,sha256=f4B_pHk99C9EGWRXCINCW7NeOA0gSuVryknGHLNyMCI,15827
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/youtube/abstract.py,sha256=KjtMb_5RJrAyLGz_BIBv-RdBRey6PnJX6jnOaJKsbTk,13485
+warp_beacon/scraper/youtube/abstract.py,sha256=cSvFOZAZzRNwVTlSQ9EK7kf3RzdwSvw8HBfbDv94qPQ,13578
 warp_beacon/scraper/youtube/music.py,sha256=5AeSBQyUgVCJT2hoBCV2WvlyuV9US09SYJhmBG_P9F8,2755
 warp_beacon/scraper/youtube/shorts.py,sha256=1GtoYUlxAwcgSQcn80u5ehNJytH5AN5dPOicmX-XD8E,1705
 warp_beacon/scraper/youtube/youtube.py,sha256=x9v9p1coA9TvBhxjNAofGu4UBkAEdYPE2ePRnU-5tK0,7233
@@ -46,13 +46,13 @@ warp_beacon/telegram/download_status.py,sha256=dV0mRIOkA8dU0ECsmC_rZ33XQhVnkW2nZ
 warp_beacon/telegram/edit_message.py,sha256=_452kXWn65qj9iPSvSmORbKXXTjJ0z6kBCxPcmKDrlM,5742
 warp_beacon/telegram/handlers.py,sha256=uvR6TPHSqdSxigp3wR-ewiE6t3TvVcbVLVcYGwkgD2s,9559
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
-warp_beacon/telegram/progress_bar.py,sha256=KKY5Sb3Mc-pfFDEAfsk3No8cY5N5Bo8Ng6yrnjBoRtE,3097
+warp_beacon/telegram/progress_bar.py,sha256=F9pbCaUJqXzfqB8NJDU3LdvlS2hVtXk1_CRQKRdaRHU,3206
 warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDHTzP78Mx5tdvPPWs,969
 warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
 warp_beacon/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
-warp_beacon-2.6.54.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.6.54.dist-info/METADATA,sha256=5EesVY6qf_28_QAvLcWGXBznvUvigu7JDlLui-OuLpc,22706
-warp_beacon-2.6.54.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-warp_beacon-2.6.54.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.6.54.dist-info/top_level.txt,sha256=2x4wBJ_HeeBt6Bsdu9C4tItXWqH8spX8jGSHpoL0IMw,1334
-warp_beacon-2.6.54.dist-info/RECORD,,
+warp_beacon-2.6.56.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.56.dist-info/METADATA,sha256=-bxVw_NVY79M0_YzOyIZf7lvMKnsL1GugCUXdfz90wc,22706
+warp_beacon-2.6.56.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+warp_beacon-2.6.56.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.56.dist-info/top_level.txt,sha256=2x4wBJ_HeeBt6Bsdu9C4tItXWqH8spX8jGSHpoL0IMw,1334
+warp_beacon-2.6.56.dist-info/RECORD,,