warp-beacon 2.5.9__py3-none-any.whl → 2.6.1__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.5.9"
+__version__ = "2.6.1"
 

warp_beacon/scraper/__init__.py

@@ -321,7 +321,10 @@ class AsyncDownloader(object):
 											)
 											ffmpeg = VideoCompress(file_path=item["local_media_path"])
 											new_filepath = ffmpeg.generate_filepath(base_filepath=item["local_media_path"])
-											if ffmpeg.compress_to(new_filepath, target_size=2000 * 1000):
+											target_size = 2000 * 1000
+											if os.environ.get("TG_PREMIUM", default="false") == "true":
+												target_size = 4000 * 1000
+											if ffmpeg.compress_to(new_filepath, target_size=target_size):
 												logging.info("Successfully compressed file '%s'", new_filepath)
 												os.unlink(item["local_media_path"])
 												item["local_media_path"] = new_filepath

warp_beacon/telegram/bot.py

@@ -1,5 +1,6 @@
 import os
 import signal
+import asyncio
 from typing import Optional, Union
 
 import logging
@@ -29,6 +30,7 @@ from warp_beacon.telegram.caption_shortener import CaptionShortner
 from warp_beacon.scheduler.scheduler import IGScheduler
 
 class Bot(object):
+	should_exit = None
 	storage = None
 	uploader = None
 	downloader = None
@@ -37,6 +39,7 @@ class Bot(object):
 	handlers = None
 	placeholder = None
 	scheduler = None
+	me = None
 
 	def __init__(self, tg_bot_name: str, tg_token: str, tg_api_id: str, tg_api_hash: str) -> None:
 		# Enable logging
@@ -46,10 +49,12 @@ class Bot(object):
 
 		logging.getLogger("pyrogram").setLevel(logging.ERROR)
 
+		logging.info("Starting Warp Beacon version '%s' ...", __version__)
+
 		db_connect = DBClient()
 		self.storage = Storage(db_connect)
 
-		logging.info("Starting Warp Beacon version '%s' ...", __version__)
+		self.should_exit = asyncio.Event()
 
 		workers_amount = min(32, os.cpu_count() + 4)
 
@@ -64,14 +69,6 @@ class Bot(object):
 			workers=int(os.environ.get("TG_WORKERS_POOL_SIZE", default=workers_amount))
 		)
 
-		this = self
-		def __terminator() -> None:
-			this.stop()
-
-		stop_signals = (signal.SIGINT, signal.SIGTERM, signal.SIGABRT)
-		for sig in stop_signals:
-			self.client.loop.add_signal_handler(sig, __terminator)
-
 		self.uploader = AsyncUploader(
 			storage=self.storage,
 			admin_message_callback=self.send_text_to_admin,
@@ -102,20 +99,34 @@ class Bot(object):
 
 		self.placeholder = PlaceholderMessage(self)
 
-		self.client.run()
-
 	def __del__(self) -> None:
 		self.stop()
-		logging.info("Warp Beacon terminated.")
 
 	def start(self) -> None:
-		self.client.run()
+		self.client.run(self.run)
+
+	async def run(self) -> None:
+		loop = asyncio.get_running_loop()
+		for sig in (signal.SIGINT, signal.SIGTERM, signal.SIGABRT):
+			loop.add_signal_handler(sig, self.should_exit.set)
+		async with self.client:
+			self.me = await self.client.get_me()
+			self.client.me = self.me
+			if self.me.is_premium:
+				os.environ["TG_PREMIUM"] = "true"
+			logging.info("Warp Beacon version '%s' started", __version__)
+			await self.should_exit.wait()
+
+		self.stop()
+		logging.info("Warp Beacon version '%s' terminated.", __version__)
 
 	def stop(self) -> None:
 		logging.info("Warp Beacon is terminating. This may take a while ...")
 		self.scheduler.stop()
 		self.downloader.stop_all()
 		self.uploader.stop_all()
+		if self.client and self.client.is_initialized and self.client.is_connected:
+			asyncio.run_coroutine_threadsafe(self.client.stop(), self.client.loop)
 
 	async def send_text(self, chat_id: int, text: str, reply_id: int = None) -> int:
 		try:

{warp_beacon-2.5.9.dist-info → warp_beacon-2.6.1.dist-info}/METADATA

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

{warp_beacon-2.5.9.dist-info → warp_beacon-2.6.1.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=aLBFFfW98WGxaYXkMjtjHNDxfmIla9jgTt-t8o0GNlU,23
+warp_beacon/__version__.py,sha256=d_TYaIGxsHm_zjgukK3Xh_KuqWcCQOD5FTAT-8Ikybs,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
@@ -22,7 +22,7 @@ warp_beacon/mediainfo/video.py,sha256=UBZrhTN5IDI-aYu6tsJEILo9nFkjHhkldGVFmvV7tE
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scheduler/instagram_human.py,sha256=xbh37egaTiSOasIMibpF0n9xwmWbq5ktGyNglyZQpvc,5673
 warp_beacon/scheduler/scheduler.py,sha256=z1EokmWTdo8GE3PfqFl2JFypqVNtp2qtSBwBykH1dNg,4727
-warp_beacon/scraper/__init__.py,sha256=j2MKXnyAKcB_0HlOn83UGUAEPbkdMbC5BnXVOPox1yk,18454
+warp_beacon/scraper/__init__.py,sha256=aL3YqIvOaQvrfTTQLP5srgyfpk19xYAH6oot_BT8tv0,18600
 warp_beacon/scraper/abstract.py,sha256=CiOyKCxVYWhPnOUpLAVIRNuHBftN6gmxqATdhjzkaS4,2852
 warp_beacon/scraper/account_selector.py,sha256=mYNxAyAJj4ie9wMMkfb7ONjvAicS8xPEfE3iIe4gCog,6965
 warp_beacon/scraper/exceptions.py,sha256=EKwoF0oH2xZWbNU-v8DOaWK5skKwa3s1yTIBdlcfMpc,1452
@@ -38,15 +38,15 @@ warp_beacon/scraper/youtube/youtube.py,sha256=ctHPmTfNO-5dcYeh1K4_PkB6MQRVgByr4E
 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
-warp_beacon/telegram/bot.py,sha256=yLgmX3HKoy_A8RXU1h-7VTDih_gOA0UY2obzlVK7OdA,18222
+warp_beacon/telegram/bot.py,sha256=fdod7JsRGgB2jIqkLTSEwuriy7BICW4MSW6IXZfUMak,18714
 warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJbND_dX5Fhwkv0,1549
 warp_beacon/telegram/handlers.py,sha256=uvR6TPHSqdSxigp3wR-ewiE6t3TvVcbVLVcYGwkgD2s,9559
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
 warp_beacon/telegram/utils.py,sha256=9uebX53G16mV7ER7WgfdWBLFHHw14S8HBt9URrIskg0,4440
 warp_beacon/uploader/__init__.py,sha256=e75mOcC0vrUVjrTNMQzVUTgXGdGo4J6n8t5doOnYG5I,5616
-warp_beacon-2.5.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.5.9.dist-info/METADATA,sha256=j3S6Ygz1Sb273IriEP29jMwCv_IovdhYhTy8ZZtCKKo,22625
-warp_beacon-2.5.9.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-warp_beacon-2.5.9.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.5.9.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
-warp_beacon-2.5.9.dist-info/RECORD,,
+warp_beacon-2.6.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.1.dist-info/METADATA,sha256=yEC4IoY5EIJrfHw3gSSrknEeJT5dJ7m5WTD2-W6zyGA,22625
+warp_beacon-2.6.1.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+warp_beacon-2.6.1.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.1.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
+warp_beacon-2.6.1.dist-info/RECORD,,