warp-beacon 2.7.6__py3-none-any.whl → 2.7.8__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.7.6"
+__version__ = "2.7.8"
 

warp_beacon/scraper/__init__.py

@@ -290,14 +290,14 @@ class AsyncDownloader(object):
 										break
 									self.send_message_to_admin(
 										f"Task <code>{job.job_id}</code> failed. URL: {job.url}. Reason: '<b>UnknownError</b>'."
-										f"Exception:\n<pre code=\"python\">{exception_msg}<br></pre>"
+										f"Exception:\n<pre code=\"python\">{exception_msg}\n</pre>"
 									)
 									self.uploader.queue_task(job.to_upload_job(
 										job_failed=True,
-										job_failed_msg=f"Unknown error occured. Please <a href=\"https://github.com/sb0y/warp_beacon/issues\">create issue</a> with service logs.<br>"
-										f"Task <code>{job.job_id}</code> failed. URL: {job.url}.<br>"
-										f"Reason: '<b>UnknownError</b>'.<br>"
-										f"Exception:<br><pre code=\"python\">{exception_msg}</pre>"
+										job_failed_msg=f"Unknown error occurred. Please <a href=\"https://github.com/sb0y/warp_beacon/issues\">create issue</a> with service logs.\n"
+										f"Task <code>{job.job_id}</code> failed. URL: {job.url}.\n"
+										f"Reason: '<b>UnknownError</b>'.\n"
+										f"Exception:\n<pre code=\"python\">{exception_msg}</pre>"
 									))
 									break
 								finally:

warp_beacon/scraper/instagram/instagram.py

@@ -42,7 +42,7 @@ class InstagramScraper(ScraperAbstract):
 	client_session_id = ""
 
 	def __init__(self, client_session_id: str, account: tuple, proxy: dict=None) -> None:
-		self._download_progress_threshold = 5
+		self._download_progress_threshold = 0
 		self.client_session_id = client_session_id
 		super().__init__(account, proxy)
 		#
@@ -145,17 +145,18 @@ class InstagramScraper(ScraperAbstract):
 	def scrap(self, url: str) -> tuple[str]:
 		self.load_session()
 		def _scrap() -> tuple[str]:
-			if "stories" in url:
+			path = urlparse(url).path
+			slash_count = path.count('/')
+			if "stories" in url or slash_count == 1:
 				# remove URL options
-				_url = urljoin(url, urlparse(url).path)
+				_url = urljoin(url, path)
 				url_last_part = list(filter(None, _url.split('/')))[-1]
 				logging.debug("url last part: '%s'", url_last_part)
 				if url_last_part.isnumeric():
 					return "story", self.scrap_story(url)
-				else:
+				elif slash_count in (1, 2):
 					return "stories", url_last_part
-			else:
-				return "media", self.scrap_media(url)
+			return "media", self.scrap_media(url)
 		try:
 			return _scrap()
 		except exceptions.LoginRequired as e:
@@ -474,7 +475,7 @@ class InstagramScraper(ScraperAbstract):
 				"report_type": ReportType.PROGRESS
 			}
 			self.status_pipe.send(msg)
-			self._download_progress_threshold += 5
+			self._download_progress_threshold += 10
 
 	def report_seen(self, items: dict) -> None:
 		try:

warp_beacon/scraper/youtube/abstract.py

@@ -37,7 +37,7 @@ class YoutubeAbstract(ScraperAbstract):
 
 	def __init__(self, account: tuple, proxy: dict=None) -> None:
 		super().__init__(account, proxy)
-		self._download_progress_threshold = 5
+		self._download_progress_threshold = 0
 
 	def validate_session(self) -> int:
 		try:
@@ -245,7 +245,7 @@ class YoutubeAbstract(ScraperAbstract):
 			self.status_pipe.send(msg)
 			logging.debug("[Download worker] Downloaded %d%%", percentage_of_completion)
 			if total_size > 0:
-				self._download_progress_threshold += 5
+				self._download_progress_threshold += 10
 
 	def build_proxies(self, proxy_dsn: str) -> dict:
 		if not proxy_dsn:
@@ -310,7 +310,7 @@ class YoutubeAbstract(ScraperAbstract):
 				self.status_pipe.send(msg)
 				logging.debug("[Download worker][yt_dlp] Downloaded %d%%", percentage_of_completion)
 				if total_size > 0:
-					self._download_progress_threshold += 5
+					self._download_progress_threshold += 10
 
 	def build_yt_dlp(self, timeout: int = 60) -> yt_dlp.YoutubeDL:
 		auth_data = {}

warp_beacon/telegram/handlers.py

@@ -148,10 +148,12 @@ class Handlers(object):
 			msg_leftover = await Utils.handle_mentions(chat.id, client, msg_leftover)
 			# remove duplicates
 			urls = list(set(urls_raw))
+			# remove links without paths
+			urls = Utils.remove_links_wo_paths(urls)
 
 		reply_text = "Wut?"
 		if not urls:
-			reply_text = "Your message should contains URLs"
+			reply_text = "Your message should contain URLs"
 		else:
 			for url in urls:
 				origin = Utils.extract_origin(url)

warp_beacon/telegram/progress_bar.py

@@ -12,7 +12,7 @@ class ProgressBar(object):
 	MAX_PROGRESS_RENDER_SIZE = 1_500_000 # 1 MB
 
 	def __init__(self, client: Client) -> None:
-		self._next_threshold = 5
+		self._next_threshold = 0
 		self.client = client
 		self.complete = False
 		self.rendered_text = ""
@@ -127,7 +127,7 @@ class ProgressBar(object):
 				logging.warning("An error occurred while setup task to update progress bar")
 				logging.exception(e)
 			if total > 0 and percent != 0:
-				self._next_threshold += 5
+				self._next_threshold += 10
 
 	@staticmethod
 	def make_hash(chat_id: str | int, message_id: int, algorithm: str = 'sha256') -> str:

warp_beacon/telegram/utils.py

@@ -1,6 +1,6 @@
-from typing import Union, Optional
-
+from typing import Optional
 import re
+from urllib.parse import urlparse
 
 from pyrogram import Client
 from pyrogram.types import Message, ChatMember
@@ -154,3 +154,18 @@ class Utils(object):
 			return
 		if not client.me or not client.me.is_premium:
 			client.me = await client.get_me()
+
+	@staticmethod
+	def remove_links_wo_paths(urls: list[str]) -> list[str]:
+		try:
+			new_urls = []
+			for url in urls:
+				url = url.rstrip('/')
+				path = urlparse(url).path
+				sc = path.count('/')
+				if sc > 0:
+					new_urls.append(url)
+			return new_urls
+		except Exception as e:
+			logging.warning("Failed to remove links without path!", exc_info=e)
+		return urls

{warp_beacon-2.7.6.dist-info → warp_beacon-2.7.8.dist-info}/METADATA

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

{warp_beacon-2.7.6.dist-info → warp_beacon-2.7.8.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=ZzHNml1lfNvoBPGzivGbBfVuuBTdoDFQDDzXii28RXI,23
+warp_beacon/__version__.py,sha256=1BQOsDe64KUFbJT--Av_qAf1dP-eOxcZJ_1RM9sunmc,23
 warp_beacon/warp_beacon.py,sha256=ADCR30uGXIsDrt9WoiI9Ghu2QtWs0qZIK6x3pQKM_B4,1109
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,7 +22,7 @@ warp_beacon/mediainfo/video.py,sha256=UBZrhTN5IDI-aYu6tsJEILo9nFkjHhkldGVFmvV7tE
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scheduler/instagram_human.py,sha256=gqayCcn0xRYSNSFxeSpCGhBJyIwNAbk4Fnt1SCd61iA,11259
 warp_beacon/scheduler/scheduler.py,sha256=Bf4sGXjX75Dox3q-yzUHhagtzUAj3hl5GzfnZya-_io,4995
-warp_beacon/scraper/__init__.py,sha256=KTmch6hUXuXSI7Br8yjgZHf2ET9NRBhcXhl2SQ6De48,20258
+warp_beacon/scraper/__init__.py,sha256=gQOcBvZNnlxt0Rbbrkl4PLh7eQe2y3igJbx-87hAvrA,20249
 warp_beacon/scraper/abstract.py,sha256=pWbaTu-gDZgi-iFjqMR_uGzPl5KLv-4gTdJ9w6cD4sk,3802
 warp_beacon/scraper/account_selector.py,sha256=vxIVesGPQKVtL3uSn5CFlZB1eAYowUN7lTeiGUFmtDk,10067
 warp_beacon/scraper/exceptions.py,sha256=EKwoF0oH2xZWbNU-v8DOaWK5skKwa3s1yTIBdlcfMpc,1452
@@ -31,10 +31,10 @@ warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5
 warp_beacon/scraper/utils.py,sha256=yL-nrdCOAXNZgmIFPurIYFHfPsxHDl8pqif6BYKrzJI,1218
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/captcha.py,sha256=9UYziuqB3Tsat_ET6ex-cnZDbi6yCnsXHSpmE8MuUHk,4651
-warp_beacon/scraper/instagram/instagram.py,sha256=6ZEJAoAiB32BywE-On_kQdOoBe2iUWJ6wJqhuGAKmYk,18548
+warp_beacon/scraper/instagram/instagram.py,sha256=qypIbRLPiOn98n9DOFlkU7X2Ux-cOSu7skJAO2JudIQ,18629
 warp_beacon/scraper/instagram/wb_instagrapi.py,sha256=M5NCtLwdUvByjmDBZMWljgB275R0LSBFblsGpapluD0,5968
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/youtube/abstract.py,sha256=lJCmtXYwEB8exTFr_uSA0MCyjVcoSdVHGDRxwZPvEv8,15276
+warp_beacon/scraper/youtube/abstract.py,sha256=yQCJzi5YCEJFr365uPnMzKB8Rmi_zKVIlxw9-DI3sKE,15278
 warp_beacon/scraper/youtube/music.py,sha256=5AeSBQyUgVCJT2hoBCV2WvlyuV9US09SYJhmBG_P9F8,2755
 warp_beacon/scraper/youtube/shorts.py,sha256=1GtoYUlxAwcgSQcn80u5ehNJytH5AN5dPOicmX-XD8E,1705
 warp_beacon/scraper/youtube/youtube.py,sha256=x9v9p1coA9TvBhxjNAofGu4UBkAEdYPE2ePRnU-5tK0,7233
@@ -45,16 +45,16 @@ warp_beacon/telegram/bot.py,sha256=HJxouCxc85EzC8lTaqnP-5agvkdvlxKR6Etg5LjYcoA,1
 warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJbND_dX5Fhwkv0,1549
 warp_beacon/telegram/download_status.py,sha256=N-Qg13LVcPskyQNKG1lw50K1lhFtXu003muCRzZ7wiE,1561
 warp_beacon/telegram/edit_message.py,sha256=6DX8eJV70MG_b79WbuJG55qLBs66boElzYdCr8zpMeI,5380
-warp_beacon/telegram/handlers.py,sha256=uvR6TPHSqdSxigp3wR-ewiE6t3TvVcbVLVcYGwkgD2s,9559
+warp_beacon/telegram/handlers.py,sha256=PaO90370v-S90nwr4PYMzrlHRFBU0VBO6YkqDqTbnjw,9634
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
-warp_beacon/telegram/progress_bar.py,sha256=WLasAysPB_0buh-N6FOuDcz2QHiuaogC9ILAt0a59Lc,4996
+warp_beacon/telegram/progress_bar.py,sha256=6gZ6sUhaWnexFaNReC5tnP1ekmZMLgfwKftH21w4QgU,4997
 warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDHTzP78Mx5tdvPPWs,969
 warp_beacon/telegram/types.py,sha256=Kvdng6uCF1HRoqQgGW1ZYYPJoVuYkFb-LDvMBbW5Hjk,89
-warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
+warp_beacon/telegram/utils.py,sha256=S1N_JbHM_ExiM5tS0CeYKWIlvaJMlyq85TQNbK_GVds,5029
 warp_beacon/uploader/__init__.py,sha256=ewvR60k9osJxw_kb5U-TlZkCGR_574biq3w_aR1tjIU,5689
-warp_beacon-2.7.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.7.6.dist-info/METADATA,sha256=Fp2hdKErvQLz1hBMCZev9LbFdFPsgF6_gcLiM0m-OGg,23214
-warp_beacon-2.7.6.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-warp_beacon-2.7.6.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.7.6.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
-warp_beacon-2.7.6.dist-info/RECORD,,
+warp_beacon-2.7.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.7.8.dist-info/METADATA,sha256=YE_8Vxut6DeJ4TN7vRpn6cDdsnjFuNZguGIRDvwHkwA,23214
+warp_beacon-2.7.8.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+warp_beacon-2.7.8.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.7.8.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
+warp_beacon-2.7.8.dist-info/RECORD,,