projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'jaimeMF/split-downloaders'
[youtube-dl]
/
youtube_dl
/
YoutubeDL.py
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index e19708e0df3b8399831dbc550ea4c890192e1b38..04771c6372dbeb4463af5d87cf3775a39324334a 100644
(file)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-53,7
+53,7
@@
from .utils import (
YoutubeDLHandler,
)
from .extractor import get_info_extractor, gen_extractors
YoutubeDLHandler,
)
from .extractor import get_info_extractor, gen_extractors
-from .
FileDownloader import FileD
ownloader
+from .
downloader import get_suitable_d
ownloader
from .version import __version__
from .version import __version__
@@
-167,7
+167,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)]
@@
-192,7
+192,6
@@
class YoutubeDL(object):
['bidiv'] + width_args, **sp_kwargs
)
except OSError:
['bidiv'] + width_args, **sp_kwargs
)
except OSError:
- print('Falling back to fribidi')
self._output_process = subprocess.Popen(
['fribidi', '-c', 'UTF-8'] + width_args, **sp_kwargs)
self._output_channel = os.fdopen(master, 'rb')
self._output_process = subprocess.Popen(
['fribidi', '-c', 'UTF-8'] + width_args, **sp_kwargs)
self._output_channel = os.fdopen(master, 'rb')
@@
-212,8
+211,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.')
@@
-249,9
+246,12
@@
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, '_output_channel'):
def _bidi_workaround(self, message):
if not hasattr(self, '_output_channel'):
- print('WORKAROUND NOT ENABLED')
return message
assert hasattr(self, '_output_process')
return message
assert hasattr(self, '_output_process')
@@
-645,7
+645,7
@@
class YoutubeDL(object):
info_dict['playlist_index'] = None
# This extractors handle format selection themselves
info_dict['playlist_index'] = None
# This extractors handle format selection themselves
- if info_dict['extractor'] in [u'
youtube', u'
Youku']:
+ if info_dict['extractor'] in [u'Youku']:
if download:
self.process_info(info_dict)
return info_dict
if download:
self.process_info(info_dict)
return info_dict
@@
-671,10
+671,6
@@
class YoutubeDL(object):
if 'ext' not in format:
format['ext'] = determine_ext(format['url'])
if 'ext' not in format:
format['ext'] = determine_ext(format['url'])
- if self.params.get('listformats', None):
- self.list_formats(info_dict)
- return
-
format_limit = self.params.get('format_limit', None)
if format_limit:
formats = list(takewhile_inclusive(
format_limit = self.params.get('format_limit', None)
if format_limit:
formats = list(takewhile_inclusive(
@@
-687,9
+683,16
@@
class YoutubeDL(object):
except ValueError:
ext_ord = -1
# We only compare the extension if they have the same height and width
except ValueError:
ext_ord = -1
# We only compare the extension if they have the same height and width
- return (f.get('height'), f.get('width'), ext_ord)
+ return (f.get('height') if f.get('height') is not None else -1,
+ f.get('width') if f.get('width') is not None else -1,
+ ext_ord)
formats = sorted(formats, key=_free_formats_key)
formats = sorted(formats, key=_free_formats_key)
+ info_dict['formats'] = formats
+ if self.params.get('listformats', None):
+ self.list_formats(info_dict)
+ return
+
req_format = self.params.get('format', 'best')
if req_format is None:
req_format = 'best'
req_format = self.params.get('format', 'best')
if req_format is None:
req_format = 'best'
@@
-879,7
+882,10
@@
class YoutubeDL(object):
success = True
else:
try:
success = True
else:
try:
- success = self.fd._do_download(filename, info_dict)
+ fd = get_suitable_downloader(info_dict)(self, self.params)
+ for ph in self._fd_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:
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