warp-beacon 2.3.42__py3-none-any.whl → 2.3.44__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 (10) hide show
  1. warp_beacon/__version__.py +1 -1
  2. warp_beacon/scraper/youtube/abstract.py +7 -6
  3. warp_beacon/scraper/youtube/music.py +2 -2
  4. warp_beacon/scraper/youtube/shorts.py +2 -2
  5. {warp_beacon-2.3.42.dist-info → warp_beacon-2.3.44.dist-info}/METADATA +1 -1
  6. {warp_beacon-2.3.42.dist-info → warp_beacon-2.3.44.dist-info}/RECORD +10 -10
  7. {warp_beacon-2.3.42.dist-info → warp_beacon-2.3.44.dist-info}/WHEEL +0 -0
  8. {warp_beacon-2.3.42.dist-info → warp_beacon-2.3.44.dist-info}/entry_points.txt +0 -0
  9. {warp_beacon-2.3.42.dist-info → warp_beacon-2.3.44.dist-info}/licenses/LICENSE +0 -0
  10. {warp_beacon-2.3.42.dist-info → warp_beacon-2.3.44.dist-info}/top_level.txt +0 -0
warp_beacon/__version__.py CHANGED
@@ -1,2 +1,2 @@
1
- __version__ = "2.3.42"
1
+ __version__ = "2.3.44"
2
2
 
warp_beacon/scraper/youtube/abstract.py CHANGED
@@ -219,10 +219,10 @@ class YoutubeAbstract(ScraperAbstract):
219
219
  requests.RequestException,
220
220
  urllib.error.URLError,
221
221
  urllib.error.HTTPError) as e:
222
- if hasattr(e, "code") and int(e.code) == 403:
222
+ if hasattr(e, "code") and (int(e.code) == 403 or int(e.code) == 400):
223
223
  raise Unavailable(extract_exception_message(e))
224
- logging.warning("Youtube read timeout! Retrying in %d seconds ...", pause_secs)
225
- logging.info("Your `YT_MAX_RETRIES` values is %d", max_retries)
224
+ logging.warning("Youtube read timeout! Retrying in '%d' seconds ...", pause_secs)
225
+ logging.info("Your `YT_MAX_RETRIES` values is '%d'", max_retries)
226
226
  logging.exception(extract_exception_message(e))
227
227
  if max_retries <= retries:
228
228
  self.remove_tmp_files()
@@ -286,7 +286,7 @@ class YoutubeAbstract(ScraperAbstract):
286
286
  time_name = str(time.time()).replace('.', '_')
287
287
  ydl_opts = {
288
288
  'socket_timeout': timeout,
289
- 'outtmpl': f'{self.DOWNLOAD_DIR}/{time_name}.%(ext)s',
289
+ 'outtmpl': f'{self.DOWNLOAD_DIR}/yt_download_{time_name}.%(ext)s',
290
290
  'format': 'bestvideo+bestaudio/best',
291
291
  'merge_output_format': 'mp4',
292
292
  'noplaylist': True,
@@ -301,16 +301,17 @@ class YoutubeAbstract(ScraperAbstract):
301
301
 
302
302
  return yt_dlp.YoutubeDL(ydl_opts)
303
303
 
304
- def _download(self, _: str, __: int = 60) -> list:
304
+ def _download(self, _: str, timeout: int = 60) -> list:
305
305
  raise NotImplementedError("You should to implement _download method")
306
306
 
307
- def _download_yt_dlp(self, _: str, __: int = 60) -> list:
307
+ def _download_yt_dlp(self, _: str, timeout: int = 60) -> list:
308
308
  raise NotImplementedError("You should to implement _download_yt_dlp method")
309
309
 
310
310
  def download(self, job: DownloadJob) -> list:
311
311
  ret = []
312
312
  try:
313
313
  ret = self.download_hndlr(self._download, job.url, session=True)
314
+ return ret
314
315
  except (Unavailable, TimeOut):
315
316
  logging.warning("Download failed, trying to download with yt_dlp")
316
317
 
warp_beacon/scraper/youtube/music.py CHANGED
@@ -11,7 +11,7 @@ from warp_beacon.scraper.exceptions import NotFound, FileTooBig
11
11
 
12
12
 
13
13
  class YoutubeMusicScraper(YoutubeAbstract):
14
- YT_MAX_RETRIES_DEFAULT = 6
14
+ YT_MAX_RETRIES_DEFAULT = 3
15
15
  YT_PAUSE_BEFORE_RETRY_DEFAULT = 3
16
16
  YT_TIMEOUT_DEFAULT = 2
17
17
  YT_TIMEOUT_INCREMENT_DEFAULT = 60
@@ -61,7 +61,7 @@ class YoutubeMusicScraper(YoutubeAbstract):
61
61
  time_name = str(time.time()).replace('.', '_')
62
62
  ydl_opts = {
63
63
  'socket_timeout': timeout,
64
- 'outtmpl': f'{self.DOWNLOAD_DIR}/{time_name}.%(ext)s',
64
+ 'outtmpl': f'{self.DOWNLOAD_DIR}/yt_download_{time_name}.%(ext)s',
65
65
  'format': 'bestaudio[ext=m4a]/bestaudio/best',
66
66
  'noplaylist': True,
67
67
  'keepvideo': False,
warp_beacon/scraper/youtube/shorts.py CHANGED
@@ -1,11 +1,11 @@
1
+ import logging
2
+
1
3
  from warp_beacon.jobs.types import JobType
2
4
  from warp_beacon.scraper.youtube.abstract import YoutubeAbstract
3
5
  from warp_beacon.scraper.exceptions import NotFound
4
6
 
5
7
  from warp_beacon.mediainfo.video import VideoInfo
6
8
 
7
- import logging
8
-
9
9
  class YoutubeShortsScraper(YoutubeAbstract):
10
10
  YT_MAX_RETRIES_DEFAULT = 8
11
11
  YT_PAUSE_BEFORE_RETRY_DEFAULT = 3
{warp_beacon-2.3.42.dist-info → warp_beacon-2.3.44.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: warp_beacon
3
- Version: 2.3.42
3
+ Version: 2.3.44
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.42.dist-info → warp_beacon-2.3.44.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=HdlmwXDCQDYN5w-6-W575xg8eNbdzr_LRa9GUAwlJV8,24
7
+ warp_beacon/__version__.py,sha256=4mQiTG01QRZR9DWdi-f-4XbeNcXK_HdGHLDMQE97HYs,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
@@ -30,9 +30,9 @@ warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5
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=PC4vuKilPInD8dY_QL2xd38hEYToFf4soeS3tk_IcS8,11709
34
- warp_beacon/scraper/youtube/music.py,sha256=dtS5_t3TToai2Ui05kjo9ecqz94G7g0K-5fAfw5pwGQ,2800
35
- warp_beacon/scraper/youtube/shorts.py,sha256=k3yGF9b8HTzNE6h4VE0zsMGB6kWP-V2xiLhIY3QZXvs,1269
33
+ warp_beacon/scraper/youtube/abstract.py,sha256=0ZfmPiCtzBbYQ6rkych7Es6GFi2Mw3CjoujassGO0_4,11773
34
+ warp_beacon/scraper/youtube/music.py,sha256=xe68GWbforWWPtgr75wYZA66-cGzK86vS-Cj1tyxVQQ,2812
35
+ warp_beacon/scraper/youtube/shorts.py,sha256=TVQP-Dm4ZV3bHd7u25yOpDHRzoXL3jUAszDb6ZW8p0U,1269
36
36
  warp_beacon/scraper/youtube/youtube.py,sha256=B1NBz6vv0-zIuf3MDmT2QB7eX2qO8k9orj7-4wU6MBk,2839
37
37
  warp_beacon/storage/__init__.py,sha256=0Vajd0oITKJfu2vmNx5uQSt3-L6vwIvUYWJo8HZCjco,3398
38
38
  warp_beacon/storage/mongo.py,sha256=qC4ZiO8XXvPnP0rJwz4CJx42pqFsyAjCiW10W5QdT6E,527
@@ -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.42.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
47
- warp_beacon-2.3.42.dist-info/METADATA,sha256=ZliwioNGg2vnLPNoHnkybvcqshw758tzdp51tQFAxNU,22626
48
- warp_beacon-2.3.42.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
49
- warp_beacon-2.3.42.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
50
- warp_beacon-2.3.42.dist-info/top_level.txt,sha256=qGjHVVfyf6lTmbdSA-fQq0rHS1YVS4HoJT3rag5xgPE,1141
51
- warp_beacon-2.3.42.dist-info/RECORD,,
46
+ warp_beacon-2.3.44.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
47
+ warp_beacon-2.3.44.dist-info/METADATA,sha256=komh1F3rqhR3Zy--VjsQAEU58k-GXXDr6KGpw_mkDDc,22626
48
+ warp_beacon-2.3.44.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
49
+ warp_beacon-2.3.44.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
50
+ warp_beacon-2.3.44.dist-info/top_level.txt,sha256=qGjHVVfyf6lTmbdSA-fQq0rHS1YVS4HoJT3rag5xgPE,1141
51
+ warp_beacon-2.3.44.dist-info/RECORD,,