warp-beacon 2.6.50__tar.gz → 2.6.51__tar.gz

{warp_beacon-2.6.50/warp_beacon.egg-info → warp_beacon-2.6.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warp_beacon
-Version: 2.6.50
+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.51/warp_beacon/__version__.py

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

{warp_beacon-2.6.50 → warp_beacon-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-2.6.50 → warp_beacon-2.6.51}/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-2.6.50 → warp_beacon-2.6.51/warp_beacon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warp_beacon
-Version: 2.6.50
+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.50/warp_beacon/__version__.py

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