warp-beacon 2.6.49__py3-none-any.whl → 2.6.51__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.6.49"
+__version__ = "2.6.51"
 

warp_beacon/scraper/abstract.py

@@ -1,18 +1,15 @@
 import os
 import pathlib
-
-import socket
-import requests.packages.urllib3.util.connection as urllib3_cn
-import multiprocessing
-
 from abc import ABC, abstractmethod
 from typing import Callable, Union
+import logging
+import multiprocessing
+import socket
+import requests.packages.urllib3.util.connection as urllib3_cn
 
 from PIL import Image
 from pillow_heif import register_heif_opener
 
-import logging
-
 class ScraperAbstract(ABC):
 	original_gai_family = None
 	send_message_to_admin_func: Callable = lambda: None
@@ -48,8 +45,8 @@ class ScraperAbstract(ABC):
 			if os.path.exists(src_file):
 				path_info = pathlib.Path(src_file)
 				old_filename = path_info.stem
-				new_filename = "%s_converted.%s" % (old_filename, "png")
-				new_filepath = "%s/%s" % (os.path.dirname(src_file), new_filename)
+				new_filename = f"{old_filename}_converted.png"
+				new_filepath = f"{os.path.dirname(src_file)}/{new_filename}"
 				with Image.open(src_file).convert('RGB') as img:
 					img.save(new_filepath, 'png')
 				os.unlink(src_file)
@@ -67,8 +64,8 @@ class ScraperAbstract(ABC):
 				register_heif_opener()
 				path_info = pathlib.Path(src_file)
 				old_filename = path_info.stem
-				new_filename = "%s_converted.%s" % (old_filename, "png")
-				new_filepath = "%s/%s" % (os.path.dirname(src_file), new_filename)
+				new_filename = f"{old_filename}_converted.png"
+				new_filepath = f"{os.path.dirname(src_file)}/{new_filename}"
 				with Image.open(src_file).convert('RGB') as img:
 					img.save(new_filepath, 'png')
 				os.unlink(src_file)

warp_beacon/scraper/youtube/abstract.py

@@ -232,8 +232,10 @@ class YoutubeAbstract(ScraperAbstract):
 		return ret_val
 
 	def yt_on_progress(self, stream: Stream, chunk: bytes, bytes_remaining: int) -> None:
-		pass
-		#logging.info("bytes: %d, bytes remaining: %d", chunk, bytes_remaining)
+		total_size = stream.filesize or stream.filesize_approx
+		bytes_downloaded = total_size - bytes_remaining
+		percentage_of_completion = bytes_downloaded / total_size * 100
+		logging.info("Downloaded %d%%", percentage_of_completion)
 
 	def build_proxies(self, proxy_dsn: str) -> dict:
 		if not proxy_dsn:

warp_beacon/telegram/progress_bar.py

@@ -28,7 +28,7 @@ class ProgressBar(object):
 		# building bar
 		pbar = '█' * filled + half_block + '─' * (length - filled - len(half_block))
 		percent = frac * 100
-		return f"<b>[{pbar}] {round(percent)}</b>%"
+		return f"<b>[{pbar}] {round(percent)}%</b>"
 	
 	def make_emoji_progress_bar(self, current: int, total: int, length: int = 10) -> str:
 		"""
@@ -50,7 +50,7 @@ class ProgressBar(object):
 			pbar = self.make_emoji_progress_bar(percent, 100, 14)
 			logging.info("[%s] Uploaded to Telegram %d%%", label, percent)
 			try:
-				await self.client.edit_message_caption(chat_id, message_id, f"{pbar} <b>Uploading <code>{label}</code></b>", ParseMode.HTML)
+				await self.client.edit_message_caption(chat_id, message_id, f"{pbar} <b>Uploading</b> {label}", ParseMode.HTML)
 			except MessageNotModified:
 				logging.warning("bad_request_400.MessageNotModified")
 			except Exception as e:

{warp_beacon-2.6.49.dist-info → warp_beacon-2.6.51.dist-info}/METADATA

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

{warp_beacon-2.6.49.dist-info → warp_beacon-2.6.51.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=ag2-RQzilsSrTWVr6qiPwebiNNomtHUQHcGwxmjvXow,24
+warp_beacon/__version__.py,sha256=97aVkVvphE-RNmc19iil89QyOmg2AptM2VnjP0DOdho,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
@@ -23,7 +23,7 @@ warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 warp_beacon/scheduler/instagram_human.py,sha256=0LaRUu0MBBuEOQeFzuq22HIYfJL9pTK_7udsXfef0Fk,8204
 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/abstract.py,sha256=lra97QidGcSvoXgQh2-aGAO-DAgQU_u-ORQJ3BY-un4,2950
 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
@@ -33,7 +33,7 @@ warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 warp_beacon/scraper/instagram/captcha.py,sha256=9UYziuqB3Tsat_ET6ex-cnZDbi6yCnsXHSpmE8MuUHk,4651
 warp_beacon/scraper/instagram/instagram.py,sha256=zbkF-1lU5lxJ_2m8i8mGRX0EQMLVSflsOafBM1FEC6s,15588
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/youtube/abstract.py,sha256=QUSHR3aJjIykuRlBpGnmw3tq3m82AQeeZeWQUdJRvgQ,12538
+warp_beacon/scraper/youtube/abstract.py,sha256=-7ha34z6bWc5rA7BZdA3x3Mw9ELghGYoHklDbZQYgTo,12689
 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,13 +45,13 @@ warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJb
 warp_beacon/telegram/edit_message.py,sha256=XDGBbQ3c6xzQsqwJ2ufVozgDZh3oWF-JQlk3wk78soo,5556
 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=U3QeuENUBvemqecR0paBoszsmvwsom2XeqzsmRPtGFA,2388
+warp_beacon/telegram/progress_bar.py,sha256=KcS-cswDo-sShgOKionqNEpexs-o9e4qqFAtPf45Rlw,2375
 warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDHTzP78Mx5tdvPPWs,969
 warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
 warp_beacon/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
-warp_beacon-2.6.49.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.6.49.dist-info/METADATA,sha256=qXKFFlKulpEYYjlKav4lH_79B0ogvQQowAcXaSx1_yQ,22706
-warp_beacon-2.6.49.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-warp_beacon-2.6.49.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.6.49.dist-info/top_level.txt,sha256=pYstFq5qRCQuQc4fOAAc1ti5UwsYldTREx7h2dNplI4,1297
-warp_beacon-2.6.49.dist-info/RECORD,,
+warp_beacon-2.6.51.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.51.dist-info/METADATA,sha256=vVqQnB1spafaejdnk_OxfPCvZyB8vj4zHHXBt6qFzWQ,22706
+warp_beacon-2.6.51.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+warp_beacon-2.6.51.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.51.dist-info/top_level.txt,sha256=pYstFq5qRCQuQc4fOAAc1ti5UwsYldTREx7h2dNplI4,1297
+warp_beacon-2.6.51.dist-info/RECORD,,