warp-beacon 2.7.29__py3-none-any.whl → 2.7.31__py3-none-any.whl

warp_beacon/__version__.py

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

warp_beacon/scheduler/instagram_human.py

@@ -75,16 +75,23 @@ class InstagramHuman(object):
 			if not raw_tray:
 				logging.info("No stories tray available.")
 				return
-			logging.info("raw_tray: %s", str(raw_tray))
+			#logging.info("raw_tray: %s", str(raw_tray))
 			tray = raw_tray.get("tray", [])
-			for user_story in tray:
-				user = user_story["user"]
-				user_id = user["pk"]
-				_stories = self.scrapler.download_hndlr(self.scrapler.cl.user_stories, user_id)
-				self.operations_count += 1
-				if _stories:
-					stories.extend(_stories)
-				self.random_pause()
+			if tray:
+				reels_tray = []
+				target_len = random.randint(1, 5)
+				for el in tray[:target_len]:
+					user = el["user"]
+					user_id = user["pk"]
+					if el.get("seen", 0) == 0:
+						reels_tray.append({"user_id": user_id})
+
+				for el in reels_tray:
+					_stories = self.scrapler.download_hndlr(self.scrapler.cl.user_stories, el["user_id"])
+					self.operations_count += 1
+					if _stories:
+						stories.extend(_stories)
+					self.random_pause()
 
 			if not stories:
 				return

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/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/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/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.29.dist-info → warp_beacon-2.7.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warp_beacon
-Version: 2.7.29
+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.29.dist-info → warp_beacon-2.7.31.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=_LmRNGKODzASrCmjGEfNEDs3DOuePsYcW-NkrlBYlMQ,24
+warp_beacon/__version__.py,sha256=1yyk4aKxhgTdmz7ZQA7_49PVJ9hCdQw1x0iVp7PFoDA,24
 warp_beacon/warp_beacon.py,sha256=ADCR30uGXIsDrt9WoiI9Ghu2QtWs0qZIK6x3pQKM_B4,1109
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -20,13 +20,13 @@ warp_beacon/mediainfo/audio.py,sha256=ous88kwQj4bDIChN5wnGil5LqTs0IQHH0d-nyrL0-Z
 warp_beacon/mediainfo/silencer.py,sha256=qxMuViOoVwUYb60uCVvqHiGrqByR1_4_rqMT-XdMkwc,1813
 warp_beacon/mediainfo/video.py,sha256=UBZrhTN5IDI-aYu6tsJEILo9nFkjHhkldGVFmvV7tEI,2480
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scheduler/instagram_human.py,sha256=GHzATkWSGpxfXCFSCL3zW8m7GXaaPf8kP6Bk3NuwfzU,12360
+warp_beacon/scheduler/instagram_human.py,sha256=OMv8PbJ6ITa7VqAvhgn97fjdSjBnFdY3T1DLhPhbwT4,12547
 warp_beacon/scheduler/scheduler.py,sha256=Bf4sGXjX75Dox3q-yzUHhagtzUAj3hl5GzfnZya-_io,4995
-warp_beacon/scraper/__init__.py,sha256=i5R8nI0qE8c63lC4vVmggepsNr6-PNI2tPLR9UmcnXI,20534
+warp_beacon/scraper/__init__.py,sha256=rcI8hYeXZPfmINwK_yB2pUmPtWh_BfrEF1IYVg5-67w,20520
 warp_beacon/scraper/abstract.py,sha256=pWbaTu-gDZgi-iFjqMR_uGzPl5KLv-4gTdJ9w6cD4sk,3802
 warp_beacon/scraper/account_selector.py,sha256=ixdFN8sCyFPL_WTzer2pur0Ak3pH4Ih0P90qOM8_f9Y,10077
 warp_beacon/scraper/exceptions.py,sha256=EKwoF0oH2xZWbNU-v8DOaWK5skKwa3s1yTIBdlcfMpc,1452
-warp_beacon/scraper/fail_handler.py,sha256=zcPK3ZVEsu6JmHYcWP7L3naTRK3gWFVRkpP84VBOtJs,964
+warp_beacon/scraper/fail_handler.py,sha256=5ODu4b8ndZWAcHIXrcUufsWFihetzNUoAi8IgAkreyQ,998
 warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5ripx7tM,2447
 warp_beacon/scraper/utils.py,sha256=AOZmDki2Pbr84IG-j_wN2UghKCiWFVDYdx6HJl0JTBs,1258
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -45,16 +45,16 @@ warp_beacon/telegram/bot.py,sha256=HJxouCxc85EzC8lTaqnP-5agvkdvlxKR6Etg5LjYcoA,1
 warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJbND_dX5Fhwkv0,1549
 warp_beacon/telegram/download_status.py,sha256=N-Qg13LVcPskyQNKG1lw50K1lhFtXu003muCRzZ7wiE,1561
 warp_beacon/telegram/edit_message.py,sha256=6DX8eJV70MG_b79WbuJG55qLBs66boElzYdCr8zpMeI,5380
-warp_beacon/telegram/handlers.py,sha256=PaO90370v-S90nwr4PYMzrlHRFBU0VBO6YkqDqTbnjw,9634
+warp_beacon/telegram/handlers.py,sha256=MjferRTVEjBvVQBbIs3Usuxbc-tFtCA5TL1YQSgSy58,9945
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
 warp_beacon/telegram/progress_bar.py,sha256=IP4xtvLtdJtqdr2C-0YaU428iQGrKurbP4Npr31iW74,5014
 warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDHTzP78Mx5tdvPPWs,969
 warp_beacon/telegram/types.py,sha256=Kvdng6uCF1HRoqQgGW1ZYYPJoVuYkFb-LDvMBbW5Hjk,89
 warp_beacon/telegram/utils.py,sha256=S1N_JbHM_ExiM5tS0CeYKWIlvaJMlyq85TQNbK_GVds,5029
-warp_beacon/uploader/__init__.py,sha256=ewvR60k9osJxw_kb5U-TlZkCGR_574biq3w_aR1tjIU,5689
-warp_beacon-2.7.29.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.7.29.dist-info/METADATA,sha256=bCy0h-Ft5baiFpToIipdqsjE-1Ex4e2c4VCnC-i-2Pk,23215
-warp_beacon-2.7.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-warp_beacon-2.7.29.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.7.29.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
-warp_beacon-2.7.29.dist-info/RECORD,,
+warp_beacon/uploader/__init__.py,sha256=1enK6qMWaTZEaK456JwaKOfvCvznHA8cjgceOsrF6Po,5732
+warp_beacon-2.7.31.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.7.31.dist-info/METADATA,sha256=KZ1ph06Yl2PO6n5z3eXttmAgTan8qYfFnRsLEZTx0aE,23215
+warp_beacon-2.7.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+warp_beacon-2.7.31.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.7.31.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
+warp_beacon-2.7.31.dist-info/RECORD,,