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

warp_beacon/__version__.py

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

warp_beacon/scraper/youtube/abstract.py

@@ -143,7 +143,12 @@ 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), proxies=self.build_proxies(self.proxy.get("dsn", {}))) as response:
+				proxies = None
+				if self.proxy:
+					dsn = self.proxy.get("dsn", None)
+					if dsn:
+						proxies = self.build_proxies(dsn)
+				with requests.get(url, timeout=(timeout, timeout), proxies=proxies) as response:
 					if response.status_code == 200:
 						image = Image.open(io.BytesIO(response.content))
 						ratio = self.aspect_ratio(image.size)

warp_beacon/scraper/youtube/youtube.py

@@ -78,6 +78,9 @@ class YoutubeScraper(YoutubeAbstract):
 			
 			video_stream = yt.streams.filter(adaptive=True, file_extension='mp4', only_video=True).order_by('resolution').desc().first()
 			audio_stream = yt.streams.filter(adaptive=True, file_extension='mp4', only_audio=True).order_by('abr').desc().first()
+			size_in_bytes = video_stream.filesize + audio_stream.filesize
+			if size_in_bytes > 2147483648: # 2 GiB
+				video_stream = yt.streams.filter(adaptive=True, file_extension='mp4', only_video=True, res='720p').order_by('resolution').desc().first()
 
 			local_video_file = video_stream.download(
 				output_path=self.DOWNLOAD_DIR,
@@ -161,7 +164,30 @@ class YoutubeScraper(YoutubeAbstract):
 	def _download_yt_dlp(self, url: str, thumbnail: Optional[io.BytesIO] = None, timeout: int = 60) -> list:
 		res = []
 		with self.build_yt_dlp(timeout) as ydl:
-			info = ydl.extract_info(url, download=True)
+			info = ydl.extract_info(url, download=False)
+			formats = info.get('formats', [])
+
+			dl_format = {}
+			for f in sorted(formats, key=lambda x: (x.get('height') or 0), reverse=True):
+				if f.get('vcodec') != 'none' and f.get('acodec') != 'none' and f.get('ext') == 'mp4':
+					dl_format = f
+					break
+		
+			filesize = dl_format.get('filesize', 0) or dl_format.get('filesize_approx', 0)
+			if filesize:
+				if filesize > 2147483648: # 2 GiB
+					logging.warning("Max resolution exceeding TG limits")
+					for f in sorted(formats, key=lambda x: (x.get('height') or 0), reverse=True):
+						if (f.get('vcodec') != 'none' and f.get('acodec') != 'none'
+								and (f.get('height') or 0) <= 720 and f.get('ext') == 'mp4'):
+							alt_filesize = f.get('filesize', 0) or f.get('filesize_approx', 0)
+							if alt_filesize: #and alt_filesize <= max_size_bytes:
+								dl_format = f
+								break
+			else:
+				logging.warning("Unknown filesize!")
+			ydl.params['format'] = dl_format['format_id']
+			ydl.download([url])
 			local_file = ydl.prepare_filename(info)
 			logging.debug("Temp filename: '%s'", local_file)
 			res.append({
@@ -172,4 +198,4 @@ class YoutubeScraper(YoutubeAbstract):
 				"media_type": JobType.VIDEO
 			})
 
-		return res
+		return res

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

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

{warp_beacon-2.6.9.dist-info → warp_beacon-2.6.11.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=_fL7hqsFpwtUso7ICu13IcK4s6swv1EFH-5JPOsOPhQ,23
+warp_beacon/__version__.py,sha256=C7jtLSU2gzphprs_5clHuXcYaQR2PmQ8amiD-k1a3zw,24
 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,10 +32,10 @@ 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=YuxGHgOtCp9gUHEO6wsHRtBO9cFz5A8RIW8sI0Kh5GY,12435
+warp_beacon/scraper/youtube/abstract.py,sha256=QiifUOEhMMIobmBMyqgReNZ-m0sjhzhM9S0hPgiBk1s,12527
 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
+warp_beacon/scraper/youtube/youtube.py,sha256=-Ev8uhEVk8jDuqcy5_4f24JqoxBEW47wBaZVtCaKfdk,7200
 warp_beacon/storage/__init__.py,sha256=0Vajd0oITKJfu2vmNx5uQSt3-L6vwIvUYWJo8HZCjco,3398
 warp_beacon/storage/mongo.py,sha256=qC4ZiO8XXvPnP0rJwz4CJx42pqFsyAjCiW10W5QdT6E,527
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.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,,
+warp_beacon-2.6.11.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.11.dist-info/METADATA,sha256=CJkug-SA9giMvoT7f3JBxdUczQPixtWRQBZSog5_VgY,22706
+warp_beacon-2.6.11.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+warp_beacon-2.6.11.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.11.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
+warp_beacon-2.6.11.dist-info/RECORD,,