warp-beacon 2.6.36__tar.gz → 2.6.38__tar.gz

{warp_beacon-2.6.36/warp_beacon.egg-info → warp_beacon-2.6.38}/PKG-INFO

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

warp_beacon-2.6.38/warp_beacon/__version__.py

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

{warp_beacon-2.6.36 → warp_beacon-2.6.38}/warp_beacon/scraper/__init__.py

@@ -56,9 +56,6 @@ class AsyncDownloader(object):
 		if os.environ.get("TG_PREMIUM", default="false") == "true":
 			self.TG_FILE_LIMIT = 4294967296 # 4 GiB
 
-	def __del__(self) -> None:
-		self.stop_all()
-
 	def start(self) -> None:
 		for _ in range(self.workers_count):
 			proc = multiprocessing.Process(target=self.do_work, args=(self.acc_selector, self.process_context))

{warp_beacon-2.6.36 → warp_beacon-2.6.38}/warp_beacon/scraper/account_selector.py

@@ -26,13 +26,16 @@ class AccountSelector(object):
 	current_proxy = None
 	ig_request_count = None
 	ig_accounts_session_id = None
+	lock = None
 
 	def __init__(self, manager: multiprocessing.managers.SyncManager, acc_file_path: str, proxy_file_path: str=None) -> None:
 		self.accounts = []
 		self.proxies = []
 		self.account_index = {}
-		self.ig_accounts_session_id = self.load_ig_sessions_id()
 		self.manager = manager
+		self.lock = self.manager.Lock()
+		self.ig_accounts_session_id = self.manager.dict()
+		self.load_ig_sessions_id()
 		self.accounts_meta_data = self.manager.dict()
 		if os.path.exists(acc_file_path):
 			with open(acc_file_path, 'r', encoding="utf-8") as f:
@@ -63,19 +66,20 @@ class AccountSelector(object):
 			logging.warning("Failed to save session ig_session_client_id!")
 			logging.exception(e)
 
-	def load_ig_sessions_id(self) -> dict:
-		ig_sessions_client_id = {}
+	def load_ig_sessions_id(self) -> None:
 		try:
 			sess_file = f"{self.session_dir}/ig_sessions_client_id.json"
 			if os.path.exists(sess_file):
+				data = None
 				with open(sess_file, 'r', encoding="utf-8") as f:
-					ig_sessions_client_id = json.loads(f.read())
+					data = json.loads(f.read())
+				if data and isinstance(data, dict):
+					for k, v in data.items():
+						self.ig_accounts_session_id[k] = v
 		except Exception as e:
 			logging.warning("Failed to read session ig_session_client_id!")
 			logging.exception(e)
 
-		return ig_sessions_client_id
-
 	def save_ig_request_count(self) -> None:
 		try:
 			state = {"ig_count": self.ig_request_count.value}
@@ -259,11 +263,12 @@ class AccountSelector(object):
 		return self.ig_request_count.value
 	
 	def get_ig_session_id(self) -> str:
-		idx = self.account_index[self.current_module_name].value
-		if idx not in self.ig_accounts_session_id:
-			self.ig_accounts_session_id[idx] = str(uuid.uuid4())
-		else:
-			if random.random() > 0.95:
+		with self.lock:
+			idx = self.account_index[self.current_module_name].value
+			if idx not in self.ig_accounts_session_id:
 				self.ig_accounts_session_id[idx] = str(uuid.uuid4())
-				logging.info("Rotated client_session_id — simulating app restart")
-		return self.ig_accounts_session_id[idx]
+			else:
+				if random.random() > 0.95:
+					self.ig_accounts_session_id[idx] = str(uuid.uuid4())
+					logging.info("Rotated client_session_id — simulating app restart")
+			return self.ig_accounts_session_id[idx]

{warp_beacon-2.6.36 → warp_beacon-2.6.38/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.36/warp_beacon/__version__.py

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