warp-beacon 2.6.23__tar.gz → 2.6.25__tar.gz

{warp_beacon-2.6.23/warp_beacon.egg-info → warp_beacon-2.6.25}/PKG-INFO

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

warp_beacon-2.6.25/warp_beacon/__version__.py

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

{warp_beacon-2.6.23 → warp_beacon-2.6.25}/warp_beacon/scraper/__init__.py

@@ -102,7 +102,6 @@ class AsyncDownloader(object):
 			try:
 				job: DownloadJob = None
 				actor = None
-				proxy = None
 				try:
 					job = self.job_queue.get()
 					if job is self.__JOE_BIDEN_WAKEUP:
@@ -124,10 +123,13 @@ class AsyncDownloader(object):
 									time.sleep(2)
 									self.job_queue.put(job)
 									continue
+							last_proxy = selector.get_last_proxy()
 							selector.set_module(job.job_origin)
 							# use same proxy as in content request before
+							proxy = None
 							if job.scroll_content:
 								proxy = last_proxy
+								logging.info("Chosen last proxy '%s'", proxy)
 							else:
 								proxy = selector.get_current_proxy()
 							if job.job_origin is Origin.INSTAGRAM:
@@ -297,8 +299,10 @@ class AsyncDownloader(object):
 										f"Exception:<br><pre code=\"python\">{exception_msg}</pre>"
 									))
 									break
+								finally:
+									if actor:
+										actor.restore_gai()
 
-							actor.restore_gai()
 							last_proxy = proxy
 
 							if items:

{warp_beacon-2.6.23 → warp_beacon-2.6.25}/warp_beacon/scraper/abstract.py

@@ -29,8 +29,6 @@ class ScraperAbstract(ABC):
 		self.proxy = proxy
 		if self.account.get("force_ipv6", False):
 			self.force_ipv6()
-		else:
-			self.restore_gai()
 
 	#def __del__(self) -> None:
 	#	if self.account.get("force_ipv6", False):

{warp_beacon-2.6.23 → warp_beacon-2.6.25}/warp_beacon/scraper/account_selector.py

@@ -69,6 +69,9 @@ class AccountSelector(object):
 
 	def get_current_proxy(self) -> Optional[dict]:
 		return self.current_proxy
+	
+	def get_last_proxy(self) -> Optional[dict]:
+		return self.accounts_meta_data.get("last_proxy", None)
 
 	def get_proxy_list(self) -> List[dict]:
 		matched_proxy = []
@@ -96,7 +99,7 @@ class AccountSelector(object):
 					if len(matched_proxy) > 1:
 						random.seed(random.seed(time.time_ns() ^ int.from_bytes(os.urandom(len(matched_proxy)), "big")))
 						# ensure new proxy in case if previous account required captcha
-						last_proxy = self.accounts_meta_data.get("last_proxy", None)
+						last_proxy = self.get_last_proxy()
 						if last_proxy and last_proxy in matched_proxy:
 							matched_proxy.remove(last_proxy)
 					prox_choice = random.choice(matched_proxy)
@@ -119,7 +122,8 @@ class AccountSelector(object):
 			if matched_proxies:
 				lit = cycle(matched_proxies)
 				proxy = next(lit)
-				if proxy.get("dsn", {}) == self.accounts_meta_data["last_proxy"].get("dsn", {}):
+				last_proxy = self.get_last_proxy()
+				if last_proxy and proxy.get("dsn", "") == last_proxy.get("dsn", ""):
 					proxy = next(lit)
 				self.current_proxy = proxy
 				self.accounts_meta_data["last_proxy"] = proxy

{warp_beacon-2.6.23 → warp_beacon-2.6.25/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.23/warp_beacon/__version__.py

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