warp-beacon 2.6.76__tar.gz → 2.6.78__tar.gz

{warp_beacon-2.6.76/warp_beacon.egg-info → warp_beacon-2.6.78}/PKG-INFO

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

warp_beacon-2.6.78/warp_beacon/__version__.py

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

{warp_beacon-2.6.76 → warp_beacon-2.6.78}/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.76 → warp_beacon-2.6.78}/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.76 → warp_beacon-2.6.78}/warp_beacon/telegram/edit_message.py

@@ -1,3 +1,5 @@
+import re
+
 from pyrogram.client import Client
 from pyrogram.types import InputMedia, InputMediaAudio, InputMediaPhoto, InputMediaVideo, InputMediaAnimation, InlineKeyboardMarkup
 from pyrogram import raw
@@ -9,6 +11,7 @@ from warp_beacon.telegram.types import ReportType
 class EditMessage(object):
 	def __init__(self, client: Client) -> None:
 		self.client = client
+		self.base64_str_tpl = re.compile(r"[A-Za-z0-9\-_]{30,}")
 
 	def get_wrapped_video(self, raw_file: raw.base.InputFile, raw_thumb: raw.base.InputFile, media: InputMediaVideo, file_name: str = None) -> raw.types.InputMediaUploadedDocument:
 		return raw.types.InputMediaUploadedDocument(
@@ -72,18 +75,8 @@ class EditMessage(object):
 			]
 		)
 
-	#async def upload_with_progress(self,
-	#	media: InputMedia | InputMediaAudio | InputMediaPhoto | InputMediaVideo | InputMediaAnimation,
-	#	chat_id: int | str,
-	#	message_id: int,
-	#	file_name: str
-	#) -> raw.base.InputFile:
-	#	progress_bar = ProgressBar(self.client)
-	#	progress_id = f"{chat_id}:{message_id}:{file_name}"
-	#	self.progress_bars[progress_id] = progress_bar
-	#	raw_file = await self.client.save_file(path=media.media, progress=progress_bar.progress_callback, progress_args=(chat_id, message_id, file_name,))
-	#	del self.progress_bars[progress_id]
-	#	return raw_file
+	def looks_like_token(self, s: str) -> bool:
+		return bool(self.base64_str_tpl, s)
 
 	async def edit(self,
 		chat_id: int | str,
@@ -92,9 +85,14 @@ class EditMessage(object):
 		reply_markup: InlineKeyboardMarkup = None,
 		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=ReportType.PROGRESS)
-		raw_file = await self.client.save_file(path=media.media, progress=progress_bar.progress_callback, progress_args=(chat_id, message_id, "Uploading", ReportType.PROGRESS, file_name))
+		is_looks_like_token = self.looks_like_token(media.media)
+		raw_file = None
+		if not is_looks_like_token:
+			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=ReportType.PROGRESS)
+			raw_file = await self.client.save_file(path=media.media, progress=progress_bar.progress_callback, progress_args=(chat_id, message_id, "Uploading", ReportType.PROGRESS, file_name))
+		else:
+			raw_file = media.media
 
 		caption = media.caption
 		parse_mode = media.parse_mode
@@ -107,17 +105,23 @@ class EditMessage(object):
 		raw_media = None
 		if isinstance(media, types.InputMediaVideo):
 			#progress_bar_thumb = ProgressBar(self.client)
-			raw_file_thumb = await self.client.save_file(path=media.thumb)
+			raw_file_thumb = None
+			if not is_looks_like_token:
+				raw_file_thumb = await self.client.save_file(path=media.thumb)
 			raw_media = self.get_wrapped_video(raw_file=raw_file, raw_thumb=raw_file_thumb, media=media, file_name=file_name)
 		elif isinstance(media, types.InputMediaPhoto):
 			raw_media = self.get_wrapped_photo(raw_file=raw_file, media=media)
 		elif isinstance(media, types.InputMediaAudio):
 			#progress_bar_thumb = ProgressBar(self.client)
-			raw_file_thumb = await self.client.save_file(path=media.thumb)
+			raw_file_thumb = None
+			if not is_looks_like_token:
+				raw_file_thumb = await self.client.save_file(path=media.thumb)
 			raw_media = self.get_wrapped_audio(raw_file=raw_file, raw_thumb=raw_file_thumb, media=media, file_name=file_name)
 		elif isinstance(media, types.InputMediaAnimation):
 			#progress_bar_thumb = ProgressBar(self.client)
-			raw_file_thumb = await self.client.save_file(path=media.thumb)
+			raw_file_thumb = None
+			if not is_looks_like_token:
+				raw_file_thumb = await self.client.save_file(path=media.thumb)
 			raw_media = self.get_wrapped_animation(raw_file=raw_file, raw_thumb=raw_file_thumb, media=media, file_name=file_name)
 
 		peer = await self.client.resolve_peer(chat_id)

{warp_beacon-2.6.76 → warp_beacon-2.6.78/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.76/warp_beacon/__version__.py

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