warp-beacon 2.3.42__tar.gz → 2.3.43__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.
- {warp_beacon-2.3.42/warp_beacon.egg-info → warp_beacon-2.3.43}/PKG-INFO +1 -1
- warp_beacon-2.3.43/warp_beacon/__version__.py +2 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scraper/youtube/abstract.py +4 -4
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scraper/youtube/music.py +2 -2
- {warp_beacon-2.3.42 → warp_beacon-2.3.43/warp_beacon.egg-info}/PKG-INFO +1 -1
- warp_beacon-2.3.42/warp_beacon/__version__.py +0 -2
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/LICENSE +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/MANIFEST.in +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/README.md +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/assets/placeholder.gif +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/etc/.gitignore +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/etc/accounts.json +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/etc/proxies.json +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/etc/warp_beacon.conf +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/etc/warp_beacon.service +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/pyproject.toml +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/setup.cfg +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/setup.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/__init__.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/compress/__init__.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/compress/video.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/jobs/__init__.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/jobs/abstract.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/jobs/download_job.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/jobs/types.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/jobs/upload_job.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/mediainfo/__init__.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/mediainfo/abstract.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/mediainfo/audio.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/mediainfo/silencer.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/mediainfo/video.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scheduler/__init__.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scheduler/instagram_human.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scheduler/scheduler.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scraper/__init__.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scraper/abstract.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scraper/account_selector.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scraper/exceptions.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scraper/fail_handler.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scraper/instagram/__init__.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scraper/instagram/instagram.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scraper/link_resolver.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scraper/youtube/__init__.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scraper/youtube/shorts.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/scraper/youtube/youtube.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/storage/__init__.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/storage/mongo.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/telegram/__init__.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/telegram/bot.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/telegram/caption_shortener.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/telegram/handlers.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/telegram/placeholder_message.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/telegram/utils.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/uploader/__init__.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon/warp_beacon.py +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon.egg-info/SOURCES.txt +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon.egg-info/dependency_links.txt +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon.egg-info/entry_points.txt +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon.egg-info/requires.txt +0 -0
- {warp_beacon-2.3.42 → warp_beacon-2.3.43}/warp_beacon.egg-info/top_level.txt +0 -0
@@ -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,
|
@@ -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 =
|
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,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|