warp-beacon 2.2.13__tar.gz → 2.2.15__tar.gz

{warp_beacon-2.2.13/warp_beacon.egg-info → warp_beacon-2.2.15}/PKG-INFO

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

warp_beacon-2.2.15/warp_beacon/__version__.py

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

{warp_beacon-2.2.13 → warp_beacon-2.2.15}/warp_beacon/scraper/youtube/abstract.py

@@ -1,6 +1,7 @@
 import os, io
 import pathlib
 import time
+import math
 import socket
 import ssl
 #from abc import abstractmethod
@@ -9,7 +10,7 @@ import json
 import urllib
 import requests
 import http.client
-from PIL import Image
+from PIL import Image, ImageOps
 
 from warp_beacon.scraper.abstract import ScraperAbstract
 from warp_beacon.mediainfo.abstract import MediaInfoAbstract
@@ -102,6 +103,34 @@ class YoutubeAbstract(ScraperAbstract):
 			if "yt_download_" in i:
 				os.unlink("%s/%s" % (self.DOWNLOAD_DIR, i))
 
+	def calculate_size(self, aspect_ratio_width: int, aspect_ratio_height: int, max_width: int=1280, max_height: int=1280, min_width: int=320, min_height: int=320) -> tuple:
+		# check ratio
+		aspect_ratio = aspect_ratio_width / aspect_ratio_height
+		
+		# probe the max width and calculate height
+		width = max_width
+		height = int(width / aspect_ratio)
+		
+		# if height exceeds max height of Telegram recalculate based on max height
+		if height > max_height:
+			height = max_height
+			width = int(height * aspect_ratio)
+		
+		# check min sizes
+		if width < min_width:
+			width = min_width
+			height = int(width / aspect_ratio)
+		
+		if height < min_height:
+			height = min_height
+			width = int(height * aspect_ratio)
+
+		return width, height
+
+	def aspect_ratio(self, size: tuple) -> tuple:
+		gcd = math.gcd(size[0], size[1])
+		return size[0] // gcd, size[1] // gcd
+
 	def download_thumbnail(self, video_id: str, timeout: int) -> Optional[io.BytesIO]:
 		for i in ("https://img.youtube.com/vi/{VIDEO_ID}/maxresdefault.jpg",
 				"https://img.youtube.com/vi/{VIDEO_ID}/hqdefault.jpg",
@@ -112,9 +141,17 @@ 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 = MediaInfoAbstract.shrink_image_to_fit(image, size=(320, 180))
+						ratio = self.aspect_ratio(image.size)
+						desired_size = self.calculate_size(ratio[0], ratio[1])
+						new_image = Image.new("RGB", desired_size, (255, 255, 255))
+						image = MediaInfoAbstract.shrink_image_to_fit(image, size=desired_size)
+						image_position = (
+							(desired_size[0] - image.size[0]) // 2,
+							(desired_size[1] - image.size[1]) // 2
+						)
+						new_image.paste(image, image_position)
 						io_buf = io.BytesIO()
-						image.save(io_buf, format='JPEG', subsampling=0, quality=100, progressive=True, optimize=False, icc_profile=image.info.get('icc_profile'))
+						new_image.save(io_buf, format='JPEG', subsampling=0, quality=100, progressive=True, optimize=False)
 						io_buf.seek(0)
 						return io_buf
 			except Exception as e:

{warp_beacon-2.2.13 → warp_beacon-2.2.15/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.2.13/warp_beacon/__version__.py

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