warp-beacon 2.6.20__py3-none-any.whl → 2.6.22__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 (9) hide show
  1. warp_beacon/__version__.py +1 -1
  2. warp_beacon/scheduler/instagram_human.py +4 -4
  3. warp_beacon/scraper/__init__.py +11 -2
  4. {warp_beacon-2.6.20.dist-info → warp_beacon-2.6.22.dist-info}/METADATA +1 -1
  5. {warp_beacon-2.6.20.dist-info → warp_beacon-2.6.22.dist-info}/RECORD +9 -9
  6. {warp_beacon-2.6.20.dist-info → warp_beacon-2.6.22.dist-info}/WHEEL +0 -0
  7. {warp_beacon-2.6.20.dist-info → warp_beacon-2.6.22.dist-info}/entry_points.txt +0 -0
  8. {warp_beacon-2.6.20.dist-info → warp_beacon-2.6.22.dist-info}/licenses/LICENSE +0 -0
  9. {warp_beacon-2.6.20.dist-info → warp_beacon-2.6.22.dist-info}/top_level.txt +0 -0
warp_beacon/__version__.py CHANGED
@@ -1,2 +1,2 @@
1
- __version__ = "2.6.20"
1
+ __version__ = "2.6.22"
2
2
 
warp_beacon/scheduler/instagram_human.py CHANGED
@@ -19,11 +19,11 @@ class InstagramHuman(object):
19
19
  def watch_content(self, media: list) -> None:
20
20
  for m in media[:random.randint(2, 4)]:
21
21
  try:
22
- logging.info("Wathing content with pk '%d'", m.pk)
22
+ logging.info("Wathing content with pk '%s'", str(m.pk))
23
23
  content = self.scrapler.cl.media_info(m.pk)
24
- logging.info("Watched content with id '%d'", content.pk)
24
+ logging.info("Watched content with id '%s'", str(content.pk))
25
25
  self.operations_count += 1
26
- time.sleep(random.uniform(2, 5))
26
+ time.sleep(random.uniform(2, 10))
27
27
  except Exception as e:
28
28
  logging.warning("Exception while watching content")
29
29
  logging.exception(e)
@@ -36,7 +36,7 @@ class InstagramHuman(object):
36
36
  self.watch_content(media)
37
37
 
38
38
  if random.random() > 0.3:
39
- time.sleep(random.uniform(2, 5))
39
+ time.sleep(random.uniform(2, 20))
40
40
  logging.info("Starting to explore reels with media_pk '%d'", last_pk)
41
41
  media = self.scrapler.download_hndlr(self.scrapler.cl.explore_reels, amount=random.randint(4, 10), last_media_pk=last_pk)
42
42
  self.operations_count += 1
warp_beacon/scraper/__init__.py CHANGED
@@ -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.20.dist-info → warp_beacon-2.6.22.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: warp_beacon
3
- Version: 2.6.20
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.20.dist-info → warp_beacon-2.6.22.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=tkB5g-41F0BOgpnj-O6BzalX9VmVmpUgyr5CdOZOHvY,24
7
+ warp_beacon/__version__.py,sha256=IjSdeFP20tr5hq5aAS29TH7xoULoazrzgG23feOSILI,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
@@ -20,9 +20,9 @@ warp_beacon/mediainfo/audio.py,sha256=ous88kwQj4bDIChN5wnGil5LqTs0IQHH0d-nyrL0-Z
20
20
  warp_beacon/mediainfo/silencer.py,sha256=qxMuViOoVwUYb60uCVvqHiGrqByR1_4_rqMT-XdMkwc,1813
21
21
  warp_beacon/mediainfo/video.py,sha256=UBZrhTN5IDI-aYu6tsJEILo9nFkjHhkldGVFmvV7tEI,2480
22
22
  warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
23
- warp_beacon/scheduler/instagram_human.py,sha256=yoOcWlQQVfvJn3nD5u_VnO9jn0e_OWRvIGY9kLjPFUk,7369
23
+ warp_beacon/scheduler/instagram_human.py,sha256=vUjiZKDcorUb1weGoLzo0DZtcpNFLtdV5_Jkl8Eyum4,7381
24
24
  warp_beacon/scheduler/scheduler.py,sha256=9OCh7Ta4wY_aTHGAOOZmaKXg56Ftx1N_aV1g6E3ZLKA,4941
25
- warp_beacon/scraper/__init__.py,sha256=xE4W2sDBQAGT9Pv1SKLAb5WIiO8kdBnPpbFEADMCxi8,19167
25
+ warp_beacon/scraper/__init__.py,sha256=se7-CKxzmMtJKqPhRVYly44X_E7tqfhFINkxtlS6FD4,19373
26
26
  warp_beacon/scraper/abstract.py,sha256=HZCglECO13XN3Yjvgt6n9JirxZ1A-8tsE8RudihC4HE,3004
27
27
  warp_beacon/scraper/account_selector.py,sha256=wm8XO020QSvJO43TG7G06a17G0lFtNdx17V8mC8vKbs,7783
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.20.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
49
- warp_beacon-2.6.20.dist-info/METADATA,sha256=qAlppG0tD7OQ0kcZ-baAJsC2v4GbzJ2fyVILDvlh5Bk,22706
50
- warp_beacon-2.6.20.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
51
- warp_beacon-2.6.20.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
52
- warp_beacon-2.6.20.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
53
- warp_beacon-2.6.20.dist-info/RECORD,,
48
+ warp_beacon-2.6.22.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
49
+ warp_beacon-2.6.22.dist-info/METADATA,sha256=wD5d4-4rrpvrH3zPuH4rfaY_qbtzmEPU2vksFO-SfW0,22706
50
+ warp_beacon-2.6.22.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
51
+ warp_beacon-2.6.22.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
52
+ warp_beacon-2.6.22.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
53
+ warp_beacon-2.6.22.dist-info/RECORD,,