warp-beacon 1.2.3__tar.gz → 1.2.5__tar.gz

{warp_beacon-1.2.3/warp_beacon.egg-info → warp_beacon-1.2.5}/PKG-INFO

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

warp_beacon-1.2.5/warp_beacon/__version__.py

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

{warp_beacon-1.2.3 → warp_beacon-1.2.5}/warp_beacon/mediainfo/abstract.py

@@ -1,6 +1,8 @@
 import os
 from abc import ABC, abstractmethod
 
+from PIL import Image
+
 import av
 
 class MediaInfoAbstract(ABC):
@@ -25,4 +27,13 @@ class MediaInfoAbstract(ABC):
 
 	@abstractmethod
 	def get_finfo(cls, except_info: tuple=()) -> dict:
-		raise NotImplementedError
+		raise NotImplementedError
+
+	@staticmethod
+	def shrink_image_to_fit(image: Image, size: tuple = (320, 320)) -> Image:
+		image.thumbnail(size, Image.Resampling.LANCZOS)
+		#image.save(
+		#	"/tmp/test.th.jpg",
+		#	quality=80,
+		#)
+		return image

{warp_beacon-1.2.3 → warp_beacon-1.2.5}/warp_beacon/mediainfo/video.py

@@ -41,14 +41,6 @@ class VideoInfo(MediaInfoAbstract):
 			res["filesize"] = VideoInfo.get_filesize(self.filename)
 		return res
 	
-	def shrink_image_to_fit(self, image: Image, size: tuple = (320, 320)) -> Image:
-		image.thumbnail(size, Image.Resampling.LANCZOS)
-		#image.save(
-		#	"/tmp/test.th.jpg",
-		#	quality=80,
-		#)
-		return image
-	
 	def generate_thumbnail(self) -> Union[io.BytesIO, None]:
 		try:
 			image = None
@@ -71,7 +63,7 @@ class VideoInfo(MediaInfoAbstract):
 	 			#)
 					#break
 			if image:
-				image = self.shrink_image_to_fit(image)
+				image = VideoInfo.shrink_image_to_fit(image)
 				io_buf = io.BytesIO()
 				image.save(io_buf, format='JPEG')
 				io_buf.seek(0)

{warp_beacon-1.2.3 → warp_beacon-1.2.5}/warp_beacon/scraper/__init__.py

@@ -5,7 +5,7 @@ from typing import Optional
 import multiprocessing
 from queue import Empty
 
-from warp_beacon.scraper.exceptions import NotFound, UnknownError, TimeOut, Unavailable
+from warp_beacon.scraper.exceptions import NotFound, UnknownError, TimeOut, Unavailable, FileTooBig
 from warp_beacon.mediainfo.video import VideoInfo
 from warp_beacon.mediainfo.audio import AudioInfo
 from warp_beacon.compress.video import VideoCompress
@@ -102,6 +102,14 @@ class AsyncDownloader(object):
 											job_failed_msg="Failed to download content. Please check you Internet connection or retry amount bot configuration settings.")
 										)
 										break
+									except FileTooBig as e:
+										logging.warning("Telegram limits exceeded :(")
+										logging.exception(e)
+										self.uploader.queue_task(job.to_upload_job(
+											job_failed=True,
+											job_failed_msg="Unfortunately, this file exceeds the telegram limit of 50 megabytes.")
+										)
+										break
 									except (UnknownError, Exception) as e:
 										logging.warning("UnknownError occurred!")
 										logging.exception(e)
@@ -146,6 +154,8 @@ class AsyncDownloader(object):
 													logging.info("New file size of compressed file is '%.3f'", media_info["filesize"])
 										elif item["media_type"] == "audio":
 											media_info = self.get_media_info(item["local_media_path"], item.get("media_info", {}), "audio")
+											media_info["performer"] = item.get("performer", None)
+											media_info["thumb"] = item.get("thumb", None)
 											logging.info("Final media info: %s", media_info)
 										elif item["media_type"] == "collection":
 											for v in item["items"]:

{warp_beacon-1.2.3 → warp_beacon-1.2.5}/warp_beacon/scraper/exceptions.py

@@ -19,6 +19,9 @@ class ScraperError(Exception):
 class TimeOut(ScraperError):
 	pass
 
+class FileTooBig(ScraperError):
+	pass
+
 class NotFound(ScraperError):
 	pass
 

{warp_beacon-1.2.3 → warp_beacon-1.2.5}/warp_beacon/scraper/youtube/music.py

@@ -1,4 +1,5 @@
 import os
+import io
 import pathlib
 import time
 
@@ -11,10 +12,13 @@ import requests
 import urllib
 import http.client
 
+from PIL import Image
+
 from pytubefix import YouTube
 from pytubefix.exceptions import VideoUnavailable, VideoPrivate, MaxRetriesExceeded
 
-from warp_beacon.scraper.exceptions import NotFound, UnknownError, TimeOut, Unavailable, extract_exception_message
+from warp_beacon.mediainfo.abstract import MediaInfoAbstract
+from warp_beacon.scraper.exceptions import NotFound, UnknownError, TimeOut, Unavailable, FileTooBig, extract_exception_message
 from warp_beacon.scraper.abstract import ScraperAbstract
 
 import logging
@@ -87,11 +91,34 @@ class YoutubeMusicScraper(ScraperAbstract):
 
 		return new_filepath
 
+	def download_thumbnail(self, url: str) -> Union[io.BytesIO, None]:
+		try:
+			reply = requests.get(url, stream=True)
+			if reply.ok and reply.status_code == 200:
+				image = Image.open(io.BytesIO(reply.content))
+				image = MediaInfoAbstract.shrink_image_to_fit(image)
+				io_buf = io.BytesIO()
+				image.save(io_buf, format='JPEG')
+				io_buf.seek(0)
+				return io_buf
+		except Exception as e:
+			logging.error("Failed to download download thumbnail!")
+			logging.exception(e)
+
+		return None
+
 	def _download(self, url: str, timeout: int = 0) -> list:
 		res = []
+		thumbnail = None
 		yt = YouTube(url)
+		if yt and yt.thumbnail_url:
+			thumbnail = self.download_thumbnail(yt.thumbnail_url)
 		stream = yt.streams.get_audio_only()
 		if stream:
+			logging.info("Announced audio file size: '%d'", stream.filesize)
+			if stream.filesize > 5e+7:
+				logging.warning("Downloading size reported by YouTube is over than 50 mb!")
+				raise FileTooBig("YouTube file is larger than 50 mb")
 			logging.info("Operation timeout is '%d'", timeout)
 			local_file = stream.download(
 				output_path=DOWNLOAD_DIR,
@@ -101,8 +128,14 @@ class YoutubeMusicScraper(ScraperAbstract):
 				filename_prefix='yt_download_',
 				mp3=True
 			)
-			logging.info("Temp filename: '%s'", local_file)
-			res.append({"local_media_path": self.rename_local_file(local_file), "canonical_name": stream.title, "media_type": "audio"})
+			logging.debug("Temp filename: '%s'", local_file)
+			res.append({
+				"local_media_path": self.rename_local_file(local_file),
+				"performer": yt.author,
+				"thumb": thumbnail,
+				"canonical_name": stream.title,
+				"media_type": "audio"
+			})
 
 		return res
 

{warp_beacon-1.2.3 → warp_beacon-1.2.5}/warp_beacon/warp_beacon.py

@@ -237,13 +237,17 @@ def build_tg_args(update: Update, context: ContextTypes.DEFAULT_TYPE, job: Uploa
 	elif job.media_type == "audio":
 		if job.tg_file_id:
 			if job.placeholder_message_id:
-				args["media"] = InputMediaAudio(media=job.tg_file_id.replace(":audio", ''))
+				args["media"] = InputMediaAudio(
+					media=job.tg_file_id.replace(":audio", '')
+				)
 			else:
 				args["audio"] = job.tg_file_id.replace(":audio", '')
 		else:
 			args["media"] = InputMediaAudio(
 				media=open(job.local_media_path, 'rb'),
-				filename="%s%s" % (job.canonical_name, os.path.splitext(job.local_media_path)[-1])
+				filename="%s%s" % (job.canonical_name, os.path.splitext(job.local_media_path)[-1]),
+				performer=job.media_info["performer"],
+				thumbnail=job.media_info["thumb"]
 			)
 	elif job.media_type == "collection":
 		if job.tg_file_id:

{warp_beacon-1.2.3 → warp_beacon-1.2.5/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-1.2.3/warp_beacon/__version__.py

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