warp-beacon 2.2.50__py3-none-any.whl → 2.2.52__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.2.50"
+__version__ = "2.2.52"
 

warp_beacon/scraper/youtube/abstract.py

@@ -11,9 +11,10 @@ import urllib
 import requests
 import http.client
 from PIL import Image
+import numpy as np
 
 from warp_beacon.scraper.abstract import ScraperAbstract
-from warp_beacon.mediainfo.abstract import MediaInfoAbstract
+#from warp_beacon.mediainfo.abstract import MediaInfoAbstract
 from warp_beacon.scraper.exceptions import TimeOut, Unavailable, extract_exception_message
 
 from pytubefix import YouTube
@@ -137,6 +138,10 @@ class YoutubeAbstract(ScraperAbstract):
 	def aspect_ratio(self, size: tuple) -> tuple:
 		gcd = math.gcd(size[0], size[1])
 		return size[0] // gcd, size[1] // gcd
+	
+	def crop_black_edges_pil(self, img: Image) -> Image:
+		y_nonzero, x_nonzero, _ = np.nonzero(img)
+		return img.crop((np.min(x_nonzero), np.min(y_nonzero), np.max(x_nonzero), np.max(y_nonzero)))
 
 	def download_thumbnail(self, video_id: str, timeout: int) -> Optional[io.BytesIO]:
 		for i in (#"https://img.youtube.com/vi/{VIDEO_ID}/maxresdefault.jpg",
@@ -148,16 +153,13 @@ class YoutubeAbstract(ScraperAbstract):
 				with requests.get(url, timeout=(timeout, timeout)) as response:
 					if response.status_code == 200:
 						image = Image.open(io.BytesIO(response.content))
+						image = self.crop_black_edges_pil(image)
 						ratio = self.aspect_ratio(image.size)
 						logging.info("thumb ratio: '%s'", ratio)
-						new_image = None
-						if ratio[1] > 4:
-							new_image = self.resize_aspect_ratio(image)
-						else:
-							new_image = self.calculate_size_with_padding(image, ratio[0], ratio[1])
+						new_image = self.resize_aspect_ratio(image)
 						logging.info("thumb size: '%s'", new_image.size)
 						io_buf = io.BytesIO()
-						new_image.save(io_buf, format='JPEG', subsampling=0, quality=100, progressive=True, optimize=False)
+						new_image.save(io_buf, format='JPEG', subsampling=0, quality=95, progressive=True, optimize=False)
 						logging.info("thumb size: %d kb", io_buf.getbuffer().nbytes / 1024)
 						io_buf.seek(0)
 						return io_buf

{warp_beacon-2.2.50.dist-info → warp_beacon-2.2.52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: warp_beacon
-Version: 2.2.50
+Version: 2.2.52
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev
@@ -224,6 +224,7 @@ Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: numpy
 Requires-Dist: ffmpeg-python
 Requires-Dist: uvloop
 Requires-Dist: tgcrypto

{warp_beacon-2.2.50.dist-info → warp_beacon-2.2.52.dist-info}/RECORD

@@ -3,7 +3,7 @@ lib/systemd/system/warp_beacon.service,sha256=lPmHqLqcI2eIV7nwHS0qcALQrznixqJuww
 var/warp_beacon/accounts.json,sha256=2QQMS9N_Z-TnfZq4U1vSUe4IKyZGmTFdgo8BoF4hQ7E,1710
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=OODlAz5q5V981c-kp20PIW8Q7eYDlOulnrnjoy4V1gQ,24
+warp_beacon/__version__.py,sha256=qkoAXpS3-gHA-Ei5DdDGrmnAmfEcao2FO-2eJikHfGM,24
 warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/compress/video.py,sha256=_PDMVYCyzLYxHv1uZmmzGcG_8rjaZr7BTXsXTTy_oS4,2846
@@ -26,7 +26,7 @@ warp_beacon/scraper/exceptions.py,sha256=fHywTm2-y2RkgM6hVz12CkDMBgHcEoN2a1TBLaV
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/instagram.py,sha256=m2bAqLu-_HchlF5CVZDlytB9cFGxrN7EEbQW-G1f5u4,12857
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/youtube/abstract.py,sha256=dMeSkiQYe0c-otglo1LP3CJr51VRgiGGMVYwGDhfxRY,8125
+warp_beacon/scraper/youtube/abstract.py,sha256=cp5Jf2lTV0tZwLcTSZjLTGrhRuROu1wXjIDM4FVeunw,8249
 warp_beacon/scraper/youtube/music.py,sha256=nbTDFdgXGbTNqttE828DEgvSc8-SuAsQAHeqUwU6yFM,1484
 warp_beacon/scraper/youtube/shorts.py,sha256=RqMYDq4XHChtp-LdlxXyHej4h3NI3Qi9T8USxwk-pIk,1177
 warp_beacon/scraper/youtube/youtube.py,sha256=JvN5pVz0jtxCY9FGMl1dIg5Ccr2Kulaoxtym0Vb1QwQ,2224
@@ -37,9 +37,9 @@ warp_beacon/telegram/handlers.py,sha256=SyYSDYbHnMpXDqockHTN-8Rg_YimLDfJAOhuubQf
 warp_beacon/telegram/placeholder_message.py,sha256=N1fSL1xbFLF5alhnEvk-xbf3v2A_nLWg6xHtVZTaoiA,6396
 warp_beacon/telegram/utils.py,sha256=wSyJJsv1chaK4hqnBP-dDiY1hYD7wFhzBzw5H_AwE88,2450
 warp_beacon/uploader/__init__.py,sha256=rbfsm_eYcfsBRkiaG0glVgBNtQCEe7cVQTWEIAHz5aw,4763
-warp_beacon-2.2.50.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.2.50.dist-info/METADATA,sha256=fxjq3T07r8LrBLb7u40Ce9fX7DCNAVUYaWRVBYx9ODY,21251
-warp_beacon-2.2.50.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-warp_beacon-2.2.50.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.2.50.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
-warp_beacon-2.2.50.dist-info/RECORD,,
+warp_beacon-2.2.52.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.2.52.dist-info/METADATA,sha256=jRE68kY2SNf3E7IgvI-HgIOxf3cHn5slHL1eEbNp3iA,21272
+warp_beacon-2.2.52.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+warp_beacon-2.2.52.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.2.52.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
+warp_beacon-2.2.52.dist-info/RECORD,,