warp-beacon 2.2.16__py3-none-any.whl → 2.2.18__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.2.16"
+__version__ = "2.2.18"
 

warp_beacon/scraper/youtube/abstract.py

@@ -103,29 +103,32 @@ 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=640, min_height: int=360) -> tuple:
-		# check ratio
+	def calculate_size_with_padding(self, image: Image, aspect_ratio_width: int, aspect_ratio_height: int, target_size: tuple=(320, 320), background_color: tuple=(0, 0, 0)) -> Image:
+		# aspect ratio
 		aspect_ratio = aspect_ratio_width / aspect_ratio_height
 		
-		# probe the max width and calculate height
-		width = max_width
-		height = int(width / aspect_ratio)
+		# Target size
+		target_width, target_height = target_size
 		
-		# if height exceeds max height of Telegram recalculate based on max height
-		if height > max_height:
-			height = max_height
-			width = int(height * aspect_ratio)
+		# Calculate start sizes bases on min height
+		height = target_height
+		width = int(height * aspect_ratio)
 		
-		# check min sizes
-		if width < min_width:
-			width = min_width
+		# reduce width if target width exceeds
+		if width > target_width:
+			width = target_width
 			height = int(width / aspect_ratio)
 		
-		if height < min_height:
-			height = min_height
-			width = int(height * aspect_ratio)
-
-		return width, height
+		# create new image with color and size 320x320
+		new_image = Image.new("RGB", target_size, background_color)
+		
+		# Рассчитываем позицию для центрирования изображения на подложке
+		paste_position = ((target_width - width) // 2, (target_height - height) // 2)
+		
+		# pasting image to center
+		new_image.paste(image, paste_position)
+		
+		return new_image
 
 	def aspect_ratio(self, size: tuple) -> tuple:
 		gcd = math.gcd(size[0], size[1])
@@ -142,14 +145,7 @@ class YoutubeAbstract(ScraperAbstract):
 					if response.status_code == 200:
 						image = Image.open(io.BytesIO(response.content))
 						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)
+						new_image = self.calculate_size_with_padding(image, ratio[0], ratio[1])
 						io_buf = io.BytesIO()
 						new_image.save(io_buf, format='JPEG', subsampling=0, quality=100, progressive=True, optimize=False)
 						io_buf.seek(0)

{warp_beacon-2.2.16.dist-info → warp_beacon-2.2.18.dist-info}/METADATA

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

{warp_beacon-2.2.16.dist-info → warp_beacon-2.2.18.dist-info}/RECORD

@@ -3,7 +3,7 @@ lib/systemd/system/warp_beacon.service,sha256=lPmHqLqcI2eIV7nwHS0qcALQrznixqJuww
 var/warp_beacon/accounts.json,sha256=rKFQM_b9eoDS4mJ1B_SZNolPLXx1SQdQMdY2F_ZcBt8,1523
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=UIW1sHLB2BV43AzbukHsK8-HW9nfIqoAopb-ltG3oHQ,24
+warp_beacon/__version__.py,sha256=7E3HbttbgL3hQZ1TRYCvx4oVtf9a1TNBxP3fbamkKGY,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=lHsPrYy5iYnHsIdUHqRxZmzlqrkNj_TS4TkiTJf
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/instagram.py,sha256=iT66IM7nsbVDWQzBW-CJUWDBjoBbRZH4BHx6TJw3oqo,13517
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/youtube/abstract.py,sha256=nMi6fyOUKYrZa9tTJz6fTmRJwxnGkDSxLUIE1uUSr14,7656
+warp_beacon/scraper/youtube/abstract.py,sha256=-zJbaQTHivlItSBLwYlesmLrryYsDcXtkQ5Jmb4LNx4,7597
 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=xSNG_v4D4FaA5q1_5wXvJkjcDUhy5GaQnfpijJZp
 warp_beacon/telegram/placeholder_message.py,sha256=32U-R_IMPRJd-S5UwlpemLkArJOxCmO7whcynduSbMA,6418
 warp_beacon/telegram/utils.py,sha256=CeWXMwyzv2l4Af6I-wW2ySU490c-5k82sBhkjabv0n4,2452
 warp_beacon/uploader/__init__.py,sha256=rsUkzzmtaeQY-kNkcIiPsrayS9idFKY3hBC71mR19XE,4743
-warp_beacon-2.2.16.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.2.16.dist-info/METADATA,sha256=9XJz8z9UEcFAy4HGjgTik3aHhOU-PFGZ1ij8FLwWElw,21251
-warp_beacon-2.2.16.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-warp_beacon-2.2.16.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.2.16.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
-warp_beacon-2.2.16.dist-info/RECORD,,
+warp_beacon-2.2.18.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.2.18.dist-info/METADATA,sha256=wit8cdOBaQV5Koq0ymnR3-IMYnyhMT2EjTnSDkjIY4E,21251
+warp_beacon-2.2.18.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+warp_beacon-2.2.18.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.2.18.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
+warp_beacon-2.2.18.dist-info/RECORD,,