warp-beacon 2.5.7__tar.gz → 2.5.9__tar.gz

{warp_beacon-2.5.7/warp_beacon.egg-info → warp_beacon-2.5.9}/PKG-INFO

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

warp_beacon-2.5.9/warp_beacon/__version__.py

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

{warp_beacon-2.5.7 → warp_beacon-2.5.9}/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-2.5.7 → warp_beacon-2.5.9}/warp_beacon/scraper/__init__.py

@@ -27,6 +27,7 @@ ACC_FILE = os.environ.get("SERVICE_ACCOUNTS_FILE", default="/var/warp_beacon/acc
 PROXY_FILE = os.environ.get("PROXY_FILE", default="/var/warp_beacon/proxies.json")
 
 class AsyncDownloader(object):
+	TG_FILE_LIMIT = 2147483648 # 2 GiB
 	__JOE_BIDEN_WAKEUP = None
 	workers = []
 	allow_loop = None
@@ -44,6 +45,8 @@ class AsyncDownloader(object):
 		self.acc_selector = AccountSelector(self.manager, ACC_FILE, PROXY_FILE)
 		self.uploader = uploader
 		self.workers_count = workers_count
+		if os.environ.get("TG_PREMIUM", default="false") == "true":
+			self.TG_FILE_LIMIT = 4294967296 # 4 GiB
 
 	def __del__(self) -> None:
 		self.stop_all()
@@ -93,7 +96,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 +144,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)
@@ -309,7 +312,7 @@ class AsyncDownloader(object):
 										media_info_tmp["thumb"] = item.get("thumb", None)
 										media_info = self.get_media_info(item["local_media_path"], media_info_tmp, JobType.VIDEO)
 										logging.info("Final media info: %s", media_info)
-										if media_info["filesize"] > 2e+9:
+										if media_info["filesize"] > self.TG_FILE_LIMIT:
 											logging.info("Filesize is '%d' MiB", round(media_info["filesize"] / 1024 / 1024))
 											logging.info("Detected big file. Starting compressing with ffmpeg ...")
 											self.uploader.queue_task(job.to_upload_job(

{warp_beacon-2.5.7 → warp_beacon-2.5.9}/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-2.5.7 → warp_beacon-2.5.9}/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-2.5.7 → warp_beacon-2.5.9}/warp_beacon/scraper/youtube/abstract.py

@@ -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-2.5.7 → warp_beacon-2.5.9}/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.7 → warp_beacon-2.5.9/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.5.7/warp_beacon/__version__.py

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