warp-beacon 2.3.41__py3-none-any.whl → 2.3.42__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.3.41"
+__version__ = "2.3.42"
 

warp_beacon/scraper/youtube/abstract.py

@@ -279,12 +279,13 @@ class YoutubeAbstract(ScraperAbstract):
 					logging.warning("Proxy DSN malformed!")
 		return YouTube(**yt_opts)
 	
-	def build_yt_dlp(self, timeout: int = 0) -> yt_dlp.YoutubeDL:
+	def build_yt_dlp(self, timeout: int = 60) -> yt_dlp.YoutubeDL:
 		auth_data = {}
 		with open(self.YT_SESSION_FILE % self.account_index, 'r', encoding="utf-8") as f:
 			auth_data = json.loads(f.read())
 		time_name = str(time.time()).replace('.', '_')
 		ydl_opts = {
+			'socket_timeout': timeout,
 			'outtmpl': f'{self.DOWNLOAD_DIR}/{time_name}.%(ext)s',
 			'format': 'bestvideo+bestaudio/best',
 			'merge_output_format': 'mp4',
@@ -317,6 +318,6 @@ class YoutubeAbstract(ScraperAbstract):
 			ret = self.download_hndlr(self._download_yt_dlp, job.url)
 		except NotImplementedError:
 			logging.info("yt_dlp is not supported for this submodule yet")
-			raise Unavailable("Video unvailable")
+			raise Unavailable("Сontent unvailable")
 
 		return ret

warp_beacon/scraper/youtube/music.py

@@ -1,8 +1,14 @@
+import logging
+
+import time
+import json
+
+import yt_dlp
+
 from warp_beacon.jobs.types import JobType
 from warp_beacon.scraper.youtube.abstract import YoutubeAbstract
 from warp_beacon.scraper.exceptions import NotFound, FileTooBig
 
-import logging
 
 class YoutubeMusicScraper(YoutubeAbstract):
 	YT_MAX_RETRIES_DEFAULT = 6
@@ -13,10 +19,12 @@ class YoutubeMusicScraper(YoutubeAbstract):
 	def _download(self, url: str, session: bool = True, timeout: int = 0) -> list:
 		res = []
 		thumbnail = None
-		yt = self.build_yt(url, session=session)
+		audio_id = self.get_video_id(url)
 
-		if yt:
-			thumbnail = self.download_hndlr(self.download_thumbnail, yt.video_id)
+		if audio_id:
+			thumbnail = self.download_hndlr(self.download_thumbnail, audio_id)
+
+		yt = self.build_yt(url, session=session)
 		
 		stream = yt.streams.get_audio_only()
 		
@@ -45,3 +53,45 @@ class YoutubeMusicScraper(YoutubeAbstract):
 		})
 
 		return res
+
+	def build_yt_dlp(self, timeout: int = 60) -> yt_dlp.YoutubeDL:
+		auth_data = {}
+		with open(self.YT_SESSION_FILE % self.account_index, 'r', encoding="utf-8") as f:
+			auth_data = json.loads(f.read())
+		time_name = str(time.time()).replace('.', '_')
+		ydl_opts = {
+			'socket_timeout': timeout,
+			'outtmpl': f'{self.DOWNLOAD_DIR}/{time_name}.%(ext)s',
+			'format': 'bestaudio[ext=m4a]/bestaudio/best',
+			'noplaylist': True,
+			'keepvideo': False,
+			'tv_auth': auth_data
+		}
+
+		if self.proxy:
+			proxy_dsn = self.proxy.get("dsn", "")
+			logging.info("Using proxy DSN '%s'", proxy_dsn)
+			if proxy_dsn:
+				ydl_opts["proxy"] = proxy_dsn
+
+		return yt_dlp.YoutubeDL(ydl_opts)
+
+	def _download_yt_dlp(self, url: str, timeout: int = 60) -> list:
+		res = []
+		thumbnail = None
+		video_id = self.get_video_id(url)
+		if video_id:
+			thumbnail = self.download_hndlr(self.download_thumbnail, video_id)
+		with self.build_yt_dlp(timeout) as ydl:
+			info = ydl.extract_info(url, download=True)
+			local_file = ydl.prepare_filename(info)
+			logging.debug("Temp filename: '%s'", local_file)
+			res.append({
+				"local_media_path": local_file,
+				"performer": info.get("uploader", "Unknown"),
+				"thumb": thumbnail,
+				"canonical_name": info.get("title", ''),
+				"media_type": JobType.AUDIO
+			})
+
+		return res

warp_beacon/scraper/youtube/youtube.py

@@ -73,12 +73,11 @@ class YoutubeScraper(YoutubeAbstract):
 		video_id = self.get_video_id(url)
 		if video_id:
 			thumbnail = self.download_hndlr(self.download_thumbnail, video_id)
-		with self.build_yt_dlp() as ydl:
+		with self.build_yt_dlp(timeout) as ydl:
 			info = ydl.extract_info(url, download=True)
 			local_file = ydl.prepare_filename(info)
 			logging.debug("Temp filename: '%s'", local_file)
 			res.append({
-				"socket_timeout": timeout,
 				"local_media_path": local_file,
 				"performer": info.get("uploader", "Unknown"),
 				"thumb": thumbnail,

{warp_beacon-2.3.41.dist-info → warp_beacon-2.3.42.dist-info}/METADATA

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

{warp_beacon-2.3.41.dist-info → warp_beacon-2.3.42.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=eJo4w0wy-rkbDxnK_FYM-eSEodG5CN8jr8NCff2SMpU,24
+warp_beacon/__version__.py,sha256=HdlmwXDCQDYN5w-6-W575xg8eNbdzr_LRa9GUAwlJV8,24
 warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/compress/video.py,sha256=_PDMVYCyzLYxHv1uZmmzGcG_8rjaZr7BTXsXTTy_oS4,2846
@@ -30,10 +30,10 @@ warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/instagram.py,sha256=TpIBS9S3zcLbeGax4CENVo6WP75EE6oIttc-MjWYVjs,13815
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/youtube/abstract.py,sha256=rJrcJ9g-BETkDGqbfE7gq5TxpoF2HPxOC_XdpeTJEpA,11675
-warp_beacon/scraper/youtube/music.py,sha256=6FIU1tqKvW7Osh3jg8fqli2W30Lgp_GM33S9lfOnk0s,1418
+warp_beacon/scraper/youtube/abstract.py,sha256=PC4vuKilPInD8dY_QL2xd38hEYToFf4soeS3tk_IcS8,11709
+warp_beacon/scraper/youtube/music.py,sha256=dtS5_t3TToai2Ui05kjo9ecqz94G7g0K-5fAfw5pwGQ,2800
 warp_beacon/scraper/youtube/shorts.py,sha256=k3yGF9b8HTzNE6h4VE0zsMGB6kWP-V2xiLhIY3QZXvs,1269
-warp_beacon/scraper/youtube/youtube.py,sha256=JX3hHHuWiGK81A8POcc0F1GYr1FLjQyIzrp0Mzy9_dU,2863
+warp_beacon/scraper/youtube/youtube.py,sha256=B1NBz6vv0-zIuf3MDmT2QB7eX2qO8k9orj7-4wU6MBk,2839
 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
@@ -43,9 +43,9 @@ warp_beacon/telegram/handlers.py,sha256=XXIfdV_RCj7tyZMPXchuKmGoDdweOaR08ADDaBPW
 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=E9rlZIf7xlQz6MutMOwJ8S5Vm2uheR5nv23Kv8duRQg,5427
-warp_beacon-2.3.41.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.3.41.dist-info/METADATA,sha256=S18xumQDMp35RZ49TerDM62XACK9XjEQ-d4N3mS1A_I,22626
-warp_beacon-2.3.41.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-warp_beacon-2.3.41.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.3.41.dist-info/top_level.txt,sha256=qGjHVVfyf6lTmbdSA-fQq0rHS1YVS4HoJT3rag5xgPE,1141
-warp_beacon-2.3.41.dist-info/RECORD,,
+warp_beacon-2.3.42.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.3.42.dist-info/METADATA,sha256=ZliwioNGg2vnLPNoHnkybvcqshw758tzdp51tQFAxNU,22626
+warp_beacon-2.3.42.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+warp_beacon-2.3.42.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.3.42.dist-info/top_level.txt,sha256=qGjHVVfyf6lTmbdSA-fQq0rHS1YVS4HoJT3rag5xgPE,1141
+warp_beacon-2.3.42.dist-info/RECORD,,