warp-beacon 2.6.36__py3-none-any.whl → 2.6.38__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.6.36"
+__version__ = "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/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.dist-info → warp_beacon-2.6.38.dist-info}/METADATA

@@ -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.dist-info → warp_beacon-2.6.38.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=_Okq2e30zcA4ex25c2Jer542e7Q7oV8JO-jXCV7fGE4,24
+warp_beacon/__version__.py,sha256=CzGvQVuj99cUjAvhgGLIbDwYZE06WXkvUaCJNUoEi_Q,24
 warp_beacon/warp_beacon.py,sha256=ED43vNzdjDUJ_9qLCbri0bjWLWEJ69BENGj9i7G6AvM,342
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,9 +22,9 @@ warp_beacon/mediainfo/video.py,sha256=UBZrhTN5IDI-aYu6tsJEILo9nFkjHhkldGVFmvV7tE
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scheduler/instagram_human.py,sha256=0LaRUu0MBBuEOQeFzuq22HIYfJL9pTK_7udsXfef0Fk,8204
 warp_beacon/scheduler/scheduler.py,sha256=9OCh7Ta4wY_aTHGAOOZmaKXg56Ftx1N_aV1g6E3ZLKA,4941
-warp_beacon/scraper/__init__.py,sha256=AaUd30PSJi5CCqP_UQ25Hbz6W7Y0CEyza1eV4ji4xeU,20029
+warp_beacon/scraper/__init__.py,sha256=NAx81O85yP0vUP1uZ9VHZlXh-zZgN_LHm7gWcU5BV18,19982
 warp_beacon/scraper/abstract.py,sha256=yP76ae9U73LYW2lDN6XWkXDkWX1h2UVOrkqv0Sqpu2Y,2985
-warp_beacon/scraper/account_selector.py,sha256=hqlNgyU53eJd4QgZl30EfIGeuIJx3uGUTffCRUY4rNs,9576
+warp_beacon/scraper/account_selector.py,sha256=_QOezkVM2GqiuseZ72h8U0WmOYFuRoUXEHIDqNl4Nxs,9721
 warp_beacon/scraper/exceptions.py,sha256=EKwoF0oH2xZWbNU-v8DOaWK5skKwa3s1yTIBdlcfMpc,1452
 warp_beacon/scraper/fail_handler.py,sha256=zcPK3ZVEsu6JmHYcWP7L3naTRK3gWFVRkpP84VBOtJs,964
 warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5ripx7tM,2447
@@ -46,9 +46,9 @@ warp_beacon/telegram/handlers.py,sha256=uvR6TPHSqdSxigp3wR-ewiE6t3TvVcbVLVcYGwkg
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
 warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
 warp_beacon/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
-warp_beacon-2.6.36.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.6.36.dist-info/METADATA,sha256=RkVAbx2Csottafgg4OuVmiGdqvQiRFWU45zP8eK_lKw,22706
-warp_beacon-2.6.36.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
-warp_beacon-2.6.36.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.6.36.dist-info/top_level.txt,sha256=aFsWDQBplsMOyVMGGJ8iu-auZ25z1e_IB4tM2M8kW1A,1187
-warp_beacon-2.6.36.dist-info/RECORD,,
+warp_beacon-2.6.38.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.38.dist-info/METADATA,sha256=wPkz6QdKjQdNAMi4CstB37WhSTw9ZpdaOO2eocCz3Ps,22706
+warp_beacon-2.6.38.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
+warp_beacon-2.6.38.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.38.dist-info/top_level.txt,sha256=aFsWDQBplsMOyVMGGJ8iu-auZ25z1e_IB4tM2M8kW1A,1187
+warp_beacon-2.6.38.dist-info/RECORD,,