warp-beacon 2.6.10__tar.gz → 2.6.12__tar.gz

{warp_beacon-2.6.10/warp_beacon.egg-info → warp_beacon-2.6.12}/PKG-INFO

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

warp_beacon-2.6.12/warp_beacon/__version__.py

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

{warp_beacon-2.6.10 → warp_beacon-2.6.12}/warp_beacon/jobs/download_job.py

@@ -1,16 +1,14 @@
-from typing import TypedDict
+#from typing import TypedDict
 from typing_extensions import Unpack
 
 from warp_beacon.jobs.upload_job import UploadJob
 from warp_beacon.jobs.abstract import AbstractJob, JobSettings
 
-import logging
+#import logging
 
 class DownloadJob(AbstractJob):
 	def __init__(self, **kwargs: Unpack[JobSettings]) -> None:
 		super(DownloadJob, self).__init__(**kwargs)
-	def __del__(self) -> None:
-		pass
 
 	@staticmethod
 	def build(**kwargs: Unpack[JobSettings]) -> "DownloadJob":
@@ -20,7 +18,7 @@ class DownloadJob(AbstractJob):
 		d = self.to_dict()
 		d.update(kwargs)
 		if "media_collection" in d:
-			for index, chunk in enumerate(d["media_collection"]):
-				for k, v in enumerate(d["media_collection"][index]):
+			for index, _ in enumerate(d["media_collection"]):
+				for k, _ in enumerate(d["media_collection"][index]):
 					d["media_collection"][index][k] = UploadJob.build(**d["media_collection"][index][k])
 		return UploadJob.build(**d)

{warp_beacon-2.6.10 → warp_beacon-2.6.12}/warp_beacon/scraper/__init__.py

@@ -29,17 +29,20 @@ PROXY_FILE = os.environ.get("PROXY_FILE", default="/var/warp_beacon/proxies.json
 class AsyncDownloader(object):
 	TG_FILE_LIMIT = 2147483648 # 2 GiB
 	__JOE_BIDEN_WAKEUP = None
-	workers = []
+	workers = None
 	allow_loop = None
-	job_queue = multiprocessing.Queue()
+	job_queue = None
 	uploader = None
 	workers_count = 0
-	auth_event = multiprocessing.Event()
+	auth_event = None
 	manager = None
 	acc_selector = None
 	scheduler = None
 
 	def __init__(self, uploader: AsyncUploader, workers_count: int) -> None:
+		self.workers = []
+		self.job_queue = multiprocessing.Queue()
+		self.auth_event = multiprocessing.Event()
 		self.manager = multiprocessing.Manager()
 		self.allow_loop = self.manager.Value('i', 1)
 		self.acc_selector = AccountSelector(self.manager, ACC_FILE, PROXY_FILE)

{warp_beacon-2.6.10 → warp_beacon-2.6.12}/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', 0) 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', 0) or 0), reverse=True):
+						if (f.get('vcodec', '') != 'none' and f.get('acodec', '') != 'none'
+								and (f.get('height', 0) 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.10 → warp_beacon-2.6.12}/warp_beacon/warp_beacon.py

@@ -2,13 +2,17 @@ import os
 
 from warp_beacon.telegram.bot import Bot
 
-import logging
+#import logging
 
 def main() -> None:
+	if __name__ == "__main__":
+		run()
+
+def run() -> None:
 	bot = Bot(
 		tg_bot_name=os.environ.get("TG_BOT_NAME", default=None),
 		tg_token=os.environ.get("TG_TOKEN", default=None),
 		tg_api_id=os.environ.get("TG_API_ID", default=None),
 		tg_api_hash=os.environ.get("TG_API_HASH", default=None)
 	)
-	bot.start()
+	bot.start()

{warp_beacon-2.6.10 → warp_beacon-2.6.12/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.10/warp_beacon/__version__.py

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