warp-beacon 2.2.22__tar.gz → 2.2.23__tar.gz

{warp_beacon-2.2.22/warp_beacon.egg-info → warp_beacon-2.2.23}/PKG-INFO

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

warp_beacon-2.2.23/warp_beacon/__version__.py

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

{warp_beacon-2.2.22 → warp_beacon-2.2.23}/warp_beacon/scraper/__init__.py

@@ -125,13 +125,13 @@ class AsyncDownloader(object):
 								except NotFound as e:
 									logging.warning("Not found error occurred!")
 									logging.exception(e)
+									self.send_message_to_admin(
+										f"Task `{job.job_id}` failed. URL: '{job.url}'. Reason: '**NotFound**'."
+									)
 									self.uploader.queue_task(job.to_upload_job(
 										job_failed=True,
 										job_failed_msg="Unable to access to media under this URL. Seems like the media is private.")
 									)
-									self.send_message_to_admin(
-										f"Task {job.job_id} failed. URL: '{job.url}'. Reason: 'NotFound'."
-									)
 									break
 								except Unavailable as e:
 									logging.warning("Not found or unavailable error occurred!")
@@ -150,24 +150,24 @@ class AsyncDownloader(object):
 								except TimeOut as e:
 									logging.warning("Timeout error occurred!")
 									logging.exception(e)
+									self.send_message_to_admin(
+										f"Task `{job.job_id}` failed. URL: '{job.url}'. Reason: '**TimeOut**'."
+									)
 									self.uploader.queue_task(job.to_upload_job(
 										job_failed=True,
 										job_failed_msg="Failed to download content due timeout error. Please check you Internet connection, retry amount or request timeout bot configuration settings.")
 									)
-									self.send_message_to_admin(
-										f"Task {job.job_id} failed. URL: '{job.url}'. Reason: 'TimeOut'."
-									)
 									break
 								except FileTooBig as e:
 									logging.warning("Telegram limits exceeded :(")
 									logging.exception(e)
+									self.send_message_to_admin(
+										f"Task `{job.job_id}` failed. URL: '{job.url}'. Reason: '**FileTooBig**'."
+									)
 									self.uploader.queue_task(job.to_upload_job(
 										job_failed=True,
 										job_failed_msg="Unfortunately this file has exceeded the Telegram limits. A file cannot be larger than 2 gigabytes.")
 									)
-									self.send_message_to_admin(
-										f"Task {job.job_id} failed. URL: '{job.url}'. Reason: 'FileTooBig'."
-									)
 									break
 								except IGRateLimitOccurred as e:
 									logging.warning("IG ratelimit occurred :(")
@@ -178,6 +178,10 @@ class AsyncDownloader(object):
 								except CaptchaIssue as e:
 									logging.warning("Challange occurred!")
 									logging.exception(e)
+									acc_index, acc_data = selector.get_current()
+									self.send_message_to_admin(
+										f"Captcha required for account #{acc_index}, login: '{acc_data.get('login', 'unknown')}'."
+									)
 									self.try_next_account(selector, job)
 									self.job_queue.put(job)
 									break
@@ -197,19 +201,19 @@ class AsyncDownloader(object):
 										job_failed_msg="Youtube Age Restricted error. Check your bot Youtube account settings.")
 									)
 									self.send_message_to_admin(
-										f"Task {job.job_id} failed. URL: '{job.url}'. Reason: 'YotubeAgeRestrictedError'."
+										f"Task `{job.job_id}` failed. URL: '{job.url}'. Reason: '**YotubeAgeRestrictedError**'."
 									)
 									break
 								except AllAccountsFailed as e:
 									logging.error("All accounts failed!")
 									logging.exception(e)
+									self.send_message_to_admin(
+										f"Task `{job.job_id}` failed. URL: '{job.url}'. Reason: '**AllAccountsFailed**'."
+									)
 									self.uploader.queue_task(job.to_upload_job(
 										job_failed=True,
 										job_failed_msg="All bot accounts failed to download content. Bot administrator noticed about the issue.")
 									)
-									self.send_message_to_admin(
-										f"Task {job.job_id} failed. URL: '{job.url}'. Reason: 'AllAccountsFailed'."
-									)
 									break
 								except (UnknownError, Exception) as e:
 									logging.warning("UnknownError occurred!")
@@ -221,27 +225,27 @@ class AsyncDownloader(object):
 										exception_msg = str(e)
 									if "geoblock_required" in exception_msg:
 										if job.geoblock_error_count > self.acc_selector.count_service_accounts(job.job_origin):
+											self.send_message_to_admin(
+												f"Task `{job.job_id}` failed. URL: '{job.url}'. Reason: '**geoblock_required**'."
+											)
 											self.uploader.queue_task(job.to_upload_job(
 												job_failed=True,
 												job_failed_msg="This content does not accessible for all yout bot accounts. Seems like author blocked certain regions.")
 											)
-											self.send_message_to_admin(
-												f"Task {job.job_id} failed. URL: '{job.url}'. Reason: 'geoblock_required'."
-											)
 											break
 										job.geoblock_error_count += 1
 										logging.info("Trying to switch account")
 										self.acc_selector.next()
 										self.job_queue.put(job)
 										break
+									self.send_message_to_admin(
+										f"Task `{job.job_id}` failed. URL: '{job.url}'. Reason: '**UnknownError**'."
+										f"Exception:\n```\n{exception_msg}\n```"
+									)
 									self.uploader.queue_task(job.to_upload_job(
 										job_failed=True,
 										job_failed_msg="WOW, unknown error occured! Please [create issue](https://github.com/sb0y/warp_beacon/issues) with service logs.")
 									)
-									self.send_message_to_admin(
-										f"Task {job.job_id} failed. URL: '{job.url}'. Reason: 'UnknownError'."
-										f"Exception:\n```\n{exception_msg}\n```"
-									)
 									break
 
 							if items:

{warp_beacon-2.2.22 → warp_beacon-2.2.23/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.2.22/warp_beacon/__version__.py

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