warp-beacon 2.7.30__tar.gz → 2.7.31__tar.gz

{warp_beacon-2.7.30/warp_beacon.egg-info → warp_beacon-2.7.31}/PKG-INFO

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

warp_beacon-2.7.31/warp_beacon/__version__.py

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

{warp_beacon-2.7.30 → warp_beacon-2.7.31}/warp_beacon/scraper/__init__.py

@@ -79,8 +79,6 @@ class AsyncDownloader(object):
 
 	def try_next_account(self, selector: AccountSelector, job: DownloadJob, report_error: str = None) -> None:
 		logging.warning("Switching account!")
-		if job.account_switches > self.acc_selector.count_service_accounts(job.job_origin):
-			raise AllAccountsFailed("All config accounts failed!", job=job, reason=report_error)
 		if report_error:
 			selector.bump_acc_fail(report_error)
 		selector.next()
@@ -112,6 +110,9 @@ class AsyncDownloader(object):
 								replay=True
 							))
 							continue
+		
+						if job.account_switches > self.acc_selector.count_service_accounts(job.job_origin):
+							raise AllAccountsFailed("All config accounts failed!", job=job)
 						if not job.in_process:
 							if job.job_postponed_until > 0:
 								if (job.job_postponed_until - time.time()) > 0:
@@ -403,7 +404,6 @@ class AsyncDownloader(object):
 						else:
 							logging.info("Job already in work in parallel worker. Redirecting job to upload worker.")
 							self.uploader.queue_task(job.to_upload_job())
-			
 					except AllAccountsFailed as e:
 						self.send_message_to_admin(
 							f"Task <code>{job.job_id}</code> failed. URL: '{job.url}'. Reason: '<b>AllAccountsFailed</b>'."

{warp_beacon-2.7.30 → warp_beacon-2.7.31}/warp_beacon/scraper/fail_handler.py

@@ -28,13 +28,14 @@ class FailHandler(object):
 			logging.exception(e)
 		return db_id
 	
-	def get_failed_jobs(self) -> list:
+	def get_failed_jobs(self, clean: bool = True) -> list:
 		ret = []
 		try:
 			cursor = self.db.find()
 			for document in cursor:
 				ret.append(pickle.loads(document["job_data"]))
-			self.db.delete_many({})
+			if clean:
+				self.db.delete_many({})
 		except Exception as e:
 			logging.error("Failed to get failed jobs!")
 			logging.exception(e)

{warp_beacon-2.7.30 → warp_beacon-2.7.31}/warp_beacon/telegram/handlers.py

@@ -1,6 +1,7 @@
-import os
+import logging
+
 from pyrogram import Client
-from pyrogram.types import Message, CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup
+from pyrogram.types import Message, CallbackQuery#, InlineKeyboardButton, InlineKeyboardMarkup
 from pyrogram.enums import ChatType, ParseMode
 from pyrogram.types import BotCommand
 
@@ -13,8 +14,8 @@ from warp_beacon.jobs.upload_job import UploadJob
 from warp_beacon.jobs import Origin
 from warp_beacon.jobs.types import JobType
 from warp_beacon.scraper.link_resolver import LinkResolver
-
-import logging
+from warp_beacon.scraper.fail_handler import FailHandler
+from warp_beacon.storage.mongo import DBClient
 
 class Handlers(object):
 	storage = None
@@ -24,6 +25,12 @@ class Handlers(object):
 	def __init__(self, bot: "Bot") -> None:
 		self.bot = bot
 		self.storage = bot.storage
+		# add uploader callbacks to handle service restart
+		for job in FailHandler(DBClient()).get_failed_jobs(clean=False):
+			self.bot.uploader.add_callback(
+				job.placeholder_message_id,
+				self.upload_wrapper
+			)
 
 	async def help(self, _: Client, message: Message) -> None:
 		"""Send a message when the command /help is issued."""

{warp_beacon-2.7.30 → warp_beacon-2.7.31}/warp_beacon/uploader/__init__.py

@@ -50,10 +50,11 @@ class AsyncUploader(object):
 			self.threads.append(thread)
 
 	def add_callback(self, message_id: int, callback: Callable) -> None:
-		async def callback_wrap(*args, **kwargs) -> None:
-			await callback(*args, **kwargs)
-			#self.remove_callback(message_id)
-		self.callbacks[message_id] = {"callback": callback_wrap}
+		if message_id not in self.callbacks:
+			async def callback_wrap(*args, **kwargs) -> None:
+				await callback(*args, **kwargs)
+				#self.remove_callback(message_id)
+			self.callbacks[message_id] = {"callback": callback_wrap}
 
 	def remove_callback(self, message_id: int) -> None:
 		if message_id in self.callbacks:

{warp_beacon-2.7.30 → warp_beacon-2.7.31/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.7.30/warp_beacon/__version__.py

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