warp-beacon 2.6.75__tar.gz → 2.6.77__tar.gz

{warp_beacon-2.6.75/warp_beacon.egg-info → warp_beacon-2.6.77}/PKG-INFO

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

warp_beacon-2.6.77/warp_beacon/__version__.py

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

{warp_beacon-2.6.75 → warp_beacon-2.6.77}/warp_beacon/scraper/instagram/instagram.py

@@ -431,6 +431,8 @@ class InstagramScraper(ScraperAbstract):
 		return password
 	
 	def download_progress(self, total: int | None, bytes_transferred: int, path: Path) -> None:
+		if not total:
+			return
 		percentage_of_completion = round(bytes_transferred / (total or 1) * 100)
 		if percentage_of_completion >= self._download_progress_threshold:
 			logging.debug("[Download] IG file '%s', %d", str(path), percentage_of_completion)

{warp_beacon-2.6.75 → warp_beacon-2.6.77}/warp_beacon/scraper/instagram/wb_instagrapi.py

@@ -25,10 +25,11 @@ class WBClient(Client):
 		filename = f"{filename}.{fname.rsplit('.', 1)[1]}" if filename else fname
 		path = Path(folder or Path.cwd()) / filename
 
-		logging.info("Downloading video from %s to %s", url, path)
+		logging.info("Downloading video from '%s' to '%s'", url, path)
 
 		response = requests.get(url, stream=True, timeout=self.request_timeout)
 		response.raise_for_status()
+		logging.info("Response headers: %s", response.headers)
 
 		content_length = 0
 		try:
@@ -66,8 +67,12 @@ class WBClient(Client):
 		fname = urlparse(url).path.rsplit("/", 1)[1]
 		filename = f"{filename}.{(filename, fname.rsplit('.', 1)[1]) if filename else fname}"
 		path = Path(folder) / filename
+
+		logging.info("Downloading photo from '%s' to '%s'", url, path)
+
 		response = requests.get(url, stream=True, timeout=self.request_timeout)
 		response.raise_for_status()
+		logging.info("Response headers: %s", response.headers)
 
 		content_length = 0
 		try:

{warp_beacon-2.6.75 → warp_beacon-2.6.77}/warp_beacon/telegram/progress_bar.py

@@ -9,7 +9,7 @@ from pyrogram import Client
 from warp_beacon.telegram.types import ReportType
 
 class ProgressBar(object):
-	MAX_PROGRESS_RENDER_SIZE = 1_000_000 # 1 MB
+	MAX_PROGRESS_RENDER_SIZE = 1_500_000 # 1 MB
 
 	def __init__(self, client: Client) -> None:
 		self._next_threshold = 20
@@ -73,7 +73,7 @@ class ProgressBar(object):
 
 	async def progress_callback(self, current: int, total: int, chat_id: int | str, message_id: int, operation: str, report_type: ReportType, label: str = "") -> None:
 		if report_type == ReportType.PROGRESS:
-			return self.render_progress_bar(current=current, total=total, chat_id=chat_id, message_id=message_id, operation=operation, label=label)
+			return await self.render_progress_bar(current=current, total=total, chat_id=chat_id, message_id=message_id, operation=operation, label=label)
 		elif report_type == ReportType.ANNOUNCE:
 			return self.render_progress_announce(chat_id=chat_id, message_id=message_id, label=label)
 
@@ -91,7 +91,7 @@ class ProgressBar(object):
 			logging.warning("An error occurred while setup task to update progress bar")
 			logging.exception(e)
 
-	def render_progress_bar(self, current: int, total: int, chat_id: int | str, message_id: int, operation: str, label: str = "") -> None:
+	async def render_progress_bar(self, current: int, total: int, chat_id: int | str, message_id: int, operation: str, label: str = "") -> None:
 		if total <= self.MAX_PROGRESS_RENDER_SIZE:
 			return
 		percent = 0
@@ -104,19 +104,19 @@ class ProgressBar(object):
 			pbar = self.make_emoji_progress_bar(percent, 10)
 			logging.info("[Progress bar]: Operation: %s %d%%", operation, percent)
 			try:
-				#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
 				text = f"{pbar}\n{operation}"
 				if label:
 					text += f"\n<code>{label}</code>"
 				if total:
 					text += f" <b>{self.format_size_si(total)}</b>"
-				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)
-			#except MessageNotModified:
-			#	logging.warning("bad_request_400.MessageNotModified")
+				await self.client.edit_message_caption(chat_id, message_id, text, ParseMode.HTML)
+				#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)
+			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.75 → warp_beacon-2.6.77/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.75/warp_beacon/__version__.py

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