warp-beacon 2.3.34__py3-none-any.whl → 2.3.36__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/account_selector.py +2 -2
  3. warp_beacon/scraper/youtube/abstract.py +8 -3
  4. {warp_beacon-2.3.34.dist-info → warp_beacon-2.3.36.dist-info}/METADATA +1 -1
  5. {warp_beacon-2.3.34.dist-info → warp_beacon-2.3.36.dist-info}/RECORD +9 -9
  6. {warp_beacon-2.3.34.dist-info → warp_beacon-2.3.36.dist-info}/LICENSE +0 -0
  7. {warp_beacon-2.3.34.dist-info → warp_beacon-2.3.36.dist-info}/WHEEL +0 -0
  8. {warp_beacon-2.3.34.dist-info → warp_beacon-2.3.36.dist-info}/entry_points.txt +0 -0
  9. {warp_beacon-2.3.34.dist-info → warp_beacon-2.3.36.dist-info}/top_level.txt +0 -0
warp_beacon/__version__.py CHANGED
@@ -1,2 +1,2 @@
1
- __version__ = "2.3.34"
1
+ __version__ = "2.3.36"
2
2
 
warp_beacon/scraper/account_selector.py CHANGED
@@ -98,7 +98,7 @@ class AccountSelector(object):
98
98
  def next(self) -> dict:
99
99
  idx = self.account_index[self.current_module_name].value
100
100
  idx += 1
101
- if idx > len(self.accounts[self.current_module_name]):
101
+ if idx >= len(self.accounts[self.current_module_name]):
102
102
  idx = 0
103
103
  self.account_index[self.current_module_name].value = idx
104
104
  self.current = self.accounts[self.current_module_name][idx]
@@ -110,7 +110,7 @@ class AccountSelector(object):
110
110
  idx = self.account_index[self.current_module_name].value
111
111
  meta_list = self.accounts_meta_data[self.current_module_name]
112
112
  if idx >= len(meta_list):
113
- logging.warning("Index %d out of range for module '%s' with length '%d'", idx, self.current_module_name, len(meta_list))
113
+ logging.warning("Index '%d' out of range for module '%s' with length '%d'", idx, self.current_module_name, len(meta_list))
114
114
  return 0
115
115
  self.accounts_meta_data[self.current_module_name][idx][key] += amount
116
116
  return meta_list[idx][key]
warp_beacon/scraper/youtube/abstract.py CHANGED
@@ -240,11 +240,16 @@ class YoutubeAbstract(ScraperAbstract):
240
240
  proxy_dsn = self.proxy.get("dsn", "")
241
241
  if proxy_dsn:
242
242
  logging.info("Using proxy DSN '%s'", proxy_dsn)
243
- yt_opts["proxies"] = {"http": proxy_dsn, "https": proxy_dsn}
243
+ if "https://" in proxy_dsn:
244
+ yt_opts["proxies"] = {"https": proxy_dsn}
245
+ elif "http://" in proxy_dsn:
246
+ yt_opts["proxies"] = {"http": proxy_dsn}
247
+ else:
248
+ logging.warning("Proxy DSN malformed!")
244
249
  return YouTube(**yt_opts)
245
250
 
246
- def _download(self, url: str) -> list:
247
- raise NotImplementedError("Implement _download method")
251
+ def _download(self, _: str) -> list:
252
+ raise NotImplementedError("You should to implement _download method")
248
253
 
249
254
  def download(self, job: DownloadJob) -> list:
250
255
  return self.download_hndlr(self._download, job.url)
{warp_beacon-2.3.34.dist-info → warp_beacon-2.3.36.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: warp_beacon
3
- Version: 2.3.34
3
+ Version: 2.3.36
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.3.34.dist-info → warp_beacon-2.3.36.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=kTzQDEbBtPwo1jOI0y0AFHtty8XE32u2ORgwCdTq0HQ,24
7
+ warp_beacon/__version__.py,sha256=vhS365fVuev0xp7fexaRILrS-ld_VdSvV677HuiGsnM,24
8
8
  warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
9
9
  warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
10
10
  warp_beacon/compress/video.py,sha256=_PDMVYCyzLYxHv1uZmmzGcG_8rjaZr7BTXsXTTy_oS4,2846
@@ -23,14 +23,14 @@ warp_beacon/scheduler/instagram_human.py,sha256=b_Ec775QchL88X3JEZeO3EYrQ9Cj1BjV
23
23
  warp_beacon/scheduler/scheduler.py,sha256=2y2eDBxkE5vHRpSVcV-mwYnxFuueMalK3LOhgUecNSA,2796
24
24
  warp_beacon/scraper/__init__.py,sha256=V_C5SmAmRtjFfVBtTotOHCW3ILMQ8m_ulrBF6ry59_A,16944
25
25
  warp_beacon/scraper/abstract.py,sha256=28a0aBKZpi8IKptLWdB6RuVbOkrUbrhT7LSZX7QRQtg,2725
26
- warp_beacon/scraper/account_selector.py,sha256=D_L9zwmRmvGBBEg5uUU3DmLwXnKnADwF16-QGXvlrjc,5313
26
+ warp_beacon/scraper/account_selector.py,sha256=oqwtyT2_xBYkx_7ysoz0VLa-x8EpiBifmF12MUNLCW8,5316
27
27
  warp_beacon/scraper/exceptions.py,sha256=Qkz76yo-X5kucEZIP9tWaK-oYO-kvsPEl8Y0W63oDhU,1300
28
28
  warp_beacon/scraper/fail_handler.py,sha256=_blvckfTZ4xWVancQKVRXH5ClKGwfrBxMwvXIFZh1qA,975
29
29
  warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5ripx7tM,2447
30
30
  warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
31
31
  warp_beacon/scraper/instagram/instagram.py,sha256=TpIBS9S3zcLbeGax4CENVo6WP75EE6oIttc-MjWYVjs,13815
32
32
  warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
33
- warp_beacon/scraper/youtube/abstract.py,sha256=fF22knm5h4V9PupGP-vcJ_KPXrW3_qNpSSG5DvQFZAk,9241
33
+ warp_beacon/scraper/youtube/abstract.py,sha256=4oyx2QTHu1LHD0DKcWXWmBu9oIak_zaOUbFgUpJATi4,9401
34
34
  warp_beacon/scraper/youtube/music.py,sha256=MObH7rU6qmg6xG3rRkO4iqmhm8uF4UlF2OqfF4G1eec,1379
35
35
  warp_beacon/scraper/youtube/shorts.py,sha256=Ij4IVCOfYGHvmbRbrE4Zli0GiHlM4qhd9wiUzr6qeUE,1230
36
36
  warp_beacon/scraper/youtube/youtube.py,sha256=Fz_svj9h7tam4UIfyYgxu6kRgPgdTmPeULmefLE-z2c,2134
@@ -43,9 +43,9 @@ warp_beacon/telegram/handlers.py,sha256=XXIfdV_RCj7tyZMPXchuKmGoDdweOaR08ADDaBPW
43
43
  warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
44
44
  warp_beacon/telegram/utils.py,sha256=9uebX53G16mV7ER7WgfdWBLFHHw14S8HBt9URrIskg0,4440
45
45
  warp_beacon/uploader/__init__.py,sha256=E9rlZIf7xlQz6MutMOwJ8S5Vm2uheR5nv23Kv8duRQg,5427
46
- warp_beacon-2.3.34.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
47
- warp_beacon-2.3.34.dist-info/METADATA,sha256=vtoS9nprN_h-MhfqL9DP0oy0BXtw8AnWj-WDOdACe7g,21723
48
- warp_beacon-2.3.34.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
49
- warp_beacon-2.3.34.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
50
- warp_beacon-2.3.34.dist-info/top_level.txt,sha256=qGjHVVfyf6lTmbdSA-fQq0rHS1YVS4HoJT3rag5xgPE,1141
51
- warp_beacon-2.3.34.dist-info/RECORD,,
46
+ warp_beacon-2.3.36.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
47
+ warp_beacon-2.3.36.dist-info/METADATA,sha256=mhh_fss7D1i0oZgN3Dg80jwCDqaV0G8T-_NCiS3YICk,21723
48
+ warp_beacon-2.3.36.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
49
+ warp_beacon-2.3.36.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
50
+ warp_beacon-2.3.36.dist-info/top_level.txt,sha256=qGjHVVfyf6lTmbdSA-fQq0rHS1YVS4HoJT3rag5xgPE,1141
51
+ warp_beacon-2.3.36.dist-info/RECORD,,