warp-beacon 2.3.41__tar.gz → 2.3.43__tar.gz

{warp_beacon-2.3.41/warp_beacon.egg-info → warp_beacon-2.3.43}/PKG-INFO

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

warp_beacon-2.3.43/warp_beacon/__version__.py

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

{warp_beacon-2.3.41 → warp_beacon-2.3.43}/warp_beacon/scraper/youtube/abstract.py

@@ -219,10 +219,10 @@ class YoutubeAbstract(ScraperAbstract):
 					requests.RequestException,
 					urllib.error.URLError,
 					urllib.error.HTTPError) as e:
-				if hasattr(e, "code") and int(e.code) == 403:
+				if hasattr(e, "code") and (int(e.code) == 403 or int(e.code) == 400):
 					raise Unavailable(extract_exception_message(e))
-				logging.warning("Youtube read timeout! Retrying in %d seconds ...", pause_secs)
-				logging.info("Your `YT_MAX_RETRIES` values is %d", max_retries)
+				logging.warning("Youtube read timeout! Retrying in '%d' seconds ...", pause_secs)
+				logging.info("Your `YT_MAX_RETRIES` values is '%d'", max_retries)
 				logging.exception(extract_exception_message(e))
 				if max_retries <= retries:
 					self.remove_tmp_files()
@@ -279,13 +279,14 @@ 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 = {
-			'outtmpl': f'{self.DOWNLOAD_DIR}/{time_name}.%(ext)s',
+			'socket_timeout': timeout,
+			'outtmpl': f'{self.DOWNLOAD_DIR}/yt_download_{time_name}.%(ext)s',
 			'format': 'bestvideo+bestaudio/best',
 			'merge_output_format': 'mp4',
 			'noplaylist': True,
@@ -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-2.3.43/warp_beacon/scraper/youtube/music.py

@@ -0,0 +1,97 @@
+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
+
+
+class YoutubeMusicScraper(YoutubeAbstract):
+	YT_MAX_RETRIES_DEFAULT = 3
+	YT_PAUSE_BEFORE_RETRY_DEFAULT = 3
+	YT_TIMEOUT_DEFAULT = 2
+	YT_TIMEOUT_INCREMENT_DEFAULT = 60
+
+	def _download(self, url: str, session: bool = True, timeout: int = 0) -> list:
+		res = []
+		thumbnail = None
+		audio_id = self.get_video_id(url)
+
+		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()
+		
+		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_'
+		)
+		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 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}/yt_download_{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-2.3.41 → warp_beacon-2.3.43}/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 → warp_beacon-2.3.43/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.3.41/warp_beacon/__version__.py

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

warp_beacon-2.3.41/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 warp_beacon.scraper.exceptions import NotFound, FileTooBig
-
-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, session: bool = True, timeout: int = 0) -> list:
-		res = []
-		thumbnail = None
-		yt = self.build_yt(url, session=session)
-
-		if yt:
-			thumbnail = self.download_hndlr(self.download_thumbnail, yt.video_id)
-		
-		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_'
-		)
-		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