warp-beacon 2.6.26__tar.gz → 2.6.28__tar.gz

{warp_beacon-2.6.26/warp_beacon.egg-info → warp_beacon-2.6.28}/PKG-INFO

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

warp_beacon-2.6.28/warp_beacon/__version__.py

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

{warp_beacon-2.6.26 → warp_beacon-2.6.28}/warp_beacon/scraper/__init__.py

@@ -38,6 +38,7 @@ class AsyncDownloader(object):
 	manager = None
 	acc_selector = None
 	scheduler = None
+	scrolling_now = None
 
 	def __init__(self, uploader: AsyncUploader, workers_count: int) -> None:
 		self.workers = []
@@ -45,6 +46,7 @@ class AsyncDownloader(object):
 		self.auth_event = multiprocessing.Event()
 		self.manager = multiprocessing.Manager()
 		self.allow_loop = self.manager.Value('i', 1)
+		self.scrolling_now = self.manager.Value('i', 0)
 		self.acc_selector = AccountSelector(self.manager, ACC_FILE, PROXY_FILE)
 		self.uploader = uploader
 		self.workers_count = workers_count
@@ -156,10 +158,12 @@ class AsyncDownloader(object):
 							while self.allow_loop.value == 1:
 								try:
 									if job.scroll_content and job.last_pk and job.job_origin is Origin.INSTAGRAM:
+										self.scrolling_now.value = 1
 										logging.info("Scrolling relative content with pk '%s'", job.last_pk)
 										operations = actor.scroll_content(last_pk=job.last_pk)
 										if operations:
 											selector.inc_ig_request_count(amount=operations)
+										self.scrolling_now.value = 0
 										logging.info("Scrolling done")
 										break
 									if job.session_validation and job.job_origin in (Origin.INSTAGRAM, Origin.YOUTUBE):
@@ -382,12 +386,15 @@ class AsyncDownloader(object):
 									else:
 										self.uploader.queue_task(upload_job)
 									# watch related reels to simulate human
-									if item.get("last_pk", 0) and "reel/" in job.url:
-										self.queue_task(DownloadJob.build(
-											scroll_content=True,
-											last_pk=int(item.get("last_pk", 0)),
-											job_origin=Origin.INSTAGRAM
-										))
+									if self.scrolling_now.value == 0:
+										if item.get("last_pk", 0) and "reel/" in job.url:
+											self.queue_task(DownloadJob.build(
+												scroll_content=True,
+												last_pk=int(item.get("last_pk", 0)),
+												job_origin=Origin.INSTAGRAM
+											))
+									else:
+										logging.info("Scrolling in progress, ignoring request")
 						else:
 							logging.info("Job already in work in parallel worker. Redirecting job to upload worker.")
 							self.uploader.queue_task(job.to_upload_job())

{warp_beacon-2.6.26 → warp_beacon-2.6.28}/warp_beacon/scraper/abstract.py

@@ -27,8 +27,8 @@ class ScraperAbstract(ABC):
 		self.account_index = account[0]
 		self.account = account[1]
 		self.proxy = proxy
-		if self.account.get("force_ipv6", False):
-			self.force_ipv6()
+		#if self.account.get("force_ipv6", False):
+		#	self.force_ipv6()
 
 	#def __del__(self) -> None:
 	#	if self.account.get("force_ipv6", False):
@@ -95,6 +95,7 @@ class ScraperAbstract(ABC):
 			urllib3_cn.allowed_gai_family = allowed_gai_family
 
 	def restore_gai(self) -> None:
+		return
 		with self._gai_lock:
 			if self.original_gai_family:
 				logging.info("Restoring normal IP stack ...")

{warp_beacon-2.6.26 → warp_beacon-2.6.28/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.26/warp_beacon/__version__.py

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