warp-beacon 2.6.7__py3-none-any.whl → 2.6.9__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.6.7"
+__version__ = "2.6.9"
 

warp_beacon/scraper/youtube/abstract.py

@@ -143,7 +143,7 @@ class YoutubeAbstract(ScraperAbstract):
 			try:
 				url = i.format(VIDEO_ID=video_id)
 				logging.info("Youtube thumbnail url '%s'", url)
-				with requests.get(url, timeout=(timeout, timeout)) as response:
+				with requests.get(url, timeout=(timeout, timeout), proxies=self.build_proxies(self.proxy.get("dsn", {}))) as response:
 					if response.status_code == 200:
 						image = Image.open(io.BytesIO(response.content))
 						ratio = self.aspect_ratio(image.size)
@@ -228,6 +228,21 @@ class YoutubeAbstract(ScraperAbstract):
 		pass
 		#logging.info("bytes: %d, bytes remaining: %d", chunk, bytes_remaining)
 
+	def build_proxies(self, proxy_dsn: str) -> dict:
+		if not proxy_dsn:
+			logging.warning("Empty DSN!")
+			return {}
+		proxy = {}
+		if proxy_dsn:
+			if "https://" in proxy_dsn:
+				proxy["https"] = proxy_dsn
+			elif "http://" in proxy_dsn:
+				proxy["http"] = proxy_dsn
+			else:
+				logging.warning("Proxy DSN malformed!")
+
+		return proxy
+
 	def build_yt(self, url: str, session: bool = True) -> YouTube:
 		_default_clients["ANDROID"]["innertube_context"]["context"]["client"]["clientVersion"] = "19.08.35"
 		_default_clients["ANDROID_MUSIC"] = _default_clients["ANDROID"]
@@ -253,12 +268,7 @@ class YoutubeAbstract(ScraperAbstract):
 			proxy_dsn = self.proxy.get("dsn", "")
 			logging.info("Using proxy DSN '%s'", proxy_dsn)
 			if 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!")
+				yt_opts["proxies"] = self.build_proxies(proxy_dsn)
 		return YouTube(**yt_opts)
 	
 	def build_yt_dlp(self, timeout: int = 60) -> yt_dlp.YoutubeDL:

{warp_beacon-2.6.7.dist-info → warp_beacon-2.6.9.dist-info}/METADATA

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

{warp_beacon-2.6.7.dist-info → warp_beacon-2.6.9.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=3O0Ft2ww0V89lSMfPFzcMeL9h_hTIKRTaAJtrfOb5VU,23
+warp_beacon/__version__.py,sha256=_fL7hqsFpwtUso7ICu13IcK4s6swv1EFH-5JPOsOPhQ,23
 warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -32,7 +32,7 @@ warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 warp_beacon/scraper/instagram/captcha.py,sha256=9UYziuqB3Tsat_ET6ex-cnZDbi6yCnsXHSpmE8MuUHk,4651
 warp_beacon/scraper/instagram/instagram.py,sha256=d3XSPkIYP5V1i7eTH0ZygOoN5f3GZRZVTNoLU7KC2JI,14641
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/youtube/abstract.py,sha256=HN6xpxxDo-LUYdtKeqNC0y07hnLi12ov7PQwnJ9aBFw,12199
+warp_beacon/scraper/youtube/abstract.py,sha256=YuxGHgOtCp9gUHEO6wsHRtBO9cFz5A8RIW8sI0Kh5GY,12435
 warp_beacon/scraper/youtube/music.py,sha256=5AeSBQyUgVCJT2hoBCV2WvlyuV9US09SYJhmBG_P9F8,2755
 warp_beacon/scraper/youtube/shorts.py,sha256=1GtoYUlxAwcgSQcn80u5ehNJytH5AN5dPOicmX-XD8E,1705
 warp_beacon/scraper/youtube/youtube.py,sha256=ZjLv14l-ZeuJQXbZ88GbiXB276SmiGU3i8gUh6b-s60,5983
@@ -45,9 +45,9 @@ warp_beacon/telegram/handlers.py,sha256=uvR6TPHSqdSxigp3wR-ewiE6t3TvVcbVLVcYGwkg
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
 warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
 warp_beacon/uploader/__init__.py,sha256=e75mOcC0vrUVjrTNMQzVUTgXGdGo4J6n8t5doOnYG5I,5616
-warp_beacon-2.6.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.6.7.dist-info/METADATA,sha256=9PhKeNYwVQJa27gxlMLnPAX0kqoSeHiatl59FFAZ8Bs,22705
-warp_beacon-2.6.7.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-warp_beacon-2.6.7.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.6.7.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
-warp_beacon-2.6.7.dist-info/RECORD,,
+warp_beacon-2.6.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.9.dist-info/METADATA,sha256=6fxcEJIjqOn8oHEMOxRsq2fJ34Vgzp43wQg5_vqrFVI,22705
+warp_beacon-2.6.9.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+warp_beacon-2.6.9.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.9.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
+warp_beacon-2.6.9.dist-info/RECORD,,