warp-beacon 2.4.4__tar.gz → 2.4.6__tar.gz

{warp_beacon-2.4.4/warp_beacon.egg-info → warp_beacon-2.4.6}/PKG-INFO

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

warp_beacon-2.4.6/warp_beacon/__version__.py

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

{warp_beacon-2.4.4 → warp_beacon-2.4.6}/warp_beacon/scraper/__init__.py

@@ -288,12 +288,13 @@ class AsyncDownloader(object):
 										break
 									self.send_message_to_admin(
 										f"Task <code>{job.job_id}</code> failed. URL: {job.url}. Reason: '<b>UnknownError</b>'."
-										f"Exception:<br><pre code=\"python\">{exception_msg}<br></pre>"
+										f"Exception:\n<pre code=\"python\">{exception_msg}<br></pre>"
 									)
 									self.uploader.queue_task(job.to_upload_job(
 										job_failed=True,
-										job_failed_msg=f"Unknown error occured. Please <a href=\"https://github.com/sb0y/warp_beacon/issues\">create issue</a> with service logs.\n"
-										f"Task <code>{job.job_id}</code> failed. URL: {job.url}. Reason: '<b>UnknownError</b>'.\n"
+										job_failed_msg=f"Unknown error occured. Please <a href=\"https://github.com/sb0y/warp_beacon/issues\">create issue</a> with service logs.<br>"
+										f"Task <code>{job.job_id}</code> failed. URL: {job.url}.<br>"
+										f"Reason: '<b>UnknownError</b>'.<br>"
 										f"Exception:<br><pre code=\"python\">{exception_msg}</pre>"
 									))
 									break

{warp_beacon-2.4.4 → warp_beacon-2.4.6}/warp_beacon/scraper/instagram/instagram.py

@@ -13,12 +13,13 @@ import requests
 import urllib3
 from urllib.parse import urljoin, urlparse
 
+from instagrapi import exceptions
 from instagrapi.mixins.story import Story
 from instagrapi.types import Media
 from instagrapi import Client
 from instagrapi.mixins.challenge import ChallengeChoice
-from instagrapi.exceptions import LoginRequired, PleaseWaitFewMinutes, MediaNotFound, ClientNotFoundError, UserNotFound, ChallengeRequired, \
-	ChallengeSelfieCaptcha, ChallengeUnknownStep, UnknownError as IGUnknownError
+#from instagrapi.exceptions import LoginRequired, PleaseWaitFewMinutes, MediaNotFound, ClientNotFoundError, UserNotFound, ChallengeRequired, \
+#	ChallengeSelfieCaptcha, ChallengeUnknownStep, UnknownError as IGUnknownError
 
 from warp_beacon.scraper.exceptions import NotFound, UnknownError, TimeOut, IGRateLimitOccurred, CaptchaIssue, BadProxy, extract_exception_message
 from warp_beacon.scraper.abstract import ScraperAbstract
@@ -155,11 +156,22 @@ class InstagramScraper(ScraperAbstract):
 			except urllib3.exceptions.ProxyError as e:
 				logging.warning("Proxy error!")
 				raise BadProxy(extract_exception_message(e.original_error))
-			except (ChallengeRequired, ChallengeSelfieCaptcha, ChallengeUnknownStep) as e:
+			except exceptions.ClientConnectionError as e:
+				msg = str(e.message)
+				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.exception(e)
+				if max_retries <= retries:
+					raise TimeOut(extract_exception_message(e))
+				retries += 1
+				time.sleep(2)
+			except(exceptions.ChallengeRequired, exceptions.ChallengeSelfieCaptcha, exceptions.ChallengeUnknownStep) as e:
 				logging.warning("Instagram wants Challange!")
 				logging.exception(e)
 				raise CaptchaIssue("a captcha issue arose")
-			except LoginRequired as e:
+			except exceptions.LoginRequired as e:
 				logging.error("LoginRequired occurred in download handler!")
 				logging.exception(e)
 				old_session = self.cl.get_settings()

{warp_beacon-2.4.4 → warp_beacon-2.4.6}/warp_beacon/scraper/youtube/abstract.py

@@ -180,7 +180,7 @@ class YoutubeAbstract(ScraperAbstract):
 				# do noting, not interested
 				pass
 			#except http.client.IncompleteRead as e:
-			except KeyError:
+			except (KeyError, pytubefix.exceptions.RegexMatchError):
 				raise Unavailable("Library failed")
 			except urllib3.exceptions.ProxyError as e:
 				logging.warning("Proxy error!")

{warp_beacon-2.4.4 → warp_beacon-2.4.6/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.4.4/warp_beacon/__version__.py

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