warp-beacon 2.3.35__tar.gz → 2.3.37__tar.gz

{warp_beacon-2.3.35/warp_beacon.egg-info → warp_beacon-2.3.37}/PKG-INFO

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

warp_beacon-2.3.37/warp_beacon/__version__.py

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

{warp_beacon-2.3.35 → warp_beacon-2.3.37}/warp_beacon/scraper/youtube/abstract.py

@@ -1,4 +1,5 @@
-import os, io
+import os
+import io
 import pathlib
 import time
 import math
@@ -8,8 +9,8 @@ import ssl
 from typing import Callable, Union, Optional
 import json
 import urllib
-import requests
 import http.client
+import requests
 from PIL import Image
 import numpy as np
 
@@ -181,8 +182,8 @@ class YoutubeAbstract(ScraperAbstract):
 
 		return None
 
-	def download_hndlr(self, func: Callable, *args: tuple[Union[str, int, dict, tuple]], **kwargs: dict[Union[str, int, dict, tuple]]) -> Union[str, dict, io.BytesIO]:
-		ret_val = ''
+	def download_hndlr(self, func: Callable, *args: tuple[Union[str, int, dict, tuple, bool]], **kwargs: dict[Union[str, int, dict, tuple, bool]]) -> Optional[Union[list, dict, str, io.BytesIO]]:
+		ret_val = None
 		max_retries = int(os.environ.get("YT_MAX_RETRIES", default=self.YT_MAX_RETRIES_DEFAULT))
 		pause_secs = int(os.environ.get("YT_PAUSE_BEFORE_RETRY", default=self.YT_PAUSE_BEFORE_RETRY_DEFAULT))
 		timeout = int(os.environ.get("YT_TIMEOUT", default=self.YT_TIMEOUT_DEFAULT))
@@ -224,27 +225,40 @@ class YoutubeAbstract(ScraperAbstract):
 		pass
 		#logging.info("bytes: %d, bytes remaining: %d", chunk, bytes_remaining)
 
-	def build_yt(self, url: str) -> YouTube:
-		InnerTube.send_message_to_admin_func = self.send_message_to_admin_func
-		InnerTube.auth_event = self.auth_event
-		InnerTube.wb_account = self.account
-		InnerTube.fetch_bearer_token = patched_fetch_bearer_token
+	def build_yt(self, url: str, session: bool = True) -> YouTube:
+		if session:
+			InnerTube.send_message_to_admin_func = self.send_message_to_admin_func
+			InnerTube.auth_event = self.auth_event
+			InnerTube.wb_account = self.account
+			InnerTube.fetch_bearer_token = patched_fetch_bearer_token
 		_default_clients["ANDROID"]["innertube_context"]["context"]["client"]["clientVersion"] = "19.08.35"
 		_default_clients["ANDROID_MUSIC"] = _default_clients["ANDROID"]
 		yt_opts = {"url": url, "on_progress_callback": self.yt_on_progress}
-		yt_opts["client"] = "TV_EMBED"
-		yt_opts["use_oauth"] = True
-		yt_opts["allow_oauth_cache"] = True
-		yt_opts["token_file"] = self.YT_SESSION_FILE % self.account_index
+		if session:
+			yt_opts["client"] = "TV_EMBED"
+			yt_opts["use_oauth"] = True
+			yt_opts["allow_oauth_cache"] = True
+			yt_opts["token_file"] = self.YT_SESSION_FILE % self.account_index
 		if self.proxy:
 			proxy_dsn = self.proxy.get("dsn", "")
 			if proxy_dsn:
 				logging.info("Using proxy DSN '%s'", proxy_dsn)
-				yt_opts["proxies"] = {"http": proxy_dsn, "https": proxy_dsn}
+				if "https://" in proxy_dsn:
+					yt_opts["proxies"] = {"https": proxy_dsn}
+				elif "http://" in proxy_dsn:
+					yt_opts["proxies"] = {"http": proxy_dsn}
+				else:
+					logging.warning("Proxy DSN malformed!")
 		return YouTube(**yt_opts)
 	
-	def _download(self, url: str) -> list:
-		raise NotImplementedError("Implement _download method")
+	def _download(self, _: str) -> list:
+		raise NotImplementedError("You should to implement _download method")
 
 	def download(self, job: DownloadJob) -> list:
-		return self.download_hndlr(self._download, job.url)
+		try:
+			return self.download_hndlr(self._download, job.url, session=False)
+		except Unavailable:
+			logging.warning("Failed sessionless download attempt. Trying with session.")
+			time.sleep(2)
+		
+		return self.download_hndlr(self._download, job.url, session=True)

{warp_beacon-2.3.35 → warp_beacon-2.3.37}/warp_beacon/scraper/youtube/youtube.py

@@ -28,11 +28,11 @@ class YoutubeScraper(YoutubeAbstract):
 
 		return False
 
-	def _download(self, url: str, timeout: int = 0) -> list:
+	def _download(self, url: str, session: bool = True, timeout: int = 0) -> list:
 		res = []
 		try:
 			thumbnail = None
-			yt = self.build_yt(url)
+			yt = self.build_yt(url, session=session)
 
 			if self.is_live(yt.initial_data):
 				raise YoutubeLiveError("Youtube Live is not supported")

{warp_beacon-2.3.35 → warp_beacon-2.3.37/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.3.35/warp_beacon/__version__.py

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