warp-beacon 2.7.0__py3-none-any.whl → 2.7.2__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.7.0"
+__version__ = "2.7.2"
 

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 = 20
+		self._download_progress_threshold = 5
 		self.client_session_id = client_session_id
 		super().__init__(account, proxy)
 		#
@@ -460,4 +460,4 @@ class InstagramScraper(ScraperAbstract):
 				"report_type": ReportType.PROGRESS
 			}
 			self.status_pipe.send(msg)
-			self._download_progress_threshold += 20
+			self._download_progress_threshold += 5

warp_beacon/scraper/utils.py

@@ -4,7 +4,7 @@ from fake_useragent import UserAgent
 
 class ScraperUtils(object):
 	@staticmethod
-	def get_ua_dict(browsers: list = ['Facebook', 'Android'], platforms: list = ['mobile', 'tablet'], os: list =['Android']) -> dict:
+	def get_ua_dict(browsers: list = None, platforms: list = ['mobile', 'tablet'], os: list = ['Android']) -> dict:
 		random_client = None
 		try:
 			ua = UserAgent(browsers=browsers, platforms=platforms, os=os)
@@ -16,5 +16,5 @@ class ScraperUtils(object):
 		return random_client
 
 	@staticmethod
-	def get_ua(browsers: list = ['Facebook', 'Android'], platforms: list = ['mobile', 'tablet'], os: list =['Android', 'iOS']) -> str:
+	def get_ua(browsers: list = None, platforms: list = ['mobile', 'tablet'], os: list = ['Android']) -> str:
 		return ScraperUtils.get_ua_dict(browsers=browsers, platforms=platforms, os=os)["useragent"]

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 = 20
+		self._download_progress_threshold = 5
 
 	def validate_session(self) -> int:
 		try:
@@ -66,7 +66,6 @@ class YoutubeAbstract(ScraperAbstract):
 
 		# avoid task acquiring in parallel worker
 		self.yt_validate_event.clear()
-		#time.sleep(35)
 
 		return 0
 	
@@ -233,19 +232,20 @@ class YoutubeAbstract(ScraperAbstract):
 			return
 		bytes_downloaded = total_size - bytes_remaining
 		percentage_of_completion = bytes_downloaded / (total_size or 1) * 100
-		if total_size == 0 or percentage_of_completion >= self._download_progress_threshold:
+		if total_size == 0 or percentage_of_completion == 0 or percentage_of_completion >= self._download_progress_threshold:
 			msg = {
 				"action": "report_download_status",
 				"current": bytes_downloaded,
 				"total": total_size,
 				"message_id": self.job.placeholder_message_id,
 				"chat_id": self.job.chat_id,
-				"completed": percentage_of_completion >= 100
+				"completed": percentage_of_completion >= 100,
+				"media_type": stream.type
 			}
 			self.status_pipe.send(msg)
 			logging.debug("[Download worker] Downloaded %d%%", percentage_of_completion)
 			if total_size > 0:
-				self._download_progress_threshold += 20
+				self._download_progress_threshold += 5
 
 	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 += 20
+					self._download_progress_threshold += 5
 
 	def build_yt_dlp(self, timeout: int = 60) -> yt_dlp.YoutubeDL:
 		auth_data = {}

warp_beacon/telegram/download_status.py

@@ -16,12 +16,15 @@ class DownloadStatus(object):
 		self.status_pipe, self.child_conn = Pipe()
 
 	async def handle_message(self, msg: dict, progress_bar: ProgressBar) -> None:
+		op = "Downloading"
+		if msg.get("media_type", None):
+			op += f" {msg['media_type']}"
 		await progress_bar.progress_callback(
 			current=msg.get("current", 0),
 			total=msg.get("total", 0),
 			message_id=msg.get("message_id", 0),
 			chat_id=msg.get("chat_id", 0),
-			operation="Downloading",
+			operation=op,
 			report_type=msg.get("report_type", ReportType.PROGRESS),
 			label=msg.get("label", "")
 		)

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 = 20
+		self._next_threshold = 5
 		self.client = client
 		self.complete = False
 
@@ -97,9 +97,9 @@ class ProgressBar(object):
 		percent = 0
 		if total:
 			percent = round(current * 100 / (total or 1))
-		if percent >= 100:
+		if percent > 100:
 			return
-		if total == 0 or percent >= self._next_threshold:
+		if total == 0 or percent == 0 or percent >= self._next_threshold:
 			#pbar = self.make_progress_bar(percent, 100, 25)
 			pbar = self.make_emoji_progress_bar(percent, 10)
 			logging.info("[Progress bar]: Operation: %s %d%%", operation, percent)
@@ -121,7 +121,7 @@ class ProgressBar(object):
 				logging.warning("An error occurred while setup task to update progress bar")
 				logging.exception(e)
 			if total > 0:
-				self._next_threshold += 20
+				self._next_threshold += 5
 
 	@staticmethod
 	def make_hash(chat_id: str | int, message_id: int, algorithm: str = 'sha256') -> str:

{warp_beacon-2.7.0.dist-info → warp_beacon-2.7.2.dist-info}/METADATA

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

{warp_beacon-2.7.0.dist-info → warp_beacon-2.7.2.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=6s0jET9wkushtngvgSWzky_QI_PNENpNtC3_M0St9p8,23
+warp_beacon/__version__.py,sha256=BsdO364nsn22T1omvkwYamUzZRtIL_FRh1G9awutR_4,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
@@ -28,13 +28,13 @@ warp_beacon/scraper/account_selector.py,sha256=vxIVesGPQKVtL3uSn5CFlZB1eAYowUN7l
 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
-warp_beacon/scraper/utils.py,sha256=2ixy3ln-N7OXSqO2bvYw1407WuR-xZBX4l3lyteCTm4,1261
+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=xDjKJa_TdXC-Xk8ji5oGKQmo7LrpRNSshLcuKuFJrCM,17863
+warp_beacon/scraper/instagram/instagram.py,sha256=cGInSO6UzmPcq2DokoL8_jmuIco1PBlVrafywDXazBg,17861
 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=AnKWFhfUvPikQ4tZflb0wvnZnkb8ums6eTZNx5iCbdM,15233
+warp_beacon/scraper/youtube/abstract.py,sha256=lJCmtXYwEB8exTFr_uSA0MCyjVcoSdVHGDRxwZPvEv8,15276
 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
@@ -43,18 +43,18 @@ warp_beacon/storage/mongo.py,sha256=qC4ZiO8XXvPnP0rJwz4CJx42pqFsyAjCiW10W5QdT6E,
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/telegram/bot.py,sha256=HJxouCxc85EzC8lTaqnP-5agvkdvlxKR6Etg5LjYcoA,19212
 warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJbND_dX5Fhwkv0,1549
-warp_beacon/telegram/download_status.py,sha256=JNevX0VQh39fX98fjM9j_nm0Ribj8f3tfa6kxpeNapQ,1484
+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/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
-warp_beacon/telegram/progress_bar.py,sha256=VBF_qwjOCu0mXN-r_Us4M7qoDWoyvjrw2R2TLgFvTKM,4858
+warp_beacon/telegram/progress_bar.py,sha256=uPJ5PKjqIzqithehptP5YLFt_sCuPXDZIBaakamkLTg,4871
 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/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
-warp_beacon-2.7.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.7.0.dist-info/METADATA,sha256=jyntJ_4RutJix5DrP0jCa_o5Vce99tC5_wzfik4r5pU,23214
-warp_beacon-2.7.0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-warp_beacon-2.7.0.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.7.0.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
-warp_beacon-2.7.0.dist-info/RECORD,,
+warp_beacon-2.7.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.7.2.dist-info/METADATA,sha256=yYyHCkICIdBggK5bUK367vu5TDuLXRtrwRQCtje9qfc,23214
+warp_beacon-2.7.2.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+warp_beacon-2.7.2.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.7.2.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
+warp_beacon-2.7.2.dist-info/RECORD,,