warp-beacon 2.2.17__py3-none-any.whl → 2.2.19__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.2.17"
+__version__ = "2.2.19"
 

warp_beacon/scraper/instagram/instagram.py

@@ -89,6 +89,7 @@ class InstagramScraper(ScraperAbstract):
 		self.load_session()
 		self._download_hndlr(self.cl.get_timeline_feed)
 		self._download_hndlr(self.cl.get_reels_tray_feed)
+		self.safe_write_session()
 
 	def scrap(self, url: str) -> tuple[str]:
 		self.load_session()
@@ -283,6 +284,9 @@ class InstagramScraper(ScraperAbstract):
 				raise NotFound(extract_exception_message(e))
 			except IGUnknownError as e:
 				raise UnknownError(extract_exception_message(e))
+		
+		self.safe_write_session()
+		
 		return res
 	
 	def email_challenge_resolver(self, username: str) -> Optional[str]:

warp_beacon/scraper/youtube/abstract.py

@@ -103,30 +103,28 @@ 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, prefer_min_size: bool=False) -> 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_width / aspect_ratio_height
-		
-		if prefer_min_size:
-			# Probing min width and calculating height
-			width = min_width
-			height = int(width / aspect_ratio)
-			
-			# if height is less than min, recalculatng based on min height
-			if height < min_height:
-				height = min_height
-				width = int(height * aspect_ratio)
-		else:
-			# Probing max width and calculating height
-			width = max_width
+		target_width, target_height = target_size
+
+		height = target_height
+		width = int(height * aspect_ratio)
+
+		if width > target_width:
+			width = target_width
 			height = int(width / aspect_ratio)
-			
-			# if height exceeds max height Telegram, recalculatng based on max height
-			if height > max_height:
-				height = max_height
-				width = int(height * aspect_ratio)
 
-		return width, height
+		new_image = Image.new("RGB", target_size, background_color)
+		image.thumbnail(target_size, Image.Resampling.LANCZOS)
+
+		if aspect_ratio_height > 4:
+			image = image.resize((image.size[0], image.size[1]+new_image.size[1]))
+			height += new_image.size[1] - 20
+
+		paste_position = ((target_width - width) // 2, (target_height - height) // 2)
+		new_image.paste(image, paste_position)
+
+		return new_image
 
 	def aspect_ratio(self, size: tuple) -> tuple:
 		gcd = math.gcd(size[0], size[1])
@@ -143,16 +141,12 @@ 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)
+						logging.info("thumb ratio: '%s'", ratio)
+						new_image = self.calculate_size_with_padding(image, ratio[0], ratio[1])
+						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)
+						logging.info("thumb size: %d kb", io_buf.getbuffer().nbytes / 1024)
 						io_buf.seek(0)
 						return io_buf
 			except Exception as e:

{warp_beacon-2.2.17.dist-info → warp_beacon-2.2.19.dist-info}/METADATA

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

{warp_beacon-2.2.17.dist-info → warp_beacon-2.2.19.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=9JdAAUpmDQmtL5lYORdeGMeA9yanV3HMXq1GWoSGJ3A,24
+warp_beacon/__version__.py,sha256=vxBl0dBf1STjUFxsMoaYE3Z0WPuhhnKF1AVKxgwxS98,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
@@ -24,9 +24,9 @@ warp_beacon/scraper/abstract.py,sha256=aNZ9ypF9B8BjflcIwi-7wEzIqF-XPeF0xvfX9CP_i
 warp_beacon/scraper/account_selector.py,sha256=x1TAqHVWtxvhzKCTBERpHoUJ0fOcnswStQjEcDxkrFU,2960
 warp_beacon/scraper/exceptions.py,sha256=lHsPrYy5iYnHsIdUHqRxZmzlqrkNj_TS4TkiTJfWhTs,1326
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/instagram/instagram.py,sha256=iT66IM7nsbVDWQzBW-CJUWDBjoBbRZH4BHx6TJw3oqo,13517
+warp_beacon/scraper/instagram/instagram.py,sha256=PpEammUP_InX5xj-sFJY6DkAUfIut2rqQsXd0uCtKOo,13579
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/youtube/abstract.py,sha256=8YAn0LPoPCXlFD9G67vIr-ltMckJGrYowwphwPSPaGg,7791
+warp_beacon/scraper/youtube/abstract.py,sha256=_D6NecCWlIO-Lt-t495hvpAeJrrc6f2zctrUqSVH-JQ,7635
 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.17.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.2.17.dist-info/METADATA,sha256=TCcK6ntOMtnv2iLIt6Q-2RdvEV8_EE6FNYbu9w8jf5I,21251
-warp_beacon-2.2.17.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-warp_beacon-2.2.17.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.2.17.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
-warp_beacon-2.2.17.dist-info/RECORD,,
+warp_beacon-2.2.19.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.2.19.dist-info/METADATA,sha256=_aQMdTR_yAc7RP-kYMbFg9HJl151xYn_HYauD9EwPfQ,21251
+warp_beacon-2.2.19.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+warp_beacon-2.2.19.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.2.19.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
+warp_beacon-2.2.19.dist-info/RECORD,,