warp-beacon 2.6.72__tar.gz → 2.6.74__tar.gz

{warp_beacon-2.6.72/warp_beacon.egg-info → warp_beacon-2.6.74}/PKG-INFO

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

warp_beacon-2.6.74/warp_beacon/__version__.py

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

{warp_beacon-2.6.72 → warp_beacon-2.6.74}/warp_beacon/scraper/instagram/wb_instagrapi.py

@@ -35,7 +35,6 @@ class WBClient(Client):
 			content_length = int(response.headers.get("Content-Length", 0))
 		except (TypeError, ValueError):
 			logging.warning("Content-Length header is missing or invalid.")
-			content_length = 0
 
 		downloaded = 0
 		with open(path, "wb") as f:
@@ -59,4 +58,37 @@ class WBClient(Client):
 				f'Broken file "{path}" (expected {content_length}, got {downloaded})'
 			)
 
+		return path.resolve()
+
+	def photo_download_by_url(
+		self, url: str, filename: str = "", folder: Path = ""
+	) -> Path:
+		fname = urlparse(url).path.rsplit("/", 1)[1]
+		filename = f"{filename}.{(filename, fname.rsplit('.', 1)[1]) if filename else fname}"
+		path = Path(folder) / filename
+		response = requests.get(url, stream=True, timeout=self.request_timeout)
+		response.raise_for_status()
+
+		content_length = 0
+		try:
+			content_length = int(response.headers.get("Content-Length", 0))
+		except (TypeError, ValueError):
+			logging.warning("Content-Length header is missing or invalid.")
+
+		downloaded = 0
+		with open(path, "wb") as f:
+			response.raw.decode_content = True
+			for chunk in response.iter_content(chunk_size=4096):
+				if chunk:
+					f.write(chunk)
+					downloaded += len(chunk)
+					if self.progress_callback:
+						try:
+							self.progress_callback(
+								total=content_length or None,
+								bytes_transferred=downloaded,
+								path=path
+							)
+						except Exception as e:
+							logging.warning("Progress callback raised an exception!", exc_info=e)
 		return path.resolve()

{warp_beacon-2.6.72 → warp_beacon-2.6.74}/warp_beacon/telegram/progress_bar.py

@@ -9,6 +9,8 @@ from pyrogram import Client
 from warp_beacon.telegram.types import ReportType
 
 class ProgressBar(object):
+	MAX_PROGRESS_RENDER_SIZE = 30_000_000
+
 	def __init__(self, client: Client) -> None:
 		self._next_threshold = 20
 		self.client = client
@@ -90,6 +92,8 @@ class ProgressBar(object):
 			logging.exception(e)
 
 	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
 		if total:
 			percent = round(current * 100 / (total or 1))
@@ -111,8 +115,8 @@ class ProgressBar(object):
 					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 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.72 → warp_beacon-2.6.74/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.72/warp_beacon/__version__.py

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