Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2024-11-22 06:22:51 +08:00
Code Issues Releases Wiki Activity

Now a new FileDownloader is created when downloading a video

Browse Source 
The progress hooks can be added using the method "add_downloader_progress_hook"
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-09-23 18:09:28 +02:00
parent f2c36ee43e
commit 8ab470f1b2
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/test_download.py
View File

@ -90,7 +90,7 @@ def generator(test_case):
def _hook(status): def _hook(status):
if status['status'] == 'finished': if status['status'] == 'finished':
finished_hook_called.add(status['filename']) finished_hook_called.add(status['filename'])
ydl.fd.add_progress_hook(_hook) ydl.add_downloader_progress_hook(_hook)
def get_tc_filename(tc): def get_tc_filename(tc):
return tc.get('file') or ydl.prepare_filename(tc.get('info_dict', {})) return tc.get('file') or ydl.prepare_filename(tc.get('info_dict', {}))

13
youtube_dl/YoutubeDL.py
View File

@ -155,7 +155,7 @@ class YoutubeDL(object):
self._ies = [] self._ies = []
self._ies_instances = {} self._ies_instances = {}
self._pps = [] self._pps = []
self._progress_hooks = [] self._fd_progress_hooks = []
self._download_retcode = 0 self._download_retcode = 0
self._num_downloads = 0 self._num_downloads = 0
self._screen_file = [sys.stdout, sys.stderr][params.get('logtostderr', False)] 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.') u'Set the LC_ALL environment variable to fix this.')
self.params['restrictfilenames'] = True self.params['restrictfilenames'] = True
self.fd = FileDownloader(self, self.params)
if '%(stitle)s' in self.params.get('outtmpl', ''): 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.') 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) self._pps.append(pp)
pp.set_downloader(self) 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): def _bidi_workaround(self, message):
if not hasattr(self, '_fribidi_channel'): if not hasattr(self, '_fribidi_channel'):
return message return message
@ -845,7 +847,10 @@ class YoutubeDL(object):
success = True success = True
else: else:
try: 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: 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)) self.report_error(u'unable to download video data: %s' % str(err))
return return