warp-beacon 2.5.0__py3-none-any.whl → 2.5.1__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.5.0"
+__version__ = "2.5.1"
 

warp_beacon/scraper/youtube/music.py

@@ -49,7 +49,7 @@ class YoutubeMusicScraper(YoutubeAbstract):
 				"local_media_path": self.rename_local_file(local_file),
 				"performer": yt.author,
 				"thumb": thumbnail,
-				"canonical_name": stream.title,
+				"canonical_name": yt.title,
 				"media_type": JobType.AUDIO
 			})
 		except Exception:

warp_beacon/scraper/youtube/youtube.py

@@ -1,5 +1,8 @@
+import time
+import os
 import logging
 
+import av
 from pytubefix.exceptions import AgeRestrictedError
 
 from warp_beacon.jobs.types import JobType
@@ -29,6 +32,110 @@ class YoutubeScraper(YoutubeAbstract):
 		return False
 
 	def _download(self, url: str, session: bool = True, timeout: int = 60) -> list:
+		res = None
+		try:
+			res = self._download_pytubefix_max_res(url=url, session=session, timeout=timeout)
+		except Exception as e:
+			logging.error("Failed to download video with highest resolution via pytubefix!")
+			logging.exception(e)
+
+		if not res:
+			try:
+				res = self._download_pytube_dash(url=url, session=session, timeout=timeout)
+			except Exception as e:
+				logging.error("Failed to download DASH stream video via pytubefix!")
+				logging.exception(e)
+
+		return res
+	
+	def mux_raw_copy(self, video_path: str, audio_path: str, output_path: str) -> str:
+		try:
+			with av.open(video_path) as input_video, av.open(audio_path) as input_audio, av.open(output_path, mode='w') as output:
+				in_video_stream = input_video.streams.video[0]
+				in_audio_stream = input_audio.streams.audio[0]
+
+				out_video_stream = output.add_stream(codec_name=in_video_stream.codec.name)
+				out_audio_stream = output.add_stream(codec_name=in_audio_stream.codec.name)
+
+				for packet in input_video.demux(in_video_stream):
+					if packet.dts is None:
+						continue
+					packet.stream = out_video_stream
+					output.mux(packet)
+
+				for packet in input_audio.demux(in_audio_stream):
+					if packet.dts is None:
+						continue
+					packet.stream = out_audio_stream
+					output.mux(packet)
+		except Exception as e:
+			logging.error("Failed to mux audio and video!")
+			logging.exception(e)
+			return ''
+
+		return output_path
+
+	def _download_pytubefix_max_res(self, url: str, session: bool = True, timeout: int = 60) -> list:
+		res = []
+		local_video_file, local_audio_file = '', ''
+		try:
+			thumbnail = None
+			video_id = self.get_video_id(url)
+			if video_id:
+				thumbnail = self.download_hndlr(self.download_thumbnail, video_id)
+			yt = self.build_yt(url, session=session)
+
+			if self.is_live(yt.initial_data):
+				raise YoutubeLiveError("Youtube Live is not supported")
+			
+			video_stream = yt.streams.filter(adaptive=True, file_extension='mp4', only_video=True).order_by('resolution').desc().first()
+			audio_stream = yt.streams.filter(adaptive=True, file_extension='mp4', only_audio=True).order_by('abr').desc().first()
+
+			local_video_file = video_stream.download(
+				output_path=self.DOWNLOAD_DIR,
+				max_retries=3,
+				timeout=timeout,
+				skip_existing=False,
+				filename_prefix="yt_download_video_"
+			)
+			local_video_file = self.rename_local_file(local_video_file)
+			logging.debug("Temp video filename: '%s'", local_video_file)
+			local_audio_file = audio_stream.download(
+				output_path=self.DOWNLOAD_DIR,
+				max_retries=3,
+				timeout=timeout,
+				skip_existing=False,
+				filename_prefix="yt_download_audio_"
+			)
+			local_audio_file = self.rename_local_file(local_audio_file)
+			logging.debug("Temp audio filename: '%s'", local_audio_file)
+
+			muxed_video = self.mux_raw_copy(
+				video_path=local_video_file,
+				audio_path=local_audio_file,
+				output_path=f"{self.DOWNLOAD_DIR}/yt_muxed_video_{int(time.time())}.mp4")
+			if muxed_video:
+				muxed_video = self.rename_local_file(muxed_video)
+			logging.debug("Temp muxed filename: '%s'", muxed_video)
+
+			res.append({
+				"local_media_path": muxed_video,
+				"performer": yt.author,
+				"thumb": thumbnail,
+				"canonical_name": yt.title,
+				"media_type": JobType.VIDEO
+			})
+		except AgeRestrictedError as e:
+			raise YotubeAgeRestrictedError("Youtube Age Restricted error")
+		finally:
+			if os.path.exists(local_video_file):
+				os.unlink(local_video_file)
+			if os.path.exists(local_audio_file):
+				os.unlink(local_audio_file)
+		
+		return res
+
+	def _download_pytube_dash(self, url: str, session: bool = True, timeout: int = 60) -> list:
 		res = []
 		try:
 			thumbnail = None

{warp_beacon-2.5.0.dist-info → warp_beacon-2.5.1.dist-info}/METADATA

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

{warp_beacon-2.5.0.dist-info → warp_beacon-2.5.1.dist-info}/RECORD

@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=yD2fQ5Bqhm2OUVsEBxqOfmSxIDd9-R8jWxUE6ePf5Zk,23
+warp_beacon/__version__.py,sha256=CuP8A044Dx_SN-2FdWp2DpPo-sVcAap_snue2AkcA_s,23
 warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -32,9 +32,9 @@ warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 warp_beacon/scraper/instagram/instagram.py,sha256=KyOZnIt6A8wkroXkZcIJMscuy5N5ZEz9-v3Ciwo0C7M,14654
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/youtube/abstract.py,sha256=r_g6zkEX9h5VqQVHaQFAD-lWsEOs7Um353N98nB3tfA,11548
-warp_beacon/scraper/youtube/music.py,sha256=-R6Iys8IpglH5UL7F640UQ3ieYHitvGXA0A2GhSemVA,2927
+warp_beacon/scraper/youtube/music.py,sha256=m-1iPYe1p0OZmOlYl8gjHErsazCcXqs3qDA7KyIT6GI,2923
 warp_beacon/scraper/youtube/shorts.py,sha256=sPrOjhcLlV0m5a-j4mSFsF6CkNapeUdGZqoWAYheiCM,1894
-warp_beacon/scraper/youtube/youtube.py,sha256=B1NBz6vv0-zIuf3MDmT2QB7eX2qO8k9orj7-4wU6MBk,2839
+warp_beacon/scraper/youtube/youtube.py,sha256=xvMNxmw9Aa_koWZzl1VAA0BtNKH3m6tJrdh2Qc6Xvek,6477
 warp_beacon/storage/__init__.py,sha256=0Vajd0oITKJfu2vmNx5uQSt3-L6vwIvUYWJo8HZCjco,3398
 warp_beacon/storage/mongo.py,sha256=qC4ZiO8XXvPnP0rJwz4CJx42pqFsyAjCiW10W5QdT6E,527
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -44,9 +44,9 @@ warp_beacon/telegram/handlers.py,sha256=uvR6TPHSqdSxigp3wR-ewiE6t3TvVcbVLVcYGwkg
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
 warp_beacon/telegram/utils.py,sha256=9uebX53G16mV7ER7WgfdWBLFHHw14S8HBt9URrIskg0,4440
 warp_beacon/uploader/__init__.py,sha256=e75mOcC0vrUVjrTNMQzVUTgXGdGo4J6n8t5doOnYG5I,5616
-warp_beacon-2.5.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.5.0.dist-info/METADATA,sha256=PTJjikxncRfegZp8y6ZJAJRYYksORllUPwWPCd7YCt8,22625
-warp_beacon-2.5.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-warp_beacon-2.5.0.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.5.0.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
-warp_beacon-2.5.0.dist-info/RECORD,,
+warp_beacon-2.5.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.5.1.dist-info/METADATA,sha256=d-WLa0lelUQAJol-ELP3dSTvSFaQgjUPCOEcs6CK28Y,22625
+warp_beacon-2.5.1.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+warp_beacon-2.5.1.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.5.1.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
+warp_beacon-2.5.1.dist-info/RECORD,,