warp-beacon 2.0.6__tar.gz → 2.0.7__tar.gz

{warp_beacon-2.0.6/warp_beacon.egg-info → warp_beacon-2.0.7}/PKG-INFO

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

{warp_beacon-2.0.6 → warp_beacon-2.0.7}/etc/warp_beacon.conf

@@ -2,6 +2,7 @@ TG_TOKEN=""
 TG_API_ID=""
 TG_API_HASH=""
 TG_BOT_NAME=""
+TG_BOT_ADMIN_USERNAME=""
 INSTAGRAM_LOGIN=""
 INSTAGRAM_PASSWORD=""
 INSTAGRAM_VERIFICATION_CODE=""
@@ -10,4 +11,4 @@ MONGODB_PORT="27017"
 MONGODB_USER="root"
 MONGODB_PASSWORD="changeme"
 VIDEO_STORAGE_DIR="/var/warp_beacon/videos"
-ENABLE_DONATES=true
+ENABLE_DONATES=true

warp_beacon-2.0.7/warp_beacon/__version__.py

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

{warp_beacon-2.0.6 → warp_beacon-2.0.7}/warp_beacon/jobs/abstract.py

@@ -29,6 +29,8 @@ class JobSettings(TypedDict):
 	media_collection: list
 	job_origin: Origin
 	canonical_name: str
+	is_message_to_admin: bool
+	message_text: str
 
 class AbstractJob(ABC):
 	job_id: uuid.UUID = None
@@ -52,6 +54,8 @@ class AbstractJob(ABC):
 	media_collection: list = []
 	job_origin: Origin = Origin.UNKNOWN
 	canonical_name: str = ""
+	is_message_to_admin: bool = False
+	message_text: str = ""
 
 	def __init__(self, **kwargs: Unpack[JobSettings]) -> None:
 		if kwargs:

{warp_beacon-2.0.6 → warp_beacon-2.0.7}/warp_beacon/mediainfo/silencer.py

@@ -28,7 +28,7 @@ class Silencer(VideoInfo):
 						if packet:
 							out_container.mux(packet)
 							#
-							aframe = av.AudioFrame(samples=32, format='s16')
+							aframe = av.AudioFrame(samples=64, format='s16')
 							aframe.pts = frame.pts
 							aframe.sample_rate = 16000
 							aframe.rate = 44100

{warp_beacon-2.0.6 → warp_beacon-2.0.7}/warp_beacon/scraper/__init__.py

@@ -1,11 +1,12 @@
 import os
 import time
+import asyncio
 
 from typing import Optional
 import multiprocessing
 from queue import Empty
 
-from warp_beacon.scraper.exceptions import NotFound, UnknownError, TimeOut, Unavailable, FileTooBig, YotubeLiveError
+from warp_beacon.scraper.exceptions import NotFound, UnknownError, TimeOut, Unavailable, FileTooBig, YotubeLiveError, YotubeAgeRestrictedError
 from warp_beacon.mediainfo.video import VideoInfo
 from warp_beacon.mediainfo.audio import AudioInfo
 from warp_beacon.mediainfo.silencer import Silencer
@@ -13,6 +14,7 @@ from warp_beacon.compress.video import VideoCompress
 from warp_beacon.uploader import AsyncUploader
 from warp_beacon.jobs import Origin
 from warp_beacon.jobs.download_job import DownloadJob
+from warp_beacon.jobs.upload_job import UploadJob
 from warp_beacon.jobs.types import JobType
 
 import logging
@@ -24,6 +26,7 @@ class AsyncDownloader(object):
 	job_queue = multiprocessing.Queue()
 	uploader = None
 	workers_count = 0
+	auth_event = multiprocessing.Event()
 
 	def __init__(self, uploader: AsyncUploader, workers_count: int) -> None:
 		self.allow_loop = multiprocessing.Value('i', 1)
@@ -86,6 +89,9 @@ class AsyncDownloader(object):
 								elif job.job_origin is Origin.YOUTUBE:
 									from warp_beacon.scraper.youtube.youtube import YoutubeScraper
 									actor = YoutubeScraper()
+								#self.auth_event = multiprocessing.Event()
+								actor.send_message_to_admin_func = self.send_message_to_admin
+								actor.auth_event = self.auth_event
 								while True:
 									try:
 										logging.info("Downloading URL '%s'", job.url)
@@ -123,6 +129,14 @@ class AsyncDownloader(object):
 											job_failed_msg="Youtube Live videos are not supported. Please wait until the live broadcast ends.")
 										)
 										break
+									except YotubeAgeRestrictedError as e:
+										logging.error("Youtube Age Restricted error")
+										logging.exception(e)
+										self.uploader.queue_task(job.to_upload_job(
+											job_failed=True,
+											job_failed_msg="Youtube Age Restricted error. Check your bot Youtube account settings.")
+										)
+										break
 									except (UnknownError, Exception) as e:
 										logging.warning("UnknownError occurred!")
 										logging.exception(e)
@@ -139,7 +153,7 @@ class AsyncDownloader(object):
 											break
 										self.uploader.queue_task(job.to_upload_job(
 											job_failed=True,
-											job_failed_msg="WOW, unknown error occured! Please send service logs to developer via email: andrey@bagrintsev.me.")
+											job_failed_msg="WOW, unknown error occured! Please [create issue](https://github.com/sb0y/warp_beacon/issues) with service logs.")
 										)
 										break
 
@@ -182,7 +196,7 @@ class AsyncDownloader(object):
 														if not v["media_info"]["has_sound"]:
 															silencer = Silencer(v["local_media_path"])
 															silent_video_path = silencer.add_silent_audio()
-															os.unlink(j["local_media_path"])
+															os.unlink(v["local_media_path"])
 															v["local_media_path"] = silent_video_path
 															v["media_info"].update(silencer.get_finfo())
 															v["media_info"]["has_sound"] = True
@@ -242,4 +256,10 @@ class AsyncDownloader(object):
 		return str(job.job_id)
 	
 	def notify_task_failed(self, job: DownloadJob) -> None:
-		self.uploader.queue_task(job.to_upload_job(job_failed=True))
+		self.uploader.queue_task(job.to_upload_job(job_failed=True))
+
+	def send_message_to_admin(self, text: str) -> None:
+		self.uploader.queue_task(UploadJob.build(
+			is_message_to_admin=True,
+			message_text=text
+		))

{warp_beacon-2.0.6 → warp_beacon-2.0.7}/warp_beacon/scraper/abstract.py

@@ -10,6 +10,9 @@ from pillow_heif import register_heif_opener
 import logging
 
 class ScraperAbstract(ABC):
+	send_message_to_admin_func = None
+	auth_event = None
+
 	def __init__(self) -> None:
 		pass
 

{warp_beacon-2.0.6 → warp_beacon-2.0.7}/warp_beacon/scraper/exceptions.py

@@ -31,6 +31,9 @@ class Unavailable(ScraperError):
 class YotubeLiveError(ScraperError):
 	pass
 
+class YotubeAgeRestrictedError(ScraperError):
+	pass
+
 class UnknownError(ScraperError):
 	pass
 

{warp_beacon-2.0.6 → warp_beacon-2.0.7}/warp_beacon/scraper/instagram.py

@@ -145,6 +145,7 @@ class InstagramScraper(ScraperAbstract):
 		effective_url = "https://www.instagram.com/stories/%s/%s/" % (story_info.user.username, effective_story_id)
 		if story_info.media_type == 1: # photo
 			path = str(self._download_hndlr(self.cl.story_download_by_url, url=story_info.thumbnail_url, folder='/tmp'))
+			path_lowered = path.lower()
 			if ".webp" in path_lowered:
 				path = InstagramScraper.convert_webp_to_png(path)
 			if ".heic" in path_lowered:

{warp_beacon-2.0.6 → warp_beacon-2.0.7}/warp_beacon/scraper/youtube/abstract.py

@@ -7,6 +7,8 @@ import ssl
 from abc import abstractmethod
 from typing import Callable, Union
 
+import json
+
 import requests
 import urllib
 import http.client
@@ -17,12 +19,66 @@ from warp_beacon.scraper.abstract import ScraperAbstract
 from warp_beacon.mediainfo.abstract import MediaInfoAbstract
 from warp_beacon.scraper.exceptions import NotFound, UnknownError, TimeOut, Unavailable, extract_exception_message
 
+from pytubefix import YouTube
+from pytubefix.innertube import _default_clients
+from pytubefix.streams import Stream
+from pytubefix.innertube import InnerTube, _client_id, _client_secret
 from pytubefix.exceptions import VideoUnavailable, VideoPrivate, MaxRetriesExceeded
+from pytubefix import request
 
 import logging
 
+def patched_fetch_bearer_token(self) -> None:
+	"""Fetch an OAuth token."""
+	# Subtracting 30 seconds is arbitrary to avoid potential time discrepencies
+	start_time = int(time.time() - 30)
+	data = {
+		'client_id': _client_id,
+		'scope': 'https://www.googleapis.com/auth/youtube'
+	}
+	response = request._execute_request(
+		'https://oauth2.googleapis.com/device/code',
+		'POST',
+		headers={
+			'Content-Type': 'application/json'
+		},
+		data=data
+	)
+	response_data = json.loads(response.read())
+	verification_url = response_data['verification_url']
+	user_code = response_data['user_code']
+
+	logging.warning("Please open %s and input code '%s'", verification_url, user_code)
+	self.send_message_to_admin_func(
+		f"Please open {verification_url} and input code `{user_code}`.\n\n"
+		"Please select a Google account with verified age.\n"
+		"This will allow you to avoid error the **AgeRestrictedError** when accessing some content.")
+	self.auth_event.wait()
+
+	data = {
+		'client_id': _client_id,
+		'client_secret': _client_secret,
+		'device_code': response_data['device_code'],
+		'grant_type': 'urn:ietf:params:oauth:grant-type:device_code'
+	}
+	response = request._execute_request(
+		'https://oauth2.googleapis.com/token',
+		'POST',
+		headers={
+			'Content-Type': 'application/json'
+		},
+		data=data
+	)
+	response_data = json.loads(response.read())
+
+	self.access_token = response_data['access_token']
+	self.refresh_token = response_data['refresh_token']
+	self.expires = start_time + response_data['expires_in']
+	self.cache_tokens()
+
 class YoutubeAbstract(ScraperAbstract):
 	DOWNLOAD_DIR = "/tmp"
+	YT_SESSION_FILE = '/var/warp_beacon/yt_session.json'
 
 	def __init__(self) -> None:
 		pass
@@ -49,9 +105,9 @@ class YoutubeAbstract(ScraperAbstract):
 			if "yt_download_" in i:
 				os.unlink("%s/%s" % (self.DOWNLOAD_DIR, i))
 
-	def download_thumbnail(self, url: str) -> Union[io.BytesIO, None]:
+	def download_thumbnail(self, url: str, timeout: int) -> Union[io.BytesIO, None]:
 		try:
-			reply = requests.get(url, stream=True)
+			reply = requests.get(url, timeout=(timeout, timeout))
 			if reply.ok and reply.status_code == 200:
 				image = Image.open(io.BytesIO(reply.content))
 				image = MediaInfoAbstract.shrink_image_to_fit(image)
@@ -65,7 +121,7 @@ class YoutubeAbstract(ScraperAbstract):
 
 		return None
 
-	def _download_hndlr(self, func: Callable, *args: tuple[str], **kwargs: dict[str]) -> Union[str, dict]:
+	def _download_hndlr(self, func: Callable, *args: tuple[str], **kwargs: dict[str]) -> 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))
@@ -103,3 +159,22 @@ class YoutubeAbstract(ScraperAbstract):
 				raise Unavailable(extract_exception_message(e))
 
 		return ret_val
+
+	def yt_on_progress(self, stream: Stream, chunk: bytes, bytes_remaining: int) -> None:
+		pass
+		#logging.info("bytes: %d, bytes remaining: %d", chunk, bytes_remaining)
+
+	def build_yt(self, url: str) -> YouTube:
+		InnerTube.send_message_to_admin_func = self.send_message_to_admin_func
+		InnerTube.auth_event = self.auth_event
+		InnerTube.fetch_bearer_token = patched_fetch_bearer_token
+		_default_clients["ANDROID"]["innertube_context"]["context"]["client"]["clientVersion"] = "19.08.35"
+		_default_clients["ANDROID_MUSIC"] = _default_clients["ANDROID"]
+		return YouTube(
+			url=url,
+			#client="WEB",
+			use_oauth=True,
+			allow_oauth_cache=True,
+			token_file=self.YT_SESSION_FILE,
+			on_progress_callback = self.yt_on_progress
+		)

warp_beacon-2.0.7/warp_beacon/scraper/youtube/music.py

@@ -0,0 +1,53 @@
+from warp_beacon.jobs.types import JobType
+from warp_beacon.scraper.youtube.abstract import YoutubeAbstract
+from warp_beacon.scraper.exceptions import NotFound
+
+from pytubefix import YouTube
+
+import logging
+
+class YoutubeMusicScraper(YoutubeAbstract):
+	YT_MAX_RETRIES_DEFAULT = 6
+	YT_PAUSE_BEFORE_RETRY_DEFAULT = 3
+	YT_TIMEOUT_DEFAULT = 2
+	YT_TIMEOUT_INCREMENT_DEFAULT = 60
+
+	def _download(self, url: str, timeout: int = 0) -> list:
+		res = []
+		thumbnail = None
+		yt = self.build_yt(url)
+
+		if yt and yt.thumbnail_url:
+			thumbnail = self._download_hndlr(self.download_thumbnail, yt.thumbnail_url)
+		
+		stream = yt.streams.get_audio_only()
+		
+		if not stream:
+			raise NotFound("No suitable audio stream found")
+		
+		logging.info("Announced audio file size: '%d'", stream.filesize)
+		if stream.filesize > 2e+9:
+			logging.warning("Downloading size reported by YouTube is over than 2 GB!")
+			raise FileTooBig("YouTube file is larger than 2 GB")
+		logging.info("Operation timeout is '%d'", timeout)
+		local_file = stream.download(
+			output_path=self.DOWNLOAD_DIR,
+			max_retries=0,
+			timeout=timeout,
+			skip_existing=False,
+			filename_prefix='yt_download_',
+			mp3=True
+		)
+		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": JobType.AUDIO
+		})
+
+		return res
+
+	def download(self, url: str) -> list:
+		return self._download_hndlr(self._download, url)

warp_beacon-2.0.7/warp_beacon/scraper/youtube/shorts.py

@@ -0,0 +1,46 @@
+from warp_beacon.jobs.types import JobType
+from warp_beacon.scraper.youtube.abstract import YoutubeAbstract
+from warp_beacon.scraper.exceptions import NotFound
+
+from pytubefix import YouTube
+
+import logging
+
+class YoutubeShortsScraper(YoutubeAbstract):
+	YT_MAX_RETRIES_DEFAULT = 8
+	YT_PAUSE_BEFORE_RETRY_DEFAULT = 3
+	YT_TIMEOUT_DEFAULT = 2
+	YT_TIMEOUT_INCREMENT_DEFAULT = 60
+
+	def _download(self, url: str, timeout: int = 0) -> list:
+		res = []
+		thumbnail = None
+		yt = self.build_yt(url)
+		stream = yt.streams.get_highest_resolution()
+
+		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)
+
+		local_file = stream.download(
+			output_path=self.DOWNLOAD_DIR,
+			max_retries=0,
+			timeout=timeout,
+			skip_existing=False,
+			filename_prefix="yt_download_"
+		)
+		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": JobType.VIDEO
+		})
+
+		return res
+
+	def download(self, url: str) -> list:
+		return self._download_hndlr(self._download, url)

{warp_beacon-2.0.6 → warp_beacon-2.0.7}/warp_beacon/scraper/youtube/youtube.py

@@ -1,8 +1,9 @@
 from warp_beacon.jobs.types import JobType
 from warp_beacon.scraper.youtube.abstract import YoutubeAbstract
-from warp_beacon.scraper.exceptions import YotubeLiveError, NotFound
+from warp_beacon.scraper.exceptions import YotubeLiveError, NotFound, YotubeAgeRestrictedError
 
 from pytubefix import YouTube
+from pytubefix.exceptions import AgeRestrictedError
 
 import logging
 
@@ -30,35 +31,40 @@ class YoutubeScraper(YoutubeAbstract):
 
 	def _download(self, url: str, timeout: int = 0) -> list:
 		res = []
-		thumbnail = None
-		yt = YouTube(url)
+		try:
+			thumbnail = None
+			yt = self.build_yt(url)
+
+			if self.is_live(yt.initial_data):
+				raise YotubeLiveError("Youtube Live is not supported")
 
-		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 and yt.thumbnail_url:
-			thumbnail = self.download_thumbnail(yt.thumbnail_url)
+			stream = yt.streams.get_highest_resolution()
 
-		stream = yt.streams.get_highest_resolution()
+			if not stream:
+				raise NotFound("No suitable video stream found")
 
-		if not stream:
-			raise NotFound("No suitable video stream found")
+			logging.info("Starting download ...")
 
-		local_file = stream.download(
-			output_path=self.DOWNLOAD_DIR,
-			max_retries=0,
-			timeout=timeout,
-			skip_existing=False,
-			filename_prefix="yt_download_"
-		)
-		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": JobType.VIDEO
-		})
+			local_file = stream.download(
+				output_path=self.DOWNLOAD_DIR,
+				max_retries=0,
+				timeout=timeout,
+				skip_existing=False,
+				filename_prefix="yt_download_"
+			)
+			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": JobType.VIDEO
+			})
+		except AgeRestrictedError as e:
+			raise YotubeAgeRestrictedError("Youtube Age Restricted error")
 
 		return res
 

{warp_beacon-2.0.6 → warp_beacon-2.0.7}/warp_beacon/telegram/bot.py

@@ -6,7 +6,7 @@ import asyncio
 
 from pyrogram import Client, filters
 from pyrogram.enums import ParseMode
-from pyrogram.handlers import MessageHandler
+from pyrogram.handlers import MessageHandler, CallbackQueryHandler
 from pyrogram.types import Message, InputMedia, InputMediaAudio, InputMediaPhoto, InputMediaVideo, InputMediaAnimation, InputMediaDocument, InlineKeyboardButton, InlineKeyboardMarkup
 from pyrogram.errors import RPCError, FloodWait, NetworkMigrate, BadRequest, MultiMediaTooLong, MessageIdInvalid
 
@@ -64,6 +64,7 @@ class Bot(object):
 
 		self.uploader = AsyncUploader(
 			storage=self.storage,
+			admin_message_callback=self.send_text_to_admin,
 			pool_size=int(os.environ.get("UPLOAD_POOL_SIZE", default=workers_amount)),
 			loop=self.client.loop
 		)
@@ -81,6 +82,7 @@ class Bot(object):
 		self.client.add_handler(MessageHandler(self.handlers.help, filters.command("help")))
 		self.client.add_handler(MessageHandler(self.handlers.random, filters.command("random")))
 		self.client.add_handler(MessageHandler(self.handlers.handler))
+		self.client.add_handler(CallbackQueryHandler(self.handlers.simple_button_handler))
 
 		self.placeholder = PlaceholderMessage(self)
 
@@ -114,6 +116,30 @@ class Bot(object):
 
 		return 0
 
+	async def send_text_to_admin(self, text: str) -> int:
+		try:
+			admin = os.environ.get("TG_BOT_ADMIN_USERNAME", None)
+			if not admin:
+				raise ValueError("Configuration value `TG_BOT_ADMIN_USERNAME` is empty!")
+			message_reply = await self.client.send_message(
+				chat_id=admin,
+				text=text,
+				parse_mode=ParseMode.MARKDOWN,
+				reply_markup=InlineKeyboardMarkup(
+					[
+						[
+							InlineKeyboardButton("✅ Done", callback_data="auth_process_done")
+						]
+					]
+				)
+			)
+			return message_reply.id
+		except Exception as e:
+			logging.error("Failed to send text message to admin!")
+			logging.exception(e)
+
+		return 0
+
 	def build_tg_args(self, job: UploadJob) -> dict:
 		args = {}
 		if job.media_type == JobType.VIDEO:
@@ -342,7 +368,7 @@ class Bot(object):
 		except Exception as e:
 			logging.error("Error occurred!")
 			logging.exception(e)
-		finally:
-			job.remove_files()
+		#finally:
+			#job.remove_files()
 
 		return tg_file_ids

{warp_beacon-2.0.6 → warp_beacon-2.0.7}/warp_beacon/telegram/handlers.py

@@ -1,5 +1,5 @@
 from pyrogram import Client
-from pyrogram.types import Message
+from pyrogram.types import Message, CallbackQuery
 from pyrogram.enums import ChatType, ParseMode
 from pyrogram.types import Chat, BotCommand
 
@@ -165,4 +165,13 @@ class Handlers(object):
 						logging.exception(e)
 
 		if chat.type not in (ChatType.GROUP, ChatType.SUPERGROUP) and not urls:
-			await self.bot.send_text(rext=reply_text, reply_id=effective_message_id)
+			await self.bot.send_text(rext=reply_text, reply_id=effective_message_id)
+
+	async def simple_button_handler(self, client: Client, query: CallbackQuery) -> None:
+		await client.answer_callback_query(
+			callback_query_id=query.id,
+			text="Please wait, bot will try to download media with obtained credentials.\nIf authorization is not successful, the operation will be repeated.",
+			show_alert=True
+		)
+		self.bot.downloader.auth_event.set()
+		self.bot.downloader.auth_event.clear()

{warp_beacon-2.0.6 → warp_beacon-2.0.7}/warp_beacon/uploader/__init__.py

@@ -1,3 +1,4 @@
+import os
 import threading
 import multiprocessing
 from warp_beacon.jobs.upload_job import UploadJob
@@ -20,12 +21,14 @@ class AsyncUploader(object):
 	storage = None
 	in_process = set()
 	loop = None
+	admin_message_callback = None
 	pool_size = 1
 
-	def __init__(self, loop: asyncio.AbstractEventLoop, storage: Storage, pool_size: int=multiprocessing.cpu_count()) -> None:
+	def __init__(self, loop: asyncio.AbstractEventLoop, storage: Storage, admin_message_callback: Callable, pool_size: int=min(32, os.cpu_count() + 4)) -> None:
 		self.storage = storage
 		self.loop = loop
 		self.job_queue = multiprocessing.Queue()
+		self.admin_message_callback = admin_message_callback
 		self.pool_size = pool_size
 	
 	def __del__(self) -> None:
@@ -80,6 +83,9 @@ class AsyncUploader(object):
 					job = self.job_queue.get()
 					if job is self.__JOE_BIDEN_WAKEUP:
 						continue
+					if job.is_message_to_admin and job.message_text and self.admin_message_callback:
+						asyncio.ensure_future(self.admin_message_callback(job.message_text), loop=self.loop)
+						continue
 					path = ""
 					if job.media_type == JobType.COLLECTION:
 						for i in job.media_collection:

{warp_beacon-2.0.6 → warp_beacon-2.0.7/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.0.6/warp_beacon/__version__.py

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

warp_beacon-2.0.6/warp_beacon/scraper/youtube/music.py

@@ -1,47 +0,0 @@
-from warp_beacon.jobs.types import JobType
-from warp_beacon.scraper.youtube.abstract import YoutubeAbstract
-
-from pytubefix import YouTube
-
-import logging
-
-class YoutubeMusicScraper(YoutubeAbstract):
-	YT_MAX_RETRIES_DEFAULT = 6
-	YT_PAUSE_BEFORE_RETRY_DEFAULT = 3
-	YT_TIMEOUT_DEFAULT = 2
-	YT_TIMEOUT_INCREMENT_DEFAULT = 60
-
-	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 > 2e+9:
-				logging.warning("Downloading size reported by YouTube is over than 2 GB!")
-				raise FileTooBig("YouTube file is larger than 2 GB")
-			logging.info("Operation timeout is '%d'", timeout)
-			local_file = stream.download(
-				output_path=self.DOWNLOAD_DIR,
-				max_retries=0,
-				timeout=timeout,
-				skip_existing=False,
-				filename_prefix='yt_download_',
-				mp3=True
-			)
-			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": JobType.AUDIO
-			})
-
-		return res
-
-	def download(self, url: str) -> list:
-		return self._download_hndlr(self._download, url)

warp_beacon-2.0.6/warp_beacon/scraper/youtube/shorts.py

@@ -1,42 +0,0 @@
-from warp_beacon.jobs.types import JobType
-from warp_beacon.scraper.youtube.abstract import YoutubeAbstract
-
-from pytubefix import YouTube
-
-import logging
-
-class YoutubeShortsScraper(YoutubeAbstract):
-	YT_MAX_RETRIES_DEFAULT = 8
-	YT_PAUSE_BEFORE_RETRY_DEFAULT = 3
-	YT_TIMEOUT_DEFAULT = 2
-	YT_TIMEOUT_INCREMENT_DEFAULT = 60
-
-	def _download(self, url: str, timeout: int = 0) -> list:
-		res = []
-		thumbnail = None
-		yt = YouTube(url)
-		stream = yt.streams.get_highest_resolution()
-		if yt and yt.thumbnail_url:
-			logging.debug("Generation thumb for Shorts ...")
-			thumbnail = self.download_thumbnail(yt.thumbnail_url)
-		if stream:
-			local_file = stream.download(
-				output_path=self.DOWNLOAD_DIR,
-				max_retries=0,
-				timeout=timeout,
-				skip_existing=False,
-				filename_prefix="yt_download_"
-			)
-			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": JobType.VIDEO
-			})
-
-		return res
-
-	def download(self, url: str) -> list:
-		return self._download_hndlr(self._download, url)