warp-beacon 2.7.20__tar.gz → 2.7.22__tar.gz

{warp_beacon-2.7.20/warp_beacon.egg-info → warp_beacon-2.7.22}/PKG-INFO

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

warp_beacon-2.7.22/warp_beacon/__version__.py

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

{warp_beacon-2.7.20 → warp_beacon-2.7.22}/warp_beacon/scheduler/instagram_human.py

@@ -14,6 +14,7 @@ class InstagramHuman(object):
 	def __init__(self, scrapler: InstagramScraper) -> None:
 		self.scrapler = scrapler
 		self.operations_count = 0
+		self.was_profile_explore = False
 
 	def browse_timeline(self) -> Optional[dict]:
 		feed = None
@@ -76,7 +77,7 @@ class InstagramHuman(object):
 			try:
 				logging.info("Wathing story with pk '%s'", str(m.id))
 				seen.append(str(m.id))
-				if random.random() > 0.5:
+				if random.random() > 0.9:
 					explore_user = m.user
 					break
 				self.random_pause()
@@ -99,12 +100,13 @@ class InstagramHuman(object):
 			return
 		explore_user = None
 		seen = []
+		random.seed(time.time())
 		for m in media[:random.randint(1, len(media))]:
 			try:
 				logging.info("Watching content with pk '%s'", str(m.id))
 				seen.append(str(m.id))
 				logging.info("Watched content with id '%s'", str(m.id))
-				if random.random() > 0.4:
+				if random.random() > 0.9:
 					explore_user = m.user
 					break
 				self.random_pause()
@@ -282,7 +284,10 @@ class InstagramHuman(object):
 
 	def explore_profile(self, user: UserShort) -> None:
 		try:
+			if self.was_profile_explore:
+				return
 			logging.info("Exploring user profile '%s'", user.username)
+			self.was_profile_explore = True
 			user_id = self.scrapler.download_hndlr(self.scrapler.cl.user_id_from_username, user.username)
 			self.operations_count += 1
 			if user_id:

{warp_beacon-2.7.20 → warp_beacon-2.7.22}/warp_beacon/scraper/instagram/instagram.py

@@ -196,7 +196,7 @@ class InstagramScraper(ScraperAbstract):
 				if "ProxyError" in msg:
 					raise BadProxy(msg)
 				logging.warning("Instagram read timeout! Retrying in 2 seconds ...")
-				logging.info("Your `IG_MAX_RETRIES` values is %d", max_retries)
+				logging.info("Your `IG_MAX_RETRIES` values is '%d'", max_retries)
 				logging.exception(e)
 				if max_retries <= retries:
 					raise TimeOut(extract_exception_message(e))
@@ -215,9 +215,11 @@ class InstagramScraper(ScraperAbstract):
 						relogin_success = self.cl.login(self.account["login"], self.account["password"], relogin=True)
 						if relogin_success:
 							self.safe_write_session()
+							logging.info("Successful relogin")
 					except Exception as exc:
 						logging.warning("Relogin failed!", exc_info=exc)
 				if not relogin_success:
+					logging.info("Fully logging into account from beginning ...")
 					old_session = self.cl.get_settings()
 					# change session id after relogin
 					self.client_session_id = self.acc_selector.generate_new_session_id()

{warp_beacon-2.7.20 → warp_beacon-2.7.22/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.7.20/warp_beacon/__version__.py

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