warp-beacon 2.8.19__tar.gz → 2.8.21__tar.gz

{warp_beacon-2.8.19/warp_beacon.egg-info → warp_beacon-2.8.21}/PKG-INFO

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

warp_beacon-2.8.21/warp_beacon/__version__.py

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

{warp_beacon-2.8.19 → warp_beacon-2.8.21}/warp_beacon/scraper/X/abstract.py

@@ -51,18 +51,16 @@ class XAbstract(ScraperAbstract):
 			except urllib3.exceptions.ProxyError as e:
 				logging.warning("Proxy error!")
 				raise BadProxy(extract_exception_message(e.original_error))
+			except playwright.sync_api.TimeoutError as e:
+				logging.warning("Plawright timeout error", exc_info=e)
+				raise BadProxy("Content unvailable")
 			except (socket.timeout,
 					ssl.SSLError,
 					http.client.IncompleteRead,
 					http.client.HTTPException,
 					requests.RequestException,
 					urllib.error.URLError,
-					urllib.error.HTTPError,
-					playwright.sync_api.TimeoutError) as e:
-				if hasattr(e, "code") and (int(e.code) == 403 or int(e.code) == 400):
-					raise Unavailable(extract_exception_message(e))
-				if hasattr(e, "reason") and "Remote end closed connection without response" in str(e.reason):
-					raise Unavailable(extract_exception_message(e))
+					urllib.error.HTTPError) as e:
 				logging.warning("X read timeout! Retrying in '%d' seconds ...", pause_secs)
 				logging.info("Your `X_MAX_RETRIES` values is '%d'", max_retries)
 				logging.exception(extract_exception_message(e))
@@ -135,5 +133,9 @@ class XAbstract(ScraperAbstract):
 
 	def download(self, job: DownloadJob) -> list:
 		self.job = job
-		ret = self.download_hndlr(self._download, job.url)
+		ret = []
+		try:
+			ret = self.download_hndlr(self._download, job.url)
+		except playwright.errors.TimeoutError as e:
+			pass
 		return ret

{warp_beacon-2.8.19 → warp_beacon-2.8.21}/warp_beacon/scraper/instagram/instagram.py

@@ -414,39 +414,48 @@ class InstagramScraper(ScraperAbstract):
 	
 	def email_challenge_resolver(self, username: str) -> Optional[str]:
 		logging.info("Started email challenge resolver")
-		mail = imaplib.IMAP4_SSL(self.account.get("imap_server", "imap.bagrintsev.me"))
-		mail.login(self.account.get("imap_login", ""), self.account.get("imap_password", "")) # email server creds
-		mail.select("inbox")
-		_, data = mail.search(None, "(UNSEEN)")
-		ids = data.pop().split()
-		for num in reversed(ids):
-			mail.store(num, "+FLAGS", "\\Seen")  # mark as read
-			_, data = mail.fetch(num, "(RFC822)")
-			msg = email.message_from_string(data[0][1].decode())
-			payloads = msg.get_payload()
-			if not isinstance(payloads, list):
-				payloads = [msg]
-			code = None
-			for payload in payloads:
-				body = ''
+		try:
+			mail = imaplib.IMAP4_SSL(self.account.get("imap_server", "imap.bagrintsev.me"))
+			mail.login(self.account.get("imap_login", ""), self.account.get("imap_password", "")) # email server creds
+			mail.select("inbox")
+			_, data = mail.search(None, "(UNSEEN)")
+			ids = data.pop().split()
+			for num in reversed(ids):
+				mail.store(num, "+FLAGS", "\\Seen")  # mark as read
+				_, data = mail.fetch(num, "(RFC822)")
+				msg, payloads = "", None
 				try:
-					body = payload.get_payload(decode=True).decode()
+					msg = email.message_from_string(data[0][1].decode())
+					payloads = msg.get_payload()
 				except:
+					logging.error("Failed to parse imap message!")
 					continue
-				if "<div" not in body:
-					continue
-				match = re.search(">([^>]*?({u})[^<]*?)<".format(u=username), body)
-				if not match:
-					continue
-				logging.info("Match from email: '%s'", match.group(1))
-				match = re.search(r">(\d{6})<", body)
-				if not match:
-					logging.info('Skip this email, "code" not found')
-					continue
-				code = match.group(1)
-				if code:
-					logging.info("Found IG code at mail server: '%s'", code)
-					return code
+				if not isinstance(payloads, list):
+					payloads = [msg]
+				code = None
+				for payload in payloads:
+					body = ''
+					try:
+						body = payload.get_payload(decode=True).decode()
+					except:
+						continue
+					if "<div" not in body:
+						continue
+					match = re.search(">([^>]*?({u})[^<]*?)<".format(u=username), body)
+					if not match:
+						continue
+					logging.info("Match from email: '%s'", match.group(1))
+					match = re.search(r">(\d{6})<", body)
+					if not match:
+						logging.info('Skip this email, "code" not found')
+						continue
+					code = match.group(1)
+					if code:
+						logging.info("Found IG code at mail server: '%s'", code)
+						return code
+		except Exception as e:
+			logging.error("Failed to scan IMAP folder")
+			logging.exception(e)
 		return None
 
 	def get_code_from_sms(self, username: str) -> Optional[str]:

{warp_beacon-2.8.19 → warp_beacon-2.8.21/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.8.19/warp_beacon/__version__.py

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