warp-beacon 2.6.26__py3-none-any.whl → 2.6.28__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/scraper/__init__.py +13 -6
  3. warp_beacon/scraper/abstract.py +3 -2
  4. {warp_beacon-2.6.26.dist-info → warp_beacon-2.6.28.dist-info}/METADATA +1 -1
  5. {warp_beacon-2.6.26.dist-info → warp_beacon-2.6.28.dist-info}/RECORD +9 -9
  6. {warp_beacon-2.6.26.dist-info → warp_beacon-2.6.28.dist-info}/WHEEL +0 -0
  7. {warp_beacon-2.6.26.dist-info → warp_beacon-2.6.28.dist-info}/entry_points.txt +0 -0
  8. {warp_beacon-2.6.26.dist-info → warp_beacon-2.6.28.dist-info}/licenses/LICENSE +0 -0
  9. {warp_beacon-2.6.26.dist-info → warp_beacon-2.6.28.dist-info}/top_level.txt +0 -0
warp_beacon/__version__.py CHANGED
@@ -1,2 +1,2 @@
1
- __version__ = "2.6.26"
1
+ __version__ = "2.6.28"
2
2
 
warp_beacon/scraper/__init__.py CHANGED
@@ -38,6 +38,7 @@ class AsyncDownloader(object):
38
38
  manager = None
39
39
  acc_selector = None
40
40
  scheduler = None
41
+ scrolling_now = None
41
42
 
42
43
  def __init__(self, uploader: AsyncUploader, workers_count: int) -> None:
43
44
  self.workers = []
@@ -45,6 +46,7 @@ class AsyncDownloader(object):
45
46
  self.auth_event = multiprocessing.Event()
46
47
  self.manager = multiprocessing.Manager()
47
48
  self.allow_loop = self.manager.Value('i', 1)
49
+ self.scrolling_now = self.manager.Value('i', 0)
48
50
  self.acc_selector = AccountSelector(self.manager, ACC_FILE, PROXY_FILE)
49
51
  self.uploader = uploader
50
52
  self.workers_count = workers_count
@@ -156,10 +158,12 @@ class AsyncDownloader(object):
156
158
  while self.allow_loop.value == 1:
157
159
  try:
158
160
  if job.scroll_content and job.last_pk and job.job_origin is Origin.INSTAGRAM:
161
+ self.scrolling_now.value = 1
159
162
  logging.info("Scrolling relative content with pk '%s'", job.last_pk)
160
163
  operations = actor.scroll_content(last_pk=job.last_pk)
161
164
  if operations:
162
165
  selector.inc_ig_request_count(amount=operations)
166
+ self.scrolling_now.value = 0
163
167
  logging.info("Scrolling done")
164
168
  break
165
169
  if job.session_validation and job.job_origin in (Origin.INSTAGRAM, Origin.YOUTUBE):
@@ -382,12 +386,15 @@ class AsyncDownloader(object):
382
386
  else:
383
387
  self.uploader.queue_task(upload_job)
384
388
  # watch related reels to simulate human
385
- if item.get("last_pk", 0) and "reel/" in job.url:
386
- self.queue_task(DownloadJob.build(
387
- scroll_content=True,
388
- last_pk=int(item.get("last_pk", 0)),
389
- job_origin=Origin.INSTAGRAM
390
- ))
389
+ if self.scrolling_now.value == 0:
390
+ if item.get("last_pk", 0) and "reel/" in job.url:
391
+ self.queue_task(DownloadJob.build(
392
+ scroll_content=True,
393
+ last_pk=int(item.get("last_pk", 0)),
394
+ job_origin=Origin.INSTAGRAM
395
+ ))
396
+ else:
397
+ logging.info("Scrolling in progress, ignoring request")
391
398
  else:
392
399
  logging.info("Job already in work in parallel worker. Redirecting job to upload worker.")
393
400
  self.uploader.queue_task(job.to_upload_job())
warp_beacon/scraper/abstract.py CHANGED
@@ -27,8 +27,8 @@ class ScraperAbstract(ABC):
27
27
  self.account_index = account[0]
28
28
  self.account = account[1]
29
29
  self.proxy = proxy
30
- if self.account.get("force_ipv6", False):
31
- self.force_ipv6()
30
+ #if self.account.get("force_ipv6", False):
31
+ # self.force_ipv6()
32
32
 
33
33
  #def __del__(self) -> None:
34
34
  # if self.account.get("force_ipv6", False):
@@ -95,6 +95,7 @@ class ScraperAbstract(ABC):
95
95
  urllib3_cn.allowed_gai_family = allowed_gai_family
96
96
 
97
97
  def restore_gai(self) -> None:
98
+ return
98
99
  with self._gai_lock:
99
100
  if self.original_gai_family:
100
101
  logging.info("Restoring normal IP stack ...")
{warp_beacon-2.6.26.dist-info → warp_beacon-2.6.28.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: warp_beacon
3
- Version: 2.6.26
3
+ Version: 2.6.28
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.26.dist-info → warp_beacon-2.6.28.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=yOnyPY0jevOyTw01yj_94udNLyi0d1kaHETfAHTTnvw,24
7
+ warp_beacon/__version__.py,sha256=lm319kmYh-EyLU16ounsuDpeXb16LYXQRbw4o8SY6Lw,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,8 +22,8 @@ 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=CKTDGIGrcIvqhzr9nTHcf3nHNAXEFOSsJa3-a0oaOec,7381
24
24
  warp_beacon/scheduler/scheduler.py,sha256=9OCh7Ta4wY_aTHGAOOZmaKXg56Ftx1N_aV1g6E3ZLKA,4941
25
- warp_beacon/scraper/__init__.py,sha256=XasVMjJZFf7Xgks6qpEKEXElAkT2ugDJN4O_v--w7kg,19515
26
- warp_beacon/scraper/abstract.py,sha256=8n24kJVAZcsl6wHzpCHvdhO2UXLMnBsN6B4ymcZ2h70,2974
25
+ warp_beacon/scraper/__init__.py,sha256=QH4FuBmIXuVgv45r1loc_teR4iCUNaUZ2vGY3CG-n2k,19795
26
+ warp_beacon/scraper/abstract.py,sha256=yP76ae9U73LYW2lDN6XWkXDkWX1h2UVOrkqv0Sqpu2Y,2985
27
27
  warp_beacon/scraper/account_selector.py,sha256=nFqN-fPWxx7H7tOcdweZpGuv2TVN9isnziqb-HXsSmc,7888
28
28
  warp_beacon/scraper/exceptions.py,sha256=EKwoF0oH2xZWbNU-v8DOaWK5skKwa3s1yTIBdlcfMpc,1452
29
29
  warp_beacon/scraper/fail_handler.py,sha256=zcPK3ZVEsu6JmHYcWP7L3naTRK3gWFVRkpP84VBOtJs,964
@@ -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.26.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
49
- warp_beacon-2.6.26.dist-info/METADATA,sha256=FbKXCb8RQzMZIIQzXApga4Ynpm2p5as_rSZT4AoG3d4,22706
50
- warp_beacon-2.6.26.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
51
- warp_beacon-2.6.26.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
52
- warp_beacon-2.6.26.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
53
- warp_beacon-2.6.26.dist-info/RECORD,,
48
+ warp_beacon-2.6.28.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
49
+ warp_beacon-2.6.28.dist-info/METADATA,sha256=K1gg_rss-m7gEENsXTD7TKkNxhdyPmbmLVyHOLCKqUc,22706
50
+ warp_beacon-2.6.28.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
51
+ warp_beacon-2.6.28.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
52
+ warp_beacon-2.6.28.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
53
+ warp_beacon-2.6.28.dist-info/RECORD,,