warp-beacon 2.6.38__py3-none-any.whl → 2.6.40__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.6.38"
+__version__ = "2.6.40"
 

warp_beacon/scraper/account_selector.py

@@ -61,7 +61,7 @@ class AccountSelector(object):
 	def save_ig_sessions_id(self) -> None:
 		try:
 			with open(f"{self.session_dir}/ig_sessions_client_id.json", "w+", encoding="utf-8") as f:
-				f.write(json.dumps(self.ig_accounts_session_id))
+				f.write(json.dumps(dict(self.ig_accounts_session_id)))
 		except Exception as e:
 			logging.warning("Failed to save session ig_session_client_id!")
 			logging.exception(e)

warp_beacon/telegram/bot.py

@@ -12,8 +12,9 @@ import uvloop
 from pyrogram import Client, filters
 from pyrogram.enums import ParseMode, ChatType
 from pyrogram.handlers import MessageHandler, CallbackQueryHandler
-from pyrogram.types import Message, InputMedia, InputMediaAudio, InputMediaPhoto, InputMediaVideo, InputMediaAnimation, InputMediaDocument, InlineKeyboardButton, InlineKeyboardMarkup
-from pyrogram.errors import RPCError, FloodWait, NetworkMigrate, BadRequest, MultiMediaTooLong, MessageIdInvalid
+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__
@@ -225,7 +226,7 @@ class Bot(object):
 
 		return caption
 
-	def build_tg_args(self, job: UploadJob) -> dict:
+	def build_tg_args(self, job: UploadJob, uploaded_files: list[Union[InputFile, InputFileBig]]) -> dict:
 		args = {}
 		if job.media_type == JobType.VIDEO:
 			if job.tg_file_id:
@@ -241,7 +242,7 @@ class Bot(object):
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaVideo(
-						media=job.local_media_path,
+						media=next(iter(uploaded_files)),
 						supports_streaming=True,
 						width=job.media_info["width"],
 						height=job.media_info["height"],
@@ -250,7 +251,7 @@ class Bot(object):
 						caption=self.build_signature_caption(job)
 					)
 				else:
-					args["video"] = job.local_media_path
+					args["video"] = next(iter(uploaded_files))
 					args["supports_streaming"] = True
 					args["width"] = job.media_info["width"]
 					args["height"] = job.media_info["height"]
@@ -272,11 +273,11 @@ class Bot(object):
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaPhoto(
-						media=job.local_media_path,
+						media=next(iter(uploaded_files)),
 						caption=self.build_signature_caption(job)
 					)
 				else:
-					args["photo"] = job.local_media_path
+					args["photo"] = next(iter(uploaded_files))
 					args["caption"] = self.build_signature_caption(job)
 
 				args["file_name"] = os.path.basename(job.local_media_path)
@@ -292,7 +293,7 @@ class Bot(object):
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaAudio(
-						media=job.local_media_path,
+						media=next(iter(uploaded_files)),
 						performer=job.media_info["performer"],
 						thumb=job.media_info["thumb"],
 						duration=round(job.media_info["duration"]),
@@ -300,7 +301,7 @@ class Bot(object):
 						caption=self.build_signature_caption(job)
 					)
 				else:
-					args["audio"] = job.local_media_path
+					args["audio"] = next(iter(uploaded_files))
 					args["performer"] = job.media_info["performer"]
 					args["thumb"] = job.media_info["thumb"]
 					args["duration"] = round(job.media_info["duration"])
@@ -321,7 +322,7 @@ class Bot(object):
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaAnimation(
-						media=job.local_media_path,
+						media=next(iter(uploaded_files)),
 						thumb=job.media_info["thumb"],
 						duration=round(job.media_info["duration"]),
 						width=job.media_info["width"],
@@ -329,7 +330,7 @@ class Bot(object):
 						caption=self.build_signature_caption(job)
 					)
 				else:
-					args["animation"] = job.local_media_path
+					args["animation"] = next(iter(uploaded_files))
 					args["width"] = job.media_info["width"]
 					args["height"] = job.media_info["height"]
 					args["duration"] = round(job.media_info["duration"])
@@ -357,23 +358,27 @@ class Bot(object):
 					args["media"].append(tg_chunk)
 			else:
 				mediafs = []
+				file_index = 0
 				for chunk in job.media_collection:
 					tg_chunk = []
-					for j in chunk:
-						if j.media_type == JobType.VIDEO:
+					for el in chunk:
+						uploaded_file = uploaded_files[file_index]
+						file_index += 1
+
+						if el.media_type == JobType.VIDEO:
 							vid = InputMediaVideo(
-								media=j.local_media_path,
+								media=uploaded_file,
 								supports_streaming=True,
-								width=j.media_info["width"],
-								height=j.media_info["height"],
-								duration=round(j.media_info["duration"]),
-								thumb=j.media_info["thumb"],
+								width=el.media_info["width"],
+								height=el.media_info["height"],
+								duration=round(el.media_info["duration"]),
+								thumb=el.media_info["thumb"],
 								caption=self.build_signature_caption(job)
 							)
 							tg_chunk.append(vid)
-						elif j.media_type == JobType.IMAGE:
+						elif el.media_type == JobType.IMAGE:
 							photo = InputMediaPhoto(
-								media=j.local_media_path,
+								media=uploaded_file,
 								caption=self.build_signature_caption(job)
 							)
 							tg_chunk.append(photo)
@@ -403,6 +408,26 @@ 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(
+						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(
+			file_path=job.local_media_path,
+			progress=progress_callback
+		)]
+
 	async def upload_job(self, job: UploadJob) -> list[str]:
 		tg_file_ids = []
 		try:
@@ -416,7 +441,8 @@ class Bot(object):
 							await Utils.ensure_me_loaded(self.client)
 						if job.placeholder_message_id:
 							try:
-								reply_message = await self.client.edit_message_media(**self.build_tg_args(job))
+								uploaded_files = await self.upload_with_progress(job)
+								reply_message = await self.client.edit_message_media(**self.build_tg_args(job, uploaded_files))
 							except MessageIdInvalid:
 								logging.warning("Placeholder message not found. Looks like placeholder message was deleted by administrator.")
 								job.placeholder_message_id = None
@@ -429,14 +455,15 @@ class Bot(object):
 								JobType.ANIMATION: self.client.send_animation
 							}
 							try:
-								reply_message = await send_funcs[job.media_type](**self.build_tg_args(job))
+								uploaded_files = await self.upload_with_progress(job)
+								reply_message = await send_funcs[job.media_type](**self.build_tg_args(job, uploaded_files))
 							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 = self.build_tg_args(job, uploaded_files)
 									job_args[reality.value.lower()] = job_args.pop(expectation.value.lower())
 									reply_message = await send_funcs[reality](**job_args)
 
@@ -445,7 +472,8 @@ class Bot(object):
 						job.tg_file_id = tg_file_id
 						logging.info("Uploaded media file with type '%s' tg_file_id is '%s'", job.media_type.value, job.tg_file_id)
 					elif job.media_type == JobType.COLLECTION:
-						col_job_args = self.build_tg_args(job)
+						uploaded_files = await self.upload_with_progress(job)
+						col_job_args = self.build_tg_args(job, uploaded_files)
 						sent_messages = []
 						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"]):

{warp_beacon-2.6.38.dist-info → warp_beacon-2.6.40.dist-info}/METADATA

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

{warp_beacon-2.6.38.dist-info → warp_beacon-2.6.40.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=CzGvQVuj99cUjAvhgGLIbDwYZE06WXkvUaCJNUoEi_Q,24
+warp_beacon/__version__.py,sha256=JeoFTFuXbUA8AG8mWIfjNnPe5U8lgjF_fAazxZJ1mRI,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
@@ -24,7 +24,7 @@ warp_beacon/scheduler/instagram_human.py,sha256=0LaRUu0MBBuEOQeFzuq22HIYfJL9pTK_
 warp_beacon/scheduler/scheduler.py,sha256=9OCh7Ta4wY_aTHGAOOZmaKXg56Ftx1N_aV1g6E3ZLKA,4941
 warp_beacon/scraper/__init__.py,sha256=NAx81O85yP0vUP1uZ9VHZlXh-zZgN_LHm7gWcU5BV18,19982
 warp_beacon/scraper/abstract.py,sha256=yP76ae9U73LYW2lDN6XWkXDkWX1h2UVOrkqv0Sqpu2Y,2985
-warp_beacon/scraper/account_selector.py,sha256=_QOezkVM2GqiuseZ72h8U0WmOYFuRoUXEHIDqNl4Nxs,9721
+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
 warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5ripx7tM,2447
@@ -40,15 +40,15 @@ warp_beacon/scraper/youtube/youtube.py,sha256=x9v9p1coA9TvBhxjNAofGu4UBkAEdYPE2e
 warp_beacon/storage/__init__.py,sha256=0Vajd0oITKJfu2vmNx5uQSt3-L6vwIvUYWJo8HZCjco,3398
 warp_beacon/storage/mongo.py,sha256=qC4ZiO8XXvPnP0rJwz4CJx42pqFsyAjCiW10W5QdT6E,527
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/telegram/bot.py,sha256=0MyFSSN0DlJCZYVJignwG8SHX8uTf_1KgE1k6IiRses,18826
+warp_beacon/telegram/bot.py,sha256=n5e_Z6RXDP2jjoHbxE3LJXxR17sOxL1l-y477nGGhb4,19941
 warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJbND_dX5Fhwkv0,1549
 warp_beacon/telegram/handlers.py,sha256=uvR6TPHSqdSxigp3wR-ewiE6t3TvVcbVLVcYGwkgD2s,9559
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
 warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
 warp_beacon/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
-warp_beacon-2.6.38.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.6.38.dist-info/METADATA,sha256=wPkz6QdKjQdNAMi4CstB37WhSTw9ZpdaOO2eocCz3Ps,22706
-warp_beacon-2.6.38.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
-warp_beacon-2.6.38.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.6.38.dist-info/top_level.txt,sha256=aFsWDQBplsMOyVMGGJ8iu-auZ25z1e_IB4tM2M8kW1A,1187
-warp_beacon-2.6.38.dist-info/RECORD,,
+warp_beacon-2.6.40.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.40.dist-info/METADATA,sha256=ITOyqqENYwVqUXwbktnVY_6Jczf584NiBvtDDuyfQpk,22706
+warp_beacon-2.6.40.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
+warp_beacon-2.6.40.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.40.dist-info/top_level.txt,sha256=aFsWDQBplsMOyVMGGJ8iu-auZ25z1e_IB4tM2M8kW1A,1187
+warp_beacon-2.6.40.dist-info/RECORD,,