warp-beacon 2.2.11__tar.gz → 2.2.12__tar.gz

{warp_beacon-2.2.11/warp_beacon.egg-info → warp_beacon-2.2.12}/PKG-INFO

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

warp_beacon-2.2.12/warp_beacon/__version__.py

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

{warp_beacon-2.2.11 → warp_beacon-2.2.12}/warp_beacon/scraper/youtube/abstract.py

@@ -7,7 +7,7 @@ import ssl
 from typing import Callable, Union, Optional
 import json
 import urllib
-import urllib.request
+import requests
 import http.client
 from PIL import Image
 
@@ -102,19 +102,23 @@ class YoutubeAbstract(ScraperAbstract):
 			if "yt_download_" in i:
 				os.unlink("%s/%s" % (self.DOWNLOAD_DIR, i))
 
-	def download_thumbnail(self, url: str, timeout: int) -> Optional[io.BytesIO]:
-		try:
-			logging.info("Youtube thumbnail url '%s'", url)
-			with urllib.request.urlopen(url, timeout=timeout) as f:
-				image = Image.open(io.BytesIO(f.read()))
-				image = MediaInfoAbstract.shrink_image_to_fit(image, size=(320, 240))
-				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'))
-				io_buf.seek(0)
-				return io_buf
-		except Exception as e:
-			logging.error("Failed to download download thumbnail!")
-			logging.exception(e)
+	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",
+				"https://img.youtube.com/vi/{VIDEO_ID}/sddefault.jpg"):
+			try:
+				url = i.format(VIDEO_ID=video_id)
+				logging.info("Youtube thumbnail url '%s'", url)
+				with requests.get(url, timeout=(timeout, timeout)) as response:
+					image = Image.open(io.BytesIO(response.content))
+					image = MediaInfoAbstract.shrink_image_to_fit(image, size=(320, 180))
+					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'))
+					io_buf.seek(0)
+					return io_buf
+			except Exception as e:
+				logging.error("Failed to download download thumbnail!")
+				logging.exception(e)
 
 		return None
 

{warp_beacon-2.2.11 → warp_beacon-2.2.12}/warp_beacon/scraper/youtube/music.py

@@ -1,6 +1,6 @@
 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.scraper.exceptions import NotFound, FileTooBig
 
 import logging
 
@@ -15,8 +15,8 @@ class YoutubeMusicScraper(YoutubeAbstract):
 		thumbnail = None
 		yt = self.build_yt(url)
 
-		if yt and yt.thumbnail_url:
-			thumbnail = self._download_hndlr(self.download_thumbnail, yt.thumbnail_url)
+		if yt:
+			thumbnail = self._download_hndlr(self.download_thumbnail, yt.video_id)
 		
 		stream = yt.streams.get_audio_only()
 		

{warp_beacon-2.2.11 → warp_beacon-2.2.12}/warp_beacon/scraper/youtube/shorts.py

@@ -19,8 +19,8 @@ class YoutubeShortsScraper(YoutubeAbstract):
 		if not stream:
 			raise NotFound("No suitable video stream found")
 
-		if yt and yt.thumbnail_url:
-			thumbnail = self._download_hndlr(self.download_thumbnail, yt.thumbnail_url)
+		if yt:
+			thumbnail = self._download_hndlr(self.download_thumbnail, yt.video_id)
 
 		local_file = stream.download(
 			output_path=self.DOWNLOAD_DIR,

{warp_beacon-2.2.11 → warp_beacon-2.2.12}/warp_beacon/scraper/youtube/youtube.py

@@ -37,8 +37,8 @@ class YoutubeScraper(YoutubeAbstract):
 			if self.is_live(yt.initial_data):
 				raise YotubeLiveError("Youtube Live is not supported")
 
-			if yt and yt.thumbnail_url:
-				thumbnail = self._download_hndlr(self.download_thumbnail, yt.thumbnail_url)
+			if yt:
+				thumbnail = self._download_hndlr(self.download_thumbnail, yt.video_id)
 
 			stream = yt.streams.get_highest_resolution()
 

{warp_beacon-2.2.11 → warp_beacon-2.2.12/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.2.11/warp_beacon/__version__.py

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