Now a new FileDownloader is created when downloading a video
The progress hooks can be added using the method "add_downloader_progress_hook"pull/1488/head
parent
f2c36ee43e
commit
8ab470f1b2
|
@ -90,7 +90,7 @@ def generator(test_case):
|
|||
def _hook(status):
|
||||
if status['status'] == 'finished':
|
||||
finished_hook_called.add(status['filename'])
|
||||
ydl.fd.add_progress_hook(_hook)
|
||||
ydl.add_downloader_progress_hook(_hook)
|
||||
|
||||
def get_tc_filename(tc):
|
||||
return tc.get('file') or ydl.prepare_filename(tc.get('info_dict', {}))
|
||||
|
|
|
@ -155,7 +155,7 @@ class YoutubeDL(object):
|
|||
self._ies = []
|
||||
self._ies_instances = {}
|
||||
self._pps = []
|
||||
self._progress_hooks = []
|
||||
self._fd_progress_hooks = []
|
||||
self._download_retcode = 0
|
||||
self._num_downloads = 0
|
||||
self._screen_file = [sys.stdout, sys.stderr][params.get('logtostderr', False)]
|
||||
|
@ -193,8 +193,6 @@ class YoutubeDL(object):
|
|||
u'Set the LC_ALL environment variable to fix this.')
|
||||
self.params['restrictfilenames'] = True
|
||||
|
||||
self.fd = FileDownloader(self, self.params)
|
||||
|
||||
if '%(stitle)s' in self.params.get('outtmpl', ''):
|
||||
self.report_warning(u'%(stitle)s is deprecated. Use the %(title)s and the --restrict-filenames flag(which also secures %(uploader)s et al) instead.')
|
||||
|
||||
|
@ -230,6 +228,10 @@ class YoutubeDL(object):
|
|||
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 _bidi_workaround(self, message):
|
||||
if not hasattr(self, '_fribidi_channel'):
|
||||
return message
|
||||
|
@ -845,7 +847,10 @@ class YoutubeDL(object):
|
|||
success = True
|
||||
else:
|
||||
try:
|
||||
success = self.fd._do_download(filename, info_dict)
|
||||
fd = FileDownloader(self, self.params)
|
||||
for ph in self._fd_progress_hooks:
|
||||
fd.add_progress_hook(ph)
|
||||
success = fd._do_download(filename, info_dict)
|
||||
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
|
||||
self.report_error(u'unable to download video data: %s' % str(err))
|
||||
return
|
||||
|
|
Loading…
Reference in New Issue