warp-beacon 2.6.42__tar.gz → 2.6.44__tar.gz

{warp_beacon-2.6.42/warp_beacon.egg-info → warp_beacon-2.6.44}/PKG-INFO

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

{warp_beacon-2.6.42 → warp_beacon-2.6.44}/setup.py

@@ -66,6 +66,7 @@ setup(
 		"warp_beacon/telegram/handlers",
 		"warp_beacon/telegram/utils",
 		"warp_beacon/telegram/caption_shortener",
+		"warp_beacon/telegram/progress_file_reader",
 		"warp_beacon/jobs/abstract",
 		"warp_beacon/jobs/download_job",
 		"warp_beacon/jobs/upload_job",

warp_beacon-2.6.44/warp_beacon/__version__.py

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

{warp_beacon-2.6.42 → warp_beacon-2.6.44}/warp_beacon/telegram/bot.py

@@ -8,13 +8,13 @@ import logging
 import html
 
 import uvloop
+#from contextlib import ExitStack
 
 from pyrogram import Client, filters
 from pyrogram.enums import ParseMode, ChatType
 from pyrogram.handlers import MessageHandler, CallbackQueryHandler
 from pyrogram.types import InputMediaAudio, InputMediaPhoto, InputMediaVideo, InputMediaAnimation, InlineKeyboardButton, InlineKeyboardMarkup
 from pyrogram.errors import NetworkMigrate, BadRequest, MultiMediaTooLong, MessageIdInvalid
-from pyrogram.raw.types import InputFile, InputFileBig
 
 import warp_beacon
 from warp_beacon.__version__ import __version__
@@ -29,6 +29,7 @@ from warp_beacon.jobs import Origin
 from warp_beacon.telegram.utils import Utils
 from warp_beacon.telegram.caption_shortener import CaptionShortner
 from warp_beacon.scheduler.scheduler import IGScheduler
+from warp_beacon.telegram.progress_file_reader import ProgressFileReader
 
 class Bot(object):
 	should_exit = None
@@ -226,7 +227,7 @@ class Bot(object):
 
 		return caption
 
-	def build_tg_args(self, job: UploadJob) -> dict:
+	def build_tg_args(self, job: UploadJob, file_io: ProgressFileReader = None) -> dict:
 		args = {}
 		if job.media_type == JobType.VIDEO:
 			if job.tg_file_id:
@@ -242,7 +243,7 @@ class Bot(object):
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaVideo(
-						media=job.local_media_path,
+						media=file_io,
 						supports_streaming=True,
 						width=job.media_info["width"],
 						height=job.media_info["height"],
@@ -251,7 +252,7 @@ class Bot(object):
 						caption=self.build_signature_caption(job)
 					)
 				else:
-					args["video"] = job.local_media_path
+					args["video"] = file_io
 					args["supports_streaming"] = True
 					args["width"] = job.media_info["width"]
 					args["height"] = job.media_info["height"]
@@ -273,11 +274,11 @@ class Bot(object):
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaPhoto(
-						media=job.local_media_path,
+						media=file_io,
 						caption=self.build_signature_caption(job)
 					)
 				else:
-					args["photo"] = job.local_media_path
+					args["photo"] = file_io
 					args["caption"] = self.build_signature_caption(job)
 
 				args["file_name"] = os.path.basename(job.local_media_path)
@@ -293,7 +294,7 @@ class Bot(object):
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaAudio(
-						media=job.local_media_path,
+						media=file_io,
 						performer=job.media_info["performer"],
 						thumb=job.media_info["thumb"],
 						duration=round(job.media_info["duration"]),
@@ -301,7 +302,7 @@ class Bot(object):
 						caption=self.build_signature_caption(job)
 					)
 				else:
-					args["audio"] = job.local_media_path
+					args["audio"] = file_io
 					args["performer"] = job.media_info["performer"]
 					args["thumb"] = job.media_info["thumb"]
 					args["duration"] = round(job.media_info["duration"])
@@ -322,7 +323,7 @@ class Bot(object):
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaAnimation(
-						media=job.local_media_path,
+						media=file_io,
 						thumb=job.media_info["thumb"],
 						duration=round(job.media_info["duration"]),
 						width=job.media_info["width"],
@@ -330,7 +331,7 @@ class Bot(object):
 						caption=self.build_signature_caption(job)
 					)
 				else:
-					args["animation"] = job.local_media_path
+					args["animation"] = file_io
 					args["width"] = job.media_info["width"]
 					args["height"] = job.media_info["height"]
 					args["duration"] = round(job.media_info["duration"])
@@ -363,7 +364,7 @@ class Bot(object):
 					for j in chunk:
 						if j.media_type == JobType.VIDEO:
 							vid = InputMediaVideo(
-								media=j.local_media_path,
+								media=ProgressFileReader(j.local_media_path, self.progress_callback),
 								supports_streaming=True,
 								width=j.media_info["width"],
 								height=j.media_info["height"],
@@ -374,7 +375,7 @@ class Bot(object):
 							tg_chunk.append(vid)
 						elif j.media_type == JobType.IMAGE:
 							photo = InputMediaPhoto(
-								media=j.local_media_path,
+								media=ProgressFileReader(j.local_media_path, self.progress_callback),
 								caption=self.build_signature_caption(job)
 							)
 							tg_chunk.append(photo)
@@ -404,25 +405,8 @@ class Bot(object):
 
 		return args
 
-	async def upload_with_progress(self, job: UploadJob) -> list[Union[InputFile, InputFileBig]]:
-		def progress_callback(current: int, total: int) -> None:
-			logging.info("[%s] Uploaded %.1f%%", job.local_media_path, current * 100 / total)
-
-		if job.media_type == JobType.COLLECTION:
-			col_uploaded_files = []
-			for chunk in job.media_collection:
-				for col in chunk:
-					uploaded_file = await self.client.save_file(
-						path=col.local_media_path,
-						progress=progress_callback
-					)
-					col_uploaded_files.append(uploaded_file)
-			return col_uploaded_files
-
-		return [await self.client.save_file(
-			path=job.local_media_path,
-			progress=progress_callback
-		)]
+	def progress_callback(self, filename: str, current: int, total: int) -> None:
+		logging.info("[%s] Uploaded %.1f%%", filename, current * 100 / total)
 
 	async def upload_job(self, job: UploadJob) -> list[str]:
 		tg_file_ids = []
@@ -437,8 +421,8 @@ class Bot(object):
 							await Utils.ensure_me_loaded(self.client)
 						if job.placeholder_message_id:
 							try:
-								#uploaded_files = await self.upload_with_progress(job)
-								reply_message = await self.client.edit_message_media(**self.build_tg_args(job))
+								with ProgressFileReader(job.local_media_path, self.progress_callback) as f:
+									reply_message = await self.client.edit_message_media(**self.build_tg_args(job, f))
 							except MessageIdInvalid:
 								logging.warning("Placeholder message not found. Looks like placeholder message was deleted by administrator.")
 								job.placeholder_message_id = None
@@ -451,17 +435,18 @@ class Bot(object):
 								JobType.ANIMATION: self.client.send_animation
 							}
 							try:
-								#uploaded_files = await self.upload_with_progress(job)
-								reply_message = await send_funcs[job.media_type](**self.build_tg_args(job))
+								with ProgressFileReader(job.local_media_path, self.progress_callback) as f:
+									reply_message = await send_funcs[job.media_type](**self.build_tg_args(job, f))
 							except ValueError as e:
 								err_text = str(e)
 								if "Expected" in err_text:
 									logging.warning("Expectations exceeded reality.")
 									logging.warning(err_text)
 									expectation, reality = Utils.parse_expected_patronum_error(err_text)
-									job_args = self.build_tg_args(job)
-									job_args[reality.value.lower()] = job_args.pop(expectation.value.lower())
-									reply_message = await send_funcs[reality](**job_args)
+									with ProgressFileReader(job.local_media_path, self.progress_callback) as f:
+										job_args = self.build_tg_args(job, f)
+										job_args[reality.value.lower()] = job_args.pop(expectation.value.lower())
+										reply_message = await send_funcs[reality](**job_args)
 
 						tg_file_id = Utils.extract_file_id(reply_message)
 						tg_file_ids.append(tg_file_id)
@@ -474,8 +459,17 @@ class Bot(object):
 						snd_grp_options = {"chat_id": job.chat_id, "reply_to_message_id": job.message_id}
 						for i, media_chunk in enumerate(col_job_args["media"]):
 							snd_grp_options["media"] = media_chunk
-							messages = await self.client.send_media_group(**snd_grp_options)
-							sent_messages += messages
+							messages = None
+							try:
+								messages = await self.client.send_media_group(**snd_grp_options)
+							finally:
+								try:
+									for med in snd_grp_options["media"]:
+										med.media.close()
+								except AttributeError:
+									pass
+							if messages:
+								sent_messages += messages
 							if job.media_collection:
 								for j, _ in enumerate(media_chunk):
 									tg_file_id = Utils.extract_file_id(messages[j])

warp_beacon-2.6.44/warp_beacon/telegram/progress_file_reader.py

@@ -0,0 +1,35 @@
+import io
+import os
+from types import TracebackType
+from typing import Optional, Callable, Type
+
+class ProgressFileReader(io.BufferedReader):
+	def __init__(self, file_path: str, callback: Optional[Callable[[str, int, int], None]]) -> None:
+		self.raw = open(file_path, "rb")
+		super().__init__(self.raw)
+		self.callback = callback
+		self.total = os.path.getsize(file_path)
+		self.read_bytes = 0
+		self.name = os.path.basename(file_path)
+
+	def read(self, size: int = -1) -> bytes:
+		chunk = super().read(size)
+		self.read_bytes += len(chunk)
+		if self.callback:
+			self.callback(self.name, self.read_bytes, self.total)
+		return chunk
+
+	def close(self) -> None:
+		if not self.closed:
+			super().close()
+			self.raw.close()
+
+	def __enter__(self) -> "ProgressFileReader":
+		return self
+
+	def __exit__(self,
+		exc_type: Optional[Type[BaseException]],
+		exc_val: Optional[BaseException],
+		exc_tb: Optional[TracebackType]
+	) -> None:
+		self.close()

{warp_beacon-2.6.42 → warp_beacon-2.6.44/warp_beacon.egg-info}/PKG-INFO

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

{warp_beacon-2.6.42 → warp_beacon-2.6.44}/warp_beacon.egg-info/SOURCES.txt

@@ -57,5 +57,6 @@ warp_beacon/telegram/bot.py
 warp_beacon/telegram/caption_shortener.py
 warp_beacon/telegram/handlers.py
 warp_beacon/telegram/placeholder_message.py
+warp_beacon/telegram/progress_file_reader.py
 warp_beacon/telegram/utils.py
 warp_beacon/uploader/__init__.py

{warp_beacon-2.6.42 → warp_beacon-2.6.44}/warp_beacon.egg-info/top_level.txt

@@ -36,6 +36,7 @@ warp_beacon/telegram/bot
 warp_beacon/telegram/caption_shortener
 warp_beacon/telegram/handlers
 warp_beacon/telegram/placeholder_message
+warp_beacon/telegram/progress_file_reader
 warp_beacon/telegram/utils
 warp_beacon/uploader
 warp_beacon/warp_beacon

warp_beacon-2.6.42/warp_beacon/__version__.py

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