warp-beacon 2.6.14__py3-none-any.whl → 2.6.16__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. warp_beacon/__version__.py +1 -1
  2. warp_beacon/scraper/__init__.py +17 -22
  3. {warp_beacon-2.6.14.dist-info → warp_beacon-2.6.16.dist-info}/METADATA +1 -1
  4. {warp_beacon-2.6.14.dist-info → warp_beacon-2.6.16.dist-info}/RECORD +8 -8
  5. {warp_beacon-2.6.14.dist-info → warp_beacon-2.6.16.dist-info}/WHEEL +0 -0
  6. {warp_beacon-2.6.14.dist-info → warp_beacon-2.6.16.dist-info}/entry_points.txt +0 -0
  7. {warp_beacon-2.6.14.dist-info → warp_beacon-2.6.16.dist-info}/licenses/LICENSE +0 -0
  8. {warp_beacon-2.6.14.dist-info → warp_beacon-2.6.16.dist-info}/top_level.txt +0 -0
warp_beacon/__version__.py CHANGED
@@ -1,2 +1,2 @@
1
- __version__ = "2.6.14"
1
+ __version__ = "2.6.16"
2
2
 
warp_beacon/scraper/__init__.py CHANGED
@@ -100,11 +100,11 @@ class AsyncDownloader(object):
100
100
  while self.allow_loop.value == 1:
101
101
  try:
102
102
  job: DownloadJob = None
103
+ actor = None
103
104
  try:
104
105
  job = self.job_queue.get()
105
106
  if job is self.__JOE_BIDEN_WAKEUP:
106
107
  break
107
- actor = None
108
108
  try:
109
109
  items = []
110
110
  if job.job_origin is Origin.UNKNOWN:
@@ -249,27 +249,6 @@ class AsyncDownloader(object):
249
249
  f"Task <code>{job.job_id}</code> failed. URL: '{job.url}'. Reason: '<b>YotubeAgeRestrictedError</b>'."
250
250
  )
251
251
  break
252
- except AllAccountsFailed as e:
253
- logging.error("All accounts failed!")
254
- logging.exception(e)
255
- self.send_message_to_admin(
256
- f"Task <code>{e.job.job_id}</code> failed. URL: '{e.job.url}'. Reason: '<b>AllAccountsFailed</b>'."
257
- )
258
- self.uploader.queue_task(e.job.to_upload_job(
259
- job_failed=True,
260
- job_failed_msg="All bot accounts failed to download content. Bot administrator noticed about the issue.")
261
- )
262
- if e.job.job_origin == Origin.INSTAGRAM:
263
- logging.info("Handling captcha postpone")
264
- self.uploader.queue_task(job.to_upload_job(
265
- job_warning=True,
266
- job_warning_msg="Bot is experiencing issues, video delivery may be delayed.")
267
- )
268
- #self.try_next_account(selector, job, report_error="captcha")
269
- #e.job.job_postponed_until = time.time() + 300
270
- #self.job_queue.put(e.job)
271
- fail_handler.store_failed_job(e.job)
272
- break
273
252
  except (UnknownError, Exception) as e:
274
253
  logging.warning("UnknownError occurred!")
275
254
  logging.exception(e)
@@ -385,6 +364,22 @@ class AsyncDownloader(object):
385
364
  else:
386
365
  logging.info("Job already in work in parallel worker. Redirecting job to upload worker.")
387
366
  self.uploader.queue_task(job.to_upload_job())
367
+
368
+ except AllAccountsFailed as e:
369
+ self.send_message_to_admin(
370
+ f"Task <code>{job.job_id}</code> failed. URL: '{job.url}'. Reason: '<b>AllAccountsFailed</b>'."
371
+ )
372
+ if job.job_origin == Origin.INSTAGRAM:
373
+ logging.info("Handling captcha postpone")
374
+ self.uploader.queue_task(job.to_upload_job(
375
+ job_warning=True,
376
+ job_warning_msg="The bot is currently experiencing technical issues. Message delivery may be delayed.")
377
+ )
378
+ #self.try_next_account(selector, job, report_error="captcha")
379
+ #e.job.job_postponed_until = time.time() + 300
380
+ #self.job_queue.put(e.job)
381
+ fail_handler.store_failed_job(job)
382
+ self.notify_task_failed(job)
388
383
  except Exception as e:
389
384
  logging.error("Error inside download worker!")
390
385
  logging.exception(e)
{warp_beacon-2.6.14.dist-info → warp_beacon-2.6.16.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: warp_beacon
3
- Version: 2.6.14
3
+ Version: 2.6.16
4
4
  Summary: Telegram bot for expanding external media links
5
5
  Home-page: https://github.com/sb0y/warp_beacon
6
6
  Author: Andrey Bagrintsev
{warp_beacon-2.6.14.dist-info → warp_beacon-2.6.16.dist-info}/RECORD RENAMED
@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
4
4
  var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
5
5
  var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
6
6
  warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
7
- warp_beacon/__version__.py,sha256=_-MdVWca4Czj9HpJDvK5U1aSpI1jLdult6-XPJpay_c,24
7
+ warp_beacon/__version__.py,sha256=_HAv3oyJbZUecRNkP_7IK0YRdwc_mi9wvBZjV2lASVc,24
8
8
  warp_beacon/warp_beacon.py,sha256=ED43vNzdjDUJ_9qLCbri0bjWLWEJ69BENGj9i7G6AvM,342
9
9
  warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
10
10
  warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,7 +22,7 @@ warp_beacon/mediainfo/video.py,sha256=UBZrhTN5IDI-aYu6tsJEILo9nFkjHhkldGVFmvV7tE
22
22
  warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
23
23
  warp_beacon/scheduler/instagram_human.py,sha256=buF6rJzp8gVZvHBAXEkAL-uJjm5iQkEWnfPgwM2oH8g,6276
24
24
  warp_beacon/scheduler/scheduler.py,sha256=9OCh7Ta4wY_aTHGAOOZmaKXg56Ftx1N_aV1g6E3ZLKA,4941
25
- warp_beacon/scraper/__init__.py,sha256=ZfD_rn2k413r_BTmxakpOYsFXeuVVWOhDXv--_5cKNY,18808
25
+ warp_beacon/scraper/__init__.py,sha256=RCFLxirEd-4VYg16VWhqYU6QnkVa1bqIy9auJ5YcWFE,18522
26
26
  warp_beacon/scraper/abstract.py,sha256=CiOyKCxVYWhPnOUpLAVIRNuHBftN6gmxqATdhjzkaS4,2852
27
27
  warp_beacon/scraper/account_selector.py,sha256=mYNxAyAJj4ie9wMMkfb7ONjvAicS8xPEfE3iIe4gCog,6965
28
28
  warp_beacon/scraper/exceptions.py,sha256=EKwoF0oH2xZWbNU-v8DOaWK5skKwa3s1yTIBdlcfMpc,1452
@@ -45,9 +45,9 @@ warp_beacon/telegram/handlers.py,sha256=uvR6TPHSqdSxigp3wR-ewiE6t3TvVcbVLVcYGwkg
45
45
  warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
46
46
  warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
47
47
  warp_beacon/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
48
- warp_beacon-2.6.14.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
49
- warp_beacon-2.6.14.dist-info/METADATA,sha256=FiGrANligHA5XoSyntMCOPbXrhYWcohYgi07Y3jOYDs,22706
50
- warp_beacon-2.6.14.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
51
- warp_beacon-2.6.14.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
52
- warp_beacon-2.6.14.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
53
- warp_beacon-2.6.14.dist-info/RECORD,,
48
+ warp_beacon-2.6.16.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
49
+ warp_beacon-2.6.16.dist-info/METADATA,sha256=jR0xqC3nW8Qmuaan-tFBX8K1j3Toao2PyYZ6yCSkaqo,22706
50
+ warp_beacon-2.6.16.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
51
+ warp_beacon-2.6.16.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
52
+ warp_beacon-2.6.16.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
53
+ warp_beacon-2.6.16.dist-info/RECORD,,