PyPI - warp-beacon - Versions diffs - 2.8.15__tar.gz → 2.8.17__tar.gz - Mend

@@ -12,24 +12,17 @@ from warp_beacon.storage import Storage
 class AsyncUploader(object):
 	__JOE_BIDEN_WAKEUP = None
-	threads = None
-	allow_loop = True
-	job_queue = None
-	callbacks = None
-	storage = None
-	in_process = None
-	loop = None
-	admin_message_callback = None
-	request_yt_auth_callback = None
 	pool_size = 1
 	def __init__(self,
 			loop: asyncio.AbstractEventLoop,
 			storage: Storage,
+			upload_wrapper: Callable,
 			admin_message_callback: Callable,
 			request_yt_auth_callback: Callable,
 			pool_size: int=min(32, os.cpu_count() + 4)
 		) -> None:
+		self.allow_loop = True
 		self.threads = []
 		self.in_process = set()
 		self.storage = storage
@@ -38,7 +31,7 @@ class AsyncUploader(object):
 		self.admin_message_callback = admin_message_callback
 		self.request_yt_auth_callback = request_yt_auth_callback
 		self.pool_size = pool_size
-		self.upload_wrapper: Callable = lambda: None
+		self.upload_wrapper = upload_wrapper
 	def __del__(self) -> None:
 		self.stop_all()

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

@@ -69,9 +69,11 @@ class Bot(object):
 		)
 		self.editor = EditMessage(self.client)
+		self.handlers = Handlers(self)
 		self.uploader = AsyncUploader(
 			storage=self.storage,
+			upload_wrapper=self.handlers.upload_wrapper,
 			admin_message_callback=self.send_text_to_admin,
 			request_yt_auth_callback=self.request_yt_auth,
 			pool_size=int(os.environ.get("UPLOAD_POOL_SIZE", default=workers_amount)),
@@ -85,7 +87,6 @@ class Bot(object):
 		)
 		self.scheduler = IGScheduler(self.downloader)
-		self.handlers = Handlers(self)
 		self.client.add_handler(MessageHandler(self.handlers.start, filters.command("start")))
 		self.client.add_handler(MessageHandler(self.handlers.help, filters.command("help")))

@@ -23,7 +23,6 @@ class Handlers(object):
 	def __init__(self, bot: "Bot") -> None:
 		self.bot = bot
 		self.storage = bot.storage
-		self.bot.uploader.uploader_wrapper = self.upload_wrapper
 	async def help(self, _: Client, message: Message) -> None:
 		"""Send a message when the command /help is issued."""

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

warp-beacon 2.8.15__tar.gz → 2.8.17__tar.gz