mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-02 12:36:36 +02:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
00b2685b9c
@ -90,7 +90,7 @@ def print_skipping(reason):
|
||||
def _hook(status):
|
||||
if status['status'] == 'finished':
|
||||
finished_hook_called.add(status['filename'])
|
||||
ydl.add_downloader_progress_hook(_hook)
|
||||
ydl.add_progress_hook(_hook)
|
||||
|
||||
def get_tc_filename(tc):
|
||||
return tc.get('file') or ydl.prepare_filename(tc.get('info_dict', {}))
|
||||
|
@ -36,10 +36,6 @@ class TestYoutubeSubtitles(BaseTestSubtitles):
|
||||
url = 'QRS8MkLhQmM'
|
||||
IE = YoutubeIE
|
||||
|
||||
def getSubtitles(self):
|
||||
info_dict = self.getInfoDict()
|
||||
return info_dict[0]['subtitles']
|
||||
|
||||
def test_youtube_no_writesubtitles(self):
|
||||
self.DL.params['writesubtitles'] = False
|
||||
subtitles = self.getSubtitles()
|
||||
|
@ -167,7 +167,7 @@ def __init__(self, params=None):
|
||||
self._ies = []
|
||||
self._ies_instances = {}
|
||||
self._pps = []
|
||||
self._fd_progress_hooks = []
|
||||
self._progress_hooks = []
|
||||
self._download_retcode = 0
|
||||
self._num_downloads = 0
|
||||
self._screen_file = [sys.stdout, sys.stderr][params.get('logtostderr', False)]
|
||||
@ -246,9 +246,9 @@ def add_post_processor(self, pp):
|
||||
self._pps.append(pp)
|
||||
pp.set_downloader(self)
|
||||
|
||||
def add_downloader_progress_hook(self, ph):
|
||||
"""Add the progress hook to the file downloader"""
|
||||
self._fd_progress_hooks.append(ph)
|
||||
def add_progress_hook(self, ph):
|
||||
"""Add the progress hook (currently only for the file downloader)"""
|
||||
self._progress_hooks.append(ph)
|
||||
|
||||
def _bidi_workaround(self, message):
|
||||
if not hasattr(self, '_output_channel'):
|
||||
@ -688,7 +688,12 @@ def _free_formats_key(f):
|
||||
ext_ord)
|
||||
formats = sorted(formats, key=_free_formats_key)
|
||||
|
||||
info_dict['formats'] = formats
|
||||
if formats[0] is not info_dict:
|
||||
# only set the 'formats' fields if the original info_dict list them
|
||||
# otherwise we end up with a circular reference, the first (and unique)
|
||||
# element in the 'formats' field in info_dict is info_dict itself,
|
||||
# wich can't be exported to json
|
||||
info_dict['formats'] = formats
|
||||
if self.params.get('listformats', None):
|
||||
self.list_formats(info_dict)
|
||||
return
|
||||
@ -883,7 +888,7 @@ def process_info(self, info_dict):
|
||||
else:
|
||||
try:
|
||||
fd = get_suitable_downloader(info_dict)(self, self.params)
|
||||
for ph in self._fd_progress_hooks:
|
||||
for ph in self._progress_hooks:
|
||||
fd.add_progress_hook(ph)
|
||||
success = fd.download(filename, info_dict)
|
||||
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
|
||||
|
Loading…
Reference in New Issue
Block a user