warp-beacon 2.6.21__tar.gz → 2.6.22__tar.gz

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 (62) hide show
  1. {warp_beacon-2.6.21/warp_beacon.egg-info → warp_beacon-2.6.22}/PKG-INFO +1 -1
  2. warp_beacon-2.6.22/warp_beacon/__version__.py +2 -0
  3. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/__init__.py +11 -2
  4. {warp_beacon-2.6.21 → warp_beacon-2.6.22/warp_beacon.egg-info}/PKG-INFO +1 -1
  5. warp_beacon-2.6.21/warp_beacon/__version__.py +0 -2
  6. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/LICENSE +0 -0
  7. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/MANIFEST.in +0 -0
  8. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/README.md +0 -0
  9. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/assets/placeholder.gif +0 -0
  10. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/etc/.gitignore +0 -0
  11. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/etc/accounts.json +0 -0
  12. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/etc/proxies.json +0 -0
  13. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/etc/warp_beacon.conf +0 -0
  14. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/etc/warp_beacon.service +0 -0
  15. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/pyproject.toml +0 -0
  16. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/setup.cfg +0 -0
  17. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/setup.py +0 -0
  18. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/__init__.py +0 -0
  19. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/compress/__init__.py +0 -0
  20. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/compress/video.py +0 -0
  21. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/jobs/__init__.py +0 -0
  22. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/jobs/abstract.py +0 -0
  23. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/jobs/download_job.py +0 -0
  24. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/jobs/types.py +0 -0
  25. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/jobs/upload_job.py +0 -0
  26. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/mediainfo/__init__.py +0 -0
  27. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/mediainfo/abstract.py +0 -0
  28. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/mediainfo/audio.py +0 -0
  29. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/mediainfo/silencer.py +0 -0
  30. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/mediainfo/video.py +0 -0
  31. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scheduler/__init__.py +0 -0
  32. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scheduler/instagram_human.py +0 -0
  33. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scheduler/scheduler.py +0 -0
  34. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/abstract.py +0 -0
  35. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/account_selector.py +0 -0
  36. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/exceptions.py +0 -0
  37. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/fail_handler.py +0 -0
  38. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/instagram/__init__.py +0 -0
  39. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/instagram/captcha.py +0 -0
  40. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/instagram/instagram.py +0 -0
  41. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/link_resolver.py +0 -0
  42. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/youtube/__init__.py +0 -0
  43. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/youtube/abstract.py +0 -0
  44. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/youtube/music.py +0 -0
  45. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/youtube/shorts.py +0 -0
  46. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/youtube/youtube.py +0 -0
  47. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/storage/__init__.py +0 -0
  48. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/storage/mongo.py +0 -0
  49. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/telegram/__init__.py +0 -0
  50. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/telegram/bot.py +0 -0
  51. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/telegram/caption_shortener.py +0 -0
  52. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/telegram/handlers.py +0 -0
  53. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/telegram/placeholder_message.py +0 -0
  54. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/telegram/utils.py +0 -0
  55. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/uploader/__init__.py +0 -0
  56. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/warp_beacon.py +0 -0
  57. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/yt_auth.py +0 -0
  58. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon.egg-info/SOURCES.txt +0 -0
  59. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon.egg-info/dependency_links.txt +0 -0
  60. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon.egg-info/entry_points.txt +0 -0
  61. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon.egg-info/requires.txt +0 -0
  62. {warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon.egg-info/top_level.txt +0 -0
{warp_beacon-2.6.21/warp_beacon.egg-info → warp_beacon-2.6.22}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: warp_beacon
3
- Version: 2.6.21
3
+ Version: 2.6.22
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.22/warp_beacon/__version__.py ADDED
@@ -0,0 +1,2 @@
1
+ __version__ = "2.6.22"
2
+
{warp_beacon-2.6.21 → warp_beacon-2.6.22}/warp_beacon/scraper/__init__.py RENAMED
@@ -97,10 +97,12 @@ class AsyncDownloader(object):
97
97
  logging.info("download worker started")
98
98
  # pymongo is not fork-safe so new connect to DB required
99
99
  fail_handler = FailHandler(DBClient())
100
+ last_proxy = None
100
101
  while self.allow_loop.value == 1:
101
102
  try:
102
103
  job: DownloadJob = None
103
104
  actor = None
105
+ proxy = None
104
106
  try:
105
107
  job = self.job_queue.get()
106
108
  if job is self.__JOE_BIDEN_WAKEUP:
@@ -122,8 +124,12 @@ class AsyncDownloader(object):
122
124
  time.sleep(2)
123
125
  self.job_queue.put(job)
124
126
  continue
125
- self.acc_selector.set_module(job.job_origin)
126
- proxy = selector.get_current_proxy()
127
+ selector.set_module(job.job_origin)
128
+ # use same proxy as in content request before
129
+ if job.scroll_content:
130
+ proxy = last_proxy
131
+ else:
132
+ proxy = selector.get_current_proxy()
127
133
  if job.job_origin is Origin.INSTAGRAM:
128
134
  from warp_beacon.scraper.instagram.instagram import InstagramScraper
129
135
  actor = InstagramScraper(selector.get_current(), proxy)
@@ -292,6 +298,9 @@ class AsyncDownloader(object):
292
298
  ))
293
299
  break
294
300
 
301
+ actor.restore_gai()
302
+ last_proxy = proxy
303
+
295
304
  if items:
296
305
  # success
297
306
  for job in fail_handler.get_failed_jobs():
{warp_beacon-2.6.21 → warp_beacon-2.6.22/warp_beacon.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: warp_beacon
3
- Version: 2.6.21
3
+ Version: 2.6.22
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.21/warp_beacon/__version__.py DELETED
@@ -1,2 +0,0 @@
1
- __version__ = "2.6.21"
2
-
{warp_beacon-2.6.21 → warp_beacon-2.6.22}/LICENSE RENAMED
File without changes
{warp_beacon-2.6.21 → warp_beacon-2.6.22}/MANIFEST.in RENAMED
File without changes
{warp_beacon-2.6.21 → warp_beacon-2.6.22}/README.md RENAMED
File without changes
{warp_beacon-2.6.21 → warp_beacon-2.6.22}/setup.cfg RENAMED
File without changes
{warp_beacon-2.6.21 → warp_beacon-2.6.22}/setup.py RENAMED
File without changes