warp-beacon 2.2.22__py3-none-any.whl → 2.2.24__py3-none-any.whl

warp_beacon/__version__.py

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

warp_beacon/scheduler/scheduler.py

@@ -90,8 +90,9 @@ class IGScheduler(object):
 				elapsed = time.time() - start_time
 				self.state["remaining"] -= elapsed
 
-				logging.info("Scheduler waking up")
-				self.validate_ig_session()
+				if self.running:
+					logging.info("Scheduler waking up")
+					self.validate_ig_session()
 				self.save_state()
 			except Exception as e:
 				logging.error("An error occurred in scheduler thread!")

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.dist-info → warp_beacon-2.2.24.dist-info}/METADATA

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

{warp_beacon-2.2.22.dist-info → warp_beacon-2.2.24.dist-info}/RECORD

@@ -3,7 +3,7 @@ lib/systemd/system/warp_beacon.service,sha256=lPmHqLqcI2eIV7nwHS0qcALQrznixqJuww
 var/warp_beacon/accounts.json,sha256=rKFQM_b9eoDS4mJ1B_SZNolPLXx1SQdQMdY2F_ZcBt8,1523
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=jjWCYJXrPs4L8PwqG4etpOL3a6PVLZ73Uczjt_S95ic,24
+warp_beacon/__version__.py,sha256=5j3uHwSbszh78x6-PpDSiisJ6tRYR9nAOlv4L1PqQis,24
 warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/compress/video.py,sha256=_PDMVYCyzLYxHv1uZmmzGcG_8rjaZr7BTXsXTTy_oS4,2846
@@ -18,8 +18,8 @@ warp_beacon/mediainfo/audio.py,sha256=ous88kwQj4bDIChN5wnGil5LqTs0IQHH0d-nyrL0-Z
 warp_beacon/mediainfo/silencer.py,sha256=MgUc9Ibbhjhg9GbJMNfJqrdDkMsQShZkQ1sCwvW_-qI,1647
 warp_beacon/mediainfo/video.py,sha256=DXHiWAOyJPSVXQ0OP7uOBikUFT7noFmMaMSIx04Mhs4,2506
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scheduler/scheduler.py,sha256=fetiuISHa-PqwZB0YHx56T9rmHHwKzYCMzd162iEIlQ,2562
-warp_beacon/scraper/__init__.py,sha256=3M1nHOXwa4-vFA4jbK7YaYZN-Pk4auxwb43H5v-gqdI,14984
+warp_beacon/scheduler/scheduler.py,sha256=d_TxhIpL_4s0a8tgUO3xokkLYPx1CaHZdldbuIl90yI,2585
+warp_beacon/scraper/__init__.py,sha256=tkl7UyfqFcvPlxomVPB9GpWQvAoADaM6jGb_bmx1zRY,15229
 warp_beacon/scraper/abstract.py,sha256=aNZ9ypF9B8BjflcIwi-7wEzIqF-XPeF0xvfX9CP_iIw,2708
 warp_beacon/scraper/account_selector.py,sha256=CmHNNeh8NuYQsysDB8Hmo0dWMEqZnRfTc8HO3iEHtbU,3167
 warp_beacon/scraper/exceptions.py,sha256=lHsPrYy5iYnHsIdUHqRxZmzlqrkNj_TS4TkiTJfWhTs,1326
@@ -37,9 +37,9 @@ warp_beacon/telegram/handlers.py,sha256=xSNG_v4D4FaA5q1_5wXvJkjcDUhy5GaQnfpijJZp
 warp_beacon/telegram/placeholder_message.py,sha256=32U-R_IMPRJd-S5UwlpemLkArJOxCmO7whcynduSbMA,6418
 warp_beacon/telegram/utils.py,sha256=CeWXMwyzv2l4Af6I-wW2ySU490c-5k82sBhkjabv0n4,2452
 warp_beacon/uploader/__init__.py,sha256=rsUkzzmtaeQY-kNkcIiPsrayS9idFKY3hBC71mR19XE,4743
-warp_beacon-2.2.22.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.2.22.dist-info/METADATA,sha256=fxe1Q23TP--xWQN2HXosXUdCcr4BWnV2pG4tzr7l_30,21251
-warp_beacon-2.2.22.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-warp_beacon-2.2.22.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.2.22.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
-warp_beacon-2.2.22.dist-info/RECORD,,
+warp_beacon-2.2.24.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.2.24.dist-info/METADATA,sha256=w7KmHqfjMGQ79SSE5KICEn-plclCtsqrG5JIJ-9AUCg,21251
+warp_beacon-2.2.24.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+warp_beacon-2.2.24.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.2.24.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
+warp_beacon-2.2.24.dist-info/RECORD,,