warp-beacon 2.5.6__py3-none-any.whl → 2.5.8__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.5.6"
+__version__ = "2.5.8"
 

warp_beacon/scheduler/scheduler.py

@@ -95,6 +95,7 @@ class IGScheduler(object):
 
 	def validate_ig_session(self) -> bool:
 		try:
+			logging.info("Setting IG validate task ...")
 			self.downloader.queue_task(warp_beacon.jobs.download_job.DownloadJob.build(
 				session_validation=True,
 				job_origin=Origin.INSTAGRAM
@@ -108,6 +109,7 @@ class IGScheduler(object):
 	
 	def validate_yt_session(self) -> bool:
 		try:
+			logging.info("Setting YT validate task ...")
 			self.downloader.queue_task(warp_beacon.jobs.download_job.DownloadJob.build(
 				session_validation=True,
 				job_origin=Origin.YOUTUBE
@@ -132,26 +134,25 @@ class IGScheduler(object):
 				min_val = min(yt_expires, ig_sched)
 				#max_val = max(yt_expires, ig_sched)
 				now = datetime.datetime.now()
-				if 4 <= now.hour < 7 and min_val != yt_expires:
+				if 3 <= now.hour < 7 and min_val != yt_expires:
 					logging.info("Scheduler is paused due to night hours (4:00 - 7:00)")
 					self.state["remaining"] = 10800
 					self.save_state()
 
 				if ig_sched <= 0:
 					self.state["remaining"] = randrange(9292, 26200)
-					logging.info("Next scheduler activity in '%s' seconds", ig_sched)
-
-				if yt_expires <= time.time() + 60:
-					self.validate_yt_session()
 
 				start_time = time.time()
+				logging.info("Next scheduler activity in '%s' seconds", min_val)
+				logging.info("IG timeout '%d' secs", int(self.state["remaining"]))
 				self.event.wait(timeout=min_val)
 				elapsed = time.time() - start_time
 				self.state["remaining"] -= elapsed
 
 				if self.running:
-					logging.info("Scheduler waking up")
 					self.validate_ig_session()
+					if yt_expires <= time.time() + 60:
+						self.validate_yt_session()
 				self.save_state()
 			except Exception as e:
 				logging.error("An error occurred in scheduler thread!")

warp_beacon/scraper/__init__.py

@@ -93,7 +93,7 @@ class AsyncDownloader(object):
 		fail_handler = FailHandler(DBClient())
 		while self.allow_loop.value == 1:
 			try:
-				job = None
+				job: DownloadJob = None
 				try:
 					job = self.job_queue.get()
 					if job is self.__JOE_BIDEN_WAKEUP:
@@ -141,15 +141,15 @@ class AsyncDownloader(object):
 							# job retry loop
 							while self.allow_loop.value == 1:
 								try:
-									if job.session_validation:
+									if job.session_validation and job.job_origin in (Origin.INSTAGRAM, Origin.YOUTUBE):
 										if job.job_origin is Origin.INSTAGRAM:
-											if selector.get_ig_request_count() >= int(os.environ.get("IG_REQUESTS_PER_ACCOUNT", default="20")):
+											if selector.get_ig_request_count() >= int(os.environ.get("IG_REQUESTS_PER_ACCOUNT", default="10")):
 												logging.info("The account request limit has been reached. Selecting the next account.")
 												selector.reset_ig_request_count()
 												selector.next()
 										logging.info("Validating '%s' session ...", job.job_origin.value)
 										actor.validate_session()
-										logging.info("done")
+										logging.info("Validation done")
 									else:
 										logging.info("Downloading URL '%s'", job.url)
 										items = actor.download(job)

warp_beacon/scraper/account_selector.py

@@ -183,8 +183,8 @@ class AccountSelector(object):
 			return 0
 		return len(self.accounts[module_name])
 	
-	def inc_ig_request_count(self) -> None:
-		self.ig_request_count.value += 1
+	def inc_ig_request_count(self, amount: int = 1) -> None:
+		self.ig_request_count.value += amount
 
 	def reset_ig_request_count(self) -> None:
 		self.ig_request_count.value = 0

warp_beacon/scraper/instagram/instagram.py

@@ -125,7 +125,7 @@ class InstagramScraper(ScraperAbstract):
 				return "media", self.scrap_media(url)
 		try:
 			return _scrap()
-		except LoginRequired as e:
+		except exceptions.LoginRequired as e:
 			logging.warning("Session error. Trying to relogin...")
 			logging.exception(e)
 			self.login()

warp_beacon/scraper/youtube/abstract.py

@@ -195,7 +195,7 @@ class YoutubeAbstract(ScraperAbstract):
 				if hasattr(e, "code") and (int(e.code) == 403 or int(e.code) == 400):
 					raise Unavailable(extract_exception_message(e))
 				if hasattr(e, "reason") and "Remote end closed connection without response" in str(e.reason):
-					raise BadProxy(extract_exception_message(e))
+					raise Unavailable(extract_exception_message(e))
 				logging.warning("Youtube read timeout! Retrying in '%d' seconds ...", pause_secs)
 				logging.info("Your `YT_MAX_RETRIES` values is '%d'", max_retries)
 				logging.exception(extract_exception_message(e))
@@ -294,8 +294,9 @@ class YoutubeAbstract(ScraperAbstract):
 		try:
 			ret = self.download_hndlr(self._download, job.url, session=True)
 			return ret
-		except (Unavailable, TimeOut, KeyError):
+		except (Unavailable, TimeOut, KeyError) as e:
 			logging.warning("Download failed, trying to download with yt_dlp")
+			logging.exception(e)
 		
 		try:
 			ret = self.download_hndlr(self._download_yt_dlp, job.url)

warp_beacon/telegram/bot.py

@@ -248,7 +248,7 @@ class Bot(object):
 					args["thumb"] = job.media_info["thumb"]
 					args["caption"] = self.build_signature_caption(job)
 
-				args["file_name"] = job.local_media_path
+				args["file_name"] = os.path.basename(job.local_media_path)
 		elif job.media_type == JobType.IMAGE:
 			if job.tg_file_id:
 				if job.placeholder_message_id:
@@ -269,7 +269,7 @@ class Bot(object):
 					args["photo"] = job.local_media_path
 					args["caption"] = self.build_signature_caption(job)
 
-				args["file_name"] = job.local_media_path
+				args["file_name"] = os.path.basename(job.local_media_path)
 		elif job.media_type == JobType.AUDIO:
 			if job.tg_file_id:
 				if job.placeholder_message_id:
@@ -297,7 +297,7 @@ class Bot(object):
 					args["title"] = job.canonical_name
 					args["caption"] = self.build_signature_caption(job)
 
-				args["file_name"] = job.local_media_path
+				args["file_name"] = os.path.basename(job.local_media_path)
 		elif job.media_type == JobType.ANIMATION:
 			if job.tg_file_id:
 				if job.placeholder_message_id:
@@ -326,7 +326,7 @@ class Bot(object):
 					args["thumb"] = job.media_info["thumb"]
 					args["caption"] = self.build_signature_caption(job)
 
-				args["file_name"] = job.local_media_path
+				args["file_name"] = os.path.basename(job.local_media_path)
 		elif job.media_type == JobType.COLLECTION:
 			if job.tg_file_id:
 				args["media"] = []

{warp_beacon-2.5.6.dist-info → warp_beacon-2.5.8.dist-info}/METADATA

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

{warp_beacon-2.5.6.dist-info → warp_beacon-2.5.8.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=4k8wt46v-ttsvFxv2QGEpgyobdIwzii1kBMz5op9fqs,23
+warp_beacon/__version__.py,sha256=ih6MTWwRjEol5yh7XgwWlbclS6hLem0mZQYwD7I1nTA,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
@@ -21,32 +21,32 @@ warp_beacon/mediainfo/silencer.py,sha256=qxMuViOoVwUYb60uCVvqHiGrqByR1_4_rqMT-Xd
 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=xbh37egaTiSOasIMibpF0n9xwmWbq5ktGyNglyZQpvc,5673
-warp_beacon/scheduler/scheduler.py,sha256=MoPdPKiMNqVD19N-8yDc0wkTlwghFeQV3STBipAgbeQ,4602
-warp_beacon/scraper/__init__.py,sha256=Wl_GHtBW6GMH45nD9jjzSJGxBkkkrDZAFx9QIqkagO0,18218
+warp_beacon/scheduler/scheduler.py,sha256=z1EokmWTdo8GE3PfqFl2JFypqVNtp2qtSBwBykH1dNg,4727
+warp_beacon/scraper/__init__.py,sha256=QX8S2sw6Ay9V5TWYYZisvKJLa1BOLa3oErYRL3hNqas,18299
 warp_beacon/scraper/abstract.py,sha256=CiOyKCxVYWhPnOUpLAVIRNuHBftN6gmxqATdhjzkaS4,2852
-warp_beacon/scraper/account_selector.py,sha256=1ftgBKyaW_JiC6KX6wPfid3YWk8hRctfOTROrH1OnJ8,6943
+warp_beacon/scraper/account_selector.py,sha256=mYNxAyAJj4ie9wMMkfb7ONjvAicS8xPEfE3iIe4gCog,6965
 warp_beacon/scraper/exceptions.py,sha256=EKwoF0oH2xZWbNU-v8DOaWK5skKwa3s1yTIBdlcfMpc,1452
 warp_beacon/scraper/fail_handler.py,sha256=_blvckfTZ4xWVancQKVRXH5ClKGwfrBxMwvXIFZh1qA,975
 warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5ripx7tM,2447
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/instagram/instagram.py,sha256=KyOZnIt6A8wkroXkZcIJMscuy5N5ZEz9-v3Ciwo0C7M,14654
+warp_beacon/scraper/instagram/instagram.py,sha256=-oAT9XjqN02wFRREhk3W3WEgVQ77p6NA55z1KI8ng8Q,14665
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/youtube/abstract.py,sha256=6seKvS3D8pdrd3ek5MIMVKFTnP_cL6YuZsuwVAqhX1w,11696
+warp_beacon/scraper/youtube/abstract.py,sha256=kWXS_d0LJDR8cJaWalcUAlXpyQbqOxlMEojhtpyK7Ik,11728
 warp_beacon/scraper/youtube/music.py,sha256=m-1iPYe1p0OZmOlYl8gjHErsazCcXqs3qDA7KyIT6GI,2923
 warp_beacon/scraper/youtube/shorts.py,sha256=sPrOjhcLlV0m5a-j4mSFsF6CkNapeUdGZqoWAYheiCM,1894
 warp_beacon/scraper/youtube/youtube.py,sha256=ctHPmTfNO-5dcYeh1K4_PkB6MQRVgByr4EvaCvZp9WE,6171
 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=eY6g3XiKbl76OF6gWVThIlH6GkTYqcoiUGbXH9YzkLk,18150
+warp_beacon/telegram/bot.py,sha256=yLgmX3HKoy_A8RXU1h-7VTDih_gOA0UY2obzlVK7OdA,18222
 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.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.5.6.dist-info/METADATA,sha256=1JI1reUWz5Qdw1ZqEWRAo91g7lu-KJDmHwd8twaupYc,22625
-warp_beacon-2.5.6.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-warp_beacon-2.5.6.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.5.6.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
-warp_beacon-2.5.6.dist-info/RECORD,,
+warp_beacon-2.5.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.5.8.dist-info/METADATA,sha256=o7RsdjSTiycI3tHxeX71v1FoXdvQN4E6nxua6cweeg8,22625
+warp_beacon-2.5.8.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+warp_beacon-2.5.8.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.5.8.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
+warp_beacon-2.5.8.dist-info/RECORD,,

{warp_beacon-2.5.6.dist-info → warp_beacon-2.5.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any