warp-beacon 2.3.49__tar.gz → 2.3.51__tar.gz

{warp_beacon-2.3.49/warp_beacon.egg-info → warp_beacon-2.3.51}/PKG-INFO

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

warp_beacon-2.3.51/warp_beacon/__version__.py

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

{warp_beacon-2.3.49 → warp_beacon-2.3.51}/warp_beacon/scraper/instagram/instagram.py

@@ -18,7 +18,7 @@ from instagrapi.types import Media
 from instagrapi import Client
 from instagrapi.mixins.challenge import ChallengeChoice
 from instagrapi.exceptions import LoginRequired, PleaseWaitFewMinutes, MediaNotFound, ClientNotFoundError, UserNotFound, ChallengeRequired, \
-	ChallengeSelfieCaptcha, ChallengeUnknownStep, AssertionError, UnknownError as IGUnknownError
+	ChallengeSelfieCaptcha, ChallengeUnknownStep, UnknownError as IGUnknownError
 
 from warp_beacon.scraper.exceptions import NotFound, UnknownError, TimeOut, IGRateLimitOccurred, CaptchaIssue, extract_exception_message
 from warp_beacon.scraper.abstract import ScraperAbstract

{warp_beacon-2.3.49 → warp_beacon-2.3.51}/warp_beacon/scraper/youtube/abstract.py

@@ -212,14 +212,15 @@ class YoutubeAbstract(ScraperAbstract):
 				# do noting, not interested
 				pass
 			#except http.client.IncompleteRead as e:
+			except KeyError:
+				raise Unavailable("Library failed")
 			except (socket.timeout,
 					ssl.SSLError,
 					http.client.IncompleteRead,
 					http.client.HTTPException,
 					requests.RequestException,
 					urllib.error.URLError,
-					urllib.error.HTTPError,
-					KeyError) as e:
+					urllib.error.HTTPError) as e:
 				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)

{warp_beacon-2.3.49 → warp_beacon-2.3.51}/warp_beacon/scraper/youtube/shorts.py

@@ -42,4 +42,24 @@ class YoutubeShortsScraper(YoutubeAbstract):
 			"media_type": JobType.VIDEO
 		})
 
+		return res
+
+	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.VIDEO
+			})
+
 		return res

{warp_beacon-2.3.49 → warp_beacon-2.3.51/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.3.49/warp_beacon/__version__.py

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