projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Now a new FileDownloader is created when downloading a video
[youtube-dl]
/
youtube_dl
/
YoutubeDL.py
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index cabe309802c68fc56bdff49d34e5ea2b5d216fd2..6a34f16d5e49e1c15ad8bf55cac0dfa878cf9c20 100644
(file)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-155,7
+155,7
@@
class YoutubeDL(object):
self._ies = []
self._ies_instances = {}
self._pps = []
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)]
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
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.')
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)
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
def _bidi_workaround(self, message):
if not hasattr(self, '_fribidi_channel'):
return message
@@
-827,7
+829,7
@@
class YoutubeDL(object):
if self.params.get('writethumbnail', False):
if info_dict.get('thumbnail') is not None:
thumb_format = determine_ext(info_dict['thumbnail'], u'jpg')
if self.params.get('writethumbnail', False):
if info_dict.get('thumbnail') is not None:
thumb_format = determine_ext(info_dict['thumbnail'], u'jpg')
- thumb_filename =
filename.rpartition('.'
)[0] + u'.' + thumb_format
+ thumb_filename =
os.path.splitext(filename
)[0] + u'.' + thumb_format
self.to_screen(u'[%s] %s: Downloading thumbnail ...' %
(info_dict['extractor'], info_dict['id']))
try:
self.to_screen(u'[%s] %s: Downloading thumbnail ...' %
(info_dict['extractor'], info_dict['id']))
try:
@@
-845,7
+847,10
@@
class YoutubeDL(object):
success = True
else:
try:
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
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