warp-beacon 2.2.55__tar.gz → 2.2.57__tar.gz

{warp_beacon-2.2.55/warp_beacon.egg-info → warp_beacon-2.2.57}/PKG-INFO

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

warp_beacon-2.2.57/warp_beacon/__version__.py

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

{warp_beacon-2.2.55 → warp_beacon-2.2.57}/warp_beacon/mediainfo/video.py

@@ -1,7 +1,6 @@
-import io, os
+import io
 
 from typing import Union
-from PIL import Image
 
 from warp_beacon.mediainfo.abstract import MediaInfoAbstract
 

{warp_beacon-2.2.55 → warp_beacon-2.2.57}/warp_beacon/scraper/youtube/abstract.py

@@ -143,7 +143,16 @@ class YoutubeAbstract(ScraperAbstract):
 		y_nonzero, x_nonzero, _ = np.nonzero(np.array(img) > threshold)
 		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]:
+	def crop_center(self, image: Image, width: int, height: int) -> Image:
+		img_width, img_height = image.size
+		left = (img_width - width) // 2
+		top = (img_height - height) // 2
+		right = left + width
+		bottom = top + height
+
+		return image.crop((left, top, right, bottom))
+
+	def download_thumbnail(self, video_id: str, timeout: int, crop_center: dict = None) -> Optional[io.BytesIO]:
 		for i in ("https://img.youtube.com/vi/{VIDEO_ID}/maxresdefault.jpg",
 				"https://img.youtube.com/vi/{VIDEO_ID}/hqdefault.jpg",
 				"https://img.youtube.com/vi/{VIDEO_ID}/sddefault.jpg"):
@@ -155,6 +164,8 @@ class YoutubeAbstract(ScraperAbstract):
 						image = Image.open(io.BytesIO(response.content))
 						ratio = self.aspect_ratio(image.size)
 						image = self.crop_black_edges_pil(image)
+						if crop_center:
+							image = self.crop_center(image, width=crop_center["width"], height=crop_center["height"])
 						logging.info("thumb ratio: '%s'", ratio)
 						new_image = self.resize_aspect_ratio(image)
 						logging.info("thumb size: '%s'", new_image.size)
@@ -169,7 +180,7 @@ class YoutubeAbstract(ScraperAbstract):
 
 		return None
 
-	def _download_hndlr(self, func: Callable, *args: tuple[str], **kwargs: dict[str]) -> Union[str, dict, io.BytesIO]:
+	def _download_hndlr(self, func: Callable, *args: tuple[Union[str, int, dict, tuple]], **kwargs: dict[Union[str, int, dict, tuple]]) -> Union[str, dict, io.BytesIO]:
 		ret_val = ''
 		max_retries = int(os.environ.get("YT_MAX_RETRIES", default=self.YT_MAX_RETRIES_DEFAULT))
 		pause_secs = int(os.environ.get("YT_PAUSE_BEFORE_RETRY", default=self.YT_PAUSE_BEFORE_RETRY_DEFAULT))
@@ -220,7 +231,7 @@ class YoutubeAbstract(ScraperAbstract):
 		_default_clients["ANDROID"]["innertube_context"]["context"]["client"]["clientVersion"] = "19.08.35"
 		_default_clients["ANDROID_MUSIC"] = _default_clients["ANDROID"]
 		yt_opts = {"url": url, "on_progress_callback": self.yt_on_progress}
-		#yt_opts["client"] = "WEB"
+		yt_opts["client"] = "TV_EMBED"
 		yt_opts["use_oauth"] = True
 		yt_opts["allow_oauth_cache"] = True
 		yt_opts["token_file"] = self.YT_SESSION_FILE % self.account_index

{warp_beacon-2.2.55 → warp_beacon-2.2.57}/warp_beacon/scraper/youtube/shorts.py

@@ -2,6 +2,8 @@ from warp_beacon.jobs.types import JobType
 from warp_beacon.scraper.youtube.abstract import YoutubeAbstract
 from warp_beacon.scraper.exceptions import NotFound
 
+from warp_beacon.mediainfo.video import VideoInfo
+
 import logging
 
 class YoutubeShortsScraper(YoutubeAbstract):
@@ -19,9 +21,6 @@ class YoutubeShortsScraper(YoutubeAbstract):
 		if not stream:
 			raise NotFound("No suitable video stream found")
 
-		if yt:
-			thumbnail = self._download_hndlr(self.download_thumbnail, yt.video_id)
-
 		local_file = stream.download(
 			output_path=self.DOWNLOAD_DIR,
 			max_retries=0,
@@ -29,9 +28,14 @@ class YoutubeShortsScraper(YoutubeAbstract):
 			skip_existing=False,
 			filename_prefix="yt_download_"
 		)
+
+		local_file = self.rename_local_file(local_file)
+		vinfo = VideoInfo(local_file)
+		thumbnail = self._download_hndlr(self.download_thumbnail, video_id=yt.video_id, crop_center=vinfo.get_demensions())
+
 		logging.debug("Temp filename: '%s'", local_file)
 		res.append({
-			"local_media_path": self.rename_local_file(local_file),
+			"local_media_path": local_file,
 			"performer": yt.author,
 			"thumb": thumbnail,
 			"canonical_name": stream.title,

{warp_beacon-2.2.55 → warp_beacon-2.2.57/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.2.55/warp_beacon/__version__.py

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