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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: warp_beacon
-Version: 2.0.5
+Version: 2.0.6
 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

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

{warp_beacon-2.0.5 → warp_beacon-2.0.6}/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, FileTooBig
+from warp_beacon.scraper.exceptions import NotFound, UnknownError, TimeOut, Unavailable, FileTooBig, YotubeLiveError
 from warp_beacon.mediainfo.video import VideoInfo
 from warp_beacon.mediainfo.audio import AudioInfo
 from warp_beacon.mediainfo.silencer import Silencer
@@ -115,6 +115,14 @@ class AsyncDownloader(object):
 											job_failed_msg="Unfortunately this file has exceeded the Telegram limits. A file cannot be larger than 2 gigabytes.")
 										)
 										break
+									except YotubeLiveError as e:
+										logging.warning("Youtube Live videos are not supported. Skipping.")
+										logging.exception(e)
+										self.uploader.queue_task(job.to_upload_job(
+											job_failed=True,
+											job_failed_msg="Youtube Live videos are not supported. Please wait until the live broadcast ends.")
+										)
+										break
 									except (UnknownError, Exception) as e:
 										logging.warning("UnknownError occurred!")
 										logging.exception(e)

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

@@ -28,6 +28,9 @@ class NotFound(ScraperError):
 class Unavailable(ScraperError):
 	pass
 
+class YotubeLiveError(ScraperError):
+	pass
+
 class UnknownError(ScraperError):
 	pass
 

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

@@ -0,0 +1,66 @@
+from warp_beacon.jobs.types import JobType
+from warp_beacon.scraper.youtube.abstract import YoutubeAbstract
+from warp_beacon.scraper.exceptions import YotubeLiveError, NotFound
+
+from pytubefix import YouTube
+
+import logging
+
+class YoutubeScraper(YoutubeAbstract):
+	YT_MAX_RETRIES_DEFAULT = 8
+	YT_PAUSE_BEFORE_RETRY_DEFAULT = 3
+	YT_TIMEOUT_DEFAULT = 2
+	YT_TIMEOUT_INCREMENT_DEFAULT = 60
+
+	def is_live(self, data: dict) -> bool:
+		'''
+		x.contents.twoColumnWatchNextResults.results.results.contents[0].videoPrimaryInfoRenderer.viewCount.videoViewCountRenderer.isLive
+		'''
+		try:
+			contents = data.get("contents", {}).get("twoColumnWatchNextResults", {}).get("results", {}).get("results", {}).get("contents", [])
+			for i in contents:
+				video_view_count_renderer = i.get("videoPrimaryInfoRenderer", {}).get("viewCount", {}).get("videoViewCountRenderer", {})
+				if video_view_count_renderer:
+					return video_view_count_renderer.get("isLive", False)
+		except Exception as e:
+			logging.warning("Failed to check if stream is live!")
+			logging.exception(e)
+
+		return False
+
+	def _download(self, url: str, timeout: int = 0) -> list:
+		res = []
+		thumbnail = None
+		yt = YouTube(url)
+
+		if self.is_live(yt.initial_data):
+			raise YotubeLiveError("Youtube Live is not supported")
+
+		if yt and yt.thumbnail_url:
+			thumbnail = self.download_thumbnail(yt.thumbnail_url)
+
+		stream = yt.streams.get_highest_resolution()
+
+		if not stream:
+			raise NotFound("No suitable video stream found")
+
+		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.5 → warp_beacon-2.0.6/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.0.5/warp_beacon/__version__.py

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

warp_beacon-2.0.5/warp_beacon/scraper/youtube/youtube.py

@@ -1,41 +0,0 @@
-from warp_beacon.jobs.types import JobType
-from warp_beacon.scraper.youtube.abstract import YoutubeAbstract
-
-from pytubefix import YouTube
-
-import logging
-
-class YoutubeScraper(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)
-		if yt and yt.thumbnail_url:
-			thumbnail = self.download_thumbnail(yt.thumbnail_url)
-		stream = yt.streams.get_highest_resolution()
-		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)