warp-beacon 2.8.17__tar.gz → 2.8.19__tar.gz

{warp_beacon-2.8.17/warp_beacon.egg-info → warp_beacon-2.8.19}/PKG-INFO

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

warp_beacon-2.8.19/warp_beacon/__version__.py

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

{warp_beacon-2.8.17 → warp_beacon-2.8.19}/warp_beacon/scraper/X/X.py

@@ -20,10 +20,10 @@ class XScraper(XAbstract):
 	def extract_canonical_name(self, media: dict) -> str:
 		ret = ""
 		try:
-			if media.get("title", None):
+			if media.get("description"):
+				ret = media["description"]
+			elif media.get("title"):
 				ret = media["title"]
-			if media.get("description", ""):
-				ret += "\n" + media["description"]
 		except Exception as e:
 			logging.warning("Failed to extract canonical media name!")
 			logging.exception(e)

{warp_beacon-2.8.17 → warp_beacon-2.8.19}/warp_beacon/telegram/bot.py

@@ -222,11 +222,11 @@ class Bot(object):
 				if job.source_username.startswith("<a href="):
 					caption += f"Requested by <b>{job.source_username}</b>"
 				else:
-					caption += f"Requested by <b>@{job.source_username}</b>"
+					caption += f"Requested by <b>@{html.escape(job.source_username)}</b>"
 			if job.source_username and job.url:
 				caption += " | "
 			if job.url:
-				caption += f'<a href="{job.url}">source link</a>'
+				caption += f'<a href="{html.escape(job.url)}">source link</a>'
 
 		return caption
 
@@ -238,11 +238,11 @@ class Bot(object):
 					args["media"] = InputMediaVideo(
 						media=job.tg_file_id.replace(":video", ''),
 						supports_streaming=True,
-						caption=self.build_signature_caption(job)
+						caption=self.build_signature_caption(job, job.message_text)
 					)
 				else:
 					args["video"] = job.tg_file_id.replace(":video", '')
-					args["caption"] = self.build_signature_caption(job)
+					args["caption"] = self.build_signature_caption(job, job.message_text)
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaVideo(
@@ -252,7 +252,7 @@ class Bot(object):
 						height=job.media_info["height"],
 						duration=round(job.media_info["duration"]),
 						thumb=job.media_info["thumb"],
-						caption=self.build_signature_caption(job)
+						caption=self.build_signature_caption(job, job.message_text)
 					)
 				else:
 					args["video"] = job.local_media_path
@@ -261,7 +261,7 @@ class Bot(object):
 					args["height"] = job.media_info["height"]
 					args["duration"] = round(job.media_info["duration"])
 					args["thumb"] = job.media_info["thumb"]
-					args["caption"] = self.build_signature_caption(job)
+					args["caption"] = self.build_signature_caption(job, job.message_text)
 
 				args["file_name"] = os.path.basename(job.local_media_path)
 		elif job.media_type == JobType.IMAGE:
@@ -269,20 +269,20 @@ class Bot(object):
 				if job.placeholder_message_id:
 					args["media"] = InputMediaPhoto(
 						media=job.tg_file_id.replace(":image", ''),
-						caption=self.build_signature_caption(job)
+						caption=self.build_signature_caption(job, job.message_text)
 					)
 				else:
 					args["photo"] = job.tg_file_id.replace(":image", '')
-					args["caption"] = self.build_signature_caption(job)
+					args["caption"] = self.build_signature_caption(job, job.message_text)
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaPhoto(
 						media=job.local_media_path,
-						caption=self.build_signature_caption(job)
+						caption=self.build_signature_caption(job, job.message_text)
 					)
 				else:
 					args["photo"] = job.local_media_path
-					args["caption"] = self.build_signature_caption(job)
+					args["caption"] = self.build_signature_caption(job, job.message_text)
 
 				args["file_name"] = os.path.basename(job.local_media_path)
 		elif job.media_type == JobType.AUDIO:
@@ -290,7 +290,7 @@ class Bot(object):
 				if job.placeholder_message_id:
 					args["media"] = InputMediaAudio(
 						media=job.tg_file_id.replace(":audio", ''),
-						caption=self.build_signature_caption(job)
+						caption=self.build_signature_caption(job, job.message_text)
 					)
 				else:
 					args["audio"] = job.tg_file_id.replace(":audio", '')
@@ -302,7 +302,7 @@ class Bot(object):
 						thumb=job.media_info["thumb"],
 						duration=round(job.media_info["duration"]),
 						title=job.canonical_name,
-						caption=self.build_signature_caption(job)
+						caption=self.build_signature_caption(job, job.message_text)
 					)
 				else:
 					args["audio"] = job.local_media_path
@@ -310,7 +310,7 @@ class Bot(object):
 					args["thumb"] = job.media_info["thumb"]
 					args["duration"] = round(job.media_info["duration"])
 					args["title"] = job.canonical_name
-					args["caption"] = self.build_signature_caption(job)
+					args["caption"] = self.build_signature_caption(job, job.message_text)
 
 				args["file_name"] = os.path.basename(job.local_media_path)
 		elif job.media_type == JobType.ANIMATION:
@@ -318,11 +318,11 @@ class Bot(object):
 				if job.placeholder_message_id:
 					args["media"] = InputMediaAnimation(
 						media=job.tg_file_id.replace(":animation", ''),
-						caption=self.build_signature_caption(job)
+						caption=self.build_signature_caption(job, job.message_text)
 					)
 				else:
 					args["animation"] = job.tg_file_id.replace(":animation", '')
-					args["caption"] = self.build_signature_caption(job)
+					args["caption"] = self.build_signature_caption(job, job.message_text)
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaAnimation(
@@ -331,7 +331,7 @@ class Bot(object):
 						duration=round(job.media_info["duration"]),
 						width=job.media_info["width"],
 						height=job.media_info["height"],
-						caption=self.build_signature_caption(job)
+						caption=self.build_signature_caption(job, job.message_text)
 					)
 				else:
 					args["animation"] = job.local_media_path
@@ -339,7 +339,7 @@ class Bot(object):
 					args["height"] = job.media_info["height"]
 					args["duration"] = round(job.media_info["duration"])
 					args["thumb"] = job.media_info["thumb"]
-					args["caption"] = self.build_signature_caption(job)
+					args["caption"] = self.build_signature_caption(job, job.message_text)
 
 				args["file_name"] = os.path.basename(job.local_media_path)
 		elif job.media_type == JobType.COLLECTION:
@@ -352,11 +352,11 @@ class Bot(object):
 						ctype = JobType[mtype.upper()]
 						ptr = None
 						if ctype == JobType.VIDEO:
-							ptr = InputMediaVideo(media=tg_id, caption=self.build_signature_caption(job))
+							ptr = InputMediaVideo(media=tg_id, caption=self.build_signature_caption(job, job.message_text))
 						elif ctype == JobType.IMAGE:
-							ptr = InputMediaPhoto(media=tg_id, caption=self.build_signature_caption(job))
+							ptr = InputMediaPhoto(media=tg_id, caption=self.build_signature_caption(job, job.message_text))
 						elif ctype == JobType.ANIMATION:
-							ptr = InputMediaAnimation(media=tg_id, caption=self.build_signature_caption(job))
+							ptr = InputMediaAnimation(media=tg_id, caption=self.build_signature_caption(job, job.message_text))
 						tg_chunk.append(ptr)
 
 					args["media"].append(tg_chunk)

{warp_beacon-2.8.17 → warp_beacon-2.8.19}/warp_beacon/telegram/handlers.py

@@ -177,7 +177,7 @@ class Handlers(object):
 						url = new_url
 						origin = Origin.YOUTUBE
 				if origin is Origin.UNKNOWN:
-					logging.info("Only Instagram, YouTube Shorts and YouTube Music are now supported. Skipping.")
+					logging.info("Only Instagram, YouTube Shorts, YouTube Music and X are now supported. Skipping.")
 					continue
 				entities, tg_file_ids = [], []
 				uniq_id = Storage.compute_uniq(url)

{warp_beacon-2.8.17 → warp_beacon-2.8.19}/warp_beacon/uploader/__init__.py

@@ -12,7 +12,6 @@ from warp_beacon.storage import Storage
 
 class AsyncUploader(object):
 	__JOE_BIDEN_WAKEUP = None
-	pool_size = 1
 
 	def __init__(self,
 			loop: asyncio.AbstractEventLoop,
@@ -65,6 +64,9 @@ class AsyncUploader(object):
 	def queue_task(self, job: UploadJob) -> None:
 		self.job_queue.put_nowait(job)
 
+	async def callback_wrap(self, *args, **kwargs) -> None:
+		await self.upload_wrapper(*args, **kwargs)
+
 	def do_work(self) -> None:
 		logging.info("Upload worker started")
 		while self.allow_loop:
@@ -103,16 +105,13 @@ class AsyncUploader(object):
 						else:
 							logging.info("Accepted upload job, file(s): '%s'", path)
 
-					async def callback_wrap(*args, **kwargs) -> None:
-						await self.upload_wrapper(*args, **kwargs)
-
 					try:
 						if job.job_failed:
 							logging.info("URL '%s' download failed. Skipping upload job ...", job.url)
 							if job.job_failed_msg: # we want to say something to user
 								self.loop.call_soon_threadsafe(
 									asyncio.create_task,
-									callback_wrap(job)
+									self.callback_wrap(job)
 								)
 							self.process_done(uniq_id)
 							continue
@@ -120,7 +119,7 @@ class AsyncUploader(object):
 						if job.replay:
 							self.loop.call_soon_threadsafe(
 								asyncio.create_task,
-								callback_wrap(job)
+								self.callback_wrap(job)
 							)
 							continue
 
@@ -129,7 +128,7 @@ class AsyncUploader(object):
 							if job.job_warning_msg:
 								self.loop.call_soon_threadsafe(
 									asyncio.create_task,
-									callback_wrap(job)
+									self.callback_wrap(job)
 								)
 							continue
 						if in_process:
@@ -147,7 +146,7 @@ class AsyncUploader(object):
 									job.canonical_name = db_data.get("canonical_name", "")
 								self.loop.call_soon_threadsafe(
 									asyncio.create_task,
-									callback_wrap(job)
+									self.callback_wrap(job)
 								)
 								self.process_done(uniq_id)
 							else:
@@ -155,7 +154,7 @@ class AsyncUploader(object):
 						else:
 							self.loop.call_soon_threadsafe(
 								asyncio.create_task,
-								callback_wrap(job)
+								self.callback_wrap(job)
 							)
 							self.process_done(uniq_id)
 					except Exception as e:
@@ -165,4 +164,4 @@ class AsyncUploader(object):
 			except Exception as e:
 				logging.error("Exception occurred inside upload worker!")
 				logging.exception(e)
-			logging.info("Thread done")
+		logging.info("Thread done")

{warp_beacon-2.8.17 → warp_beacon-2.8.19/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.8.17/warp_beacon/__version__.py

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