from __future__ import absolute_import
+import collections
import errno
import io
import json
encodeFilename,
ExtractorError,
format_bytes,
+ get_term_width,
locked_file,
make_HTTPS_handler,
MaxDownloadsReached,
YoutubeDLHandler,
)
from .extractor import get_info_extractor, gen_extractors
-from .FileDownloader import FileDownloader
+from .downloader import get_suitable_downloader
from .version import __version__
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._err_file = sys.stderr
self.params = {} if params is None else params
- # Pipe messsages through fribidi
if params.get('bidi_workaround', False):
- # fribidi does not support ungetting, so force newlines
- params['progress_with_newline'] = True
-
- for fid in ['_screen_file', '_err_file']:
- class FribidiOut(object):
- def __init__(self, outfile, errfile):
- self.outfile = outfile
- self.process = subprocess.Popen(
- ['fribidi'],
- stdin=subprocess.PIPE,
- stdout=outfile,
- stderr=errfile)
-
- def write(self, s):
- res = self.process.stdin.write(s)
- self.flush()
- return res
-
- def flush(self):
- return self.process.stdin.flush()
-
- def isatty(self):
- return self.outfile.isatty()
-
- try:
- vout = FribidiOut(getattr(self, fid), self._err_file)
- setattr(self, fid, vout)
- except OSError as ose:
- if ose.errno == 2:
- self.report_warning(u'Could not find fribidi executable, ignoring --bidi-workaround . Make sure that fribidi is an executable file in one of the directories in your $PATH.')
- break
- else:
- raise
+ try:
+ import pty
+ master, slave = pty.openpty()
+ width = get_term_width()
+ if width is None:
+ width_args = []
+ else:
+ width_args = ['-w', str(width)]
+ self._fribidi = subprocess.Popen(
+ ['fribidi', '-c', 'UTF-8'] + width_args,
+ stdin=subprocess.PIPE,
+ stdout=slave,
+ stderr=self._err_file)
+ self._fribidi_channel = os.fdopen(master, 'rb')
+ except OSError as ose:
+ if ose.errno == 2:
+ self.report_warning(u'Could not find fribidi executable, ignoring --bidi-workaround . Make sure that fribidi is an executable file in one of the directories in your $PATH.')
+ else:
+ raise
if (sys.version_info >= (3,) and sys.platform != 'win32' and
sys.getfilesystemencoding() in ['ascii', 'ANSI_X3.4-1968']
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.')
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
+
+ assert type(message) == type(u'')
+ line_count = message.count(u'\n') + 1
+ self._fribidi.stdin.write((message + u'\n').encode('utf-8'))
+ self._fribidi.stdin.flush()
+ res = u''.join(self._fribidi_channel.readline().decode('utf-8')
+ for _ in range(line_count))
+ return res[:-len(u'\n')]
+
def to_screen(self, message, skip_eol=False):
"""Print message to stdout if not in quiet mode."""
return self.to_stdout(message, skip_eol, check_quiet=True)
if self.params.get('logger'):
self.params['logger'].debug(message)
elif not check_quiet or not self.params.get('quiet', False):
+ message = self._bidi_workaround(message)
terminator = [u'\n', u''][skip_eol]
output = message + terminator
+
write_string(output, self._screen_file)
def to_stderr(self, message):
if self.params.get('logger'):
self.params['logger'].error(message)
else:
+ message = self._bidi_workaround(message)
output = message + u'\n'
write_string(output, self._err_file)
template_dict['playlist_index'] = u'%05d' % template_dict['playlist_index']
sanitize = lambda k, v: sanitize_filename(
- u'NA' if v is None else compat_str(v),
+ compat_str(v),
restricted=self.params.get('restrictfilenames'),
is_id=(k == u'id'))
template_dict = dict((k, sanitize(k, v))
- for k, v in template_dict.items())
+ for k, v in template_dict.items()
+ if v is not None)
+ template_dict = collections.defaultdict(lambda: u'NA', template_dict)
tmpl = os.path.expanduser(self.params['outtmpl'])
filename = tmpl % template_dict
return filename
- except KeyError as err:
- self.report_error(u'Erroneous output template')
- return None
except ValueError as err:
self.report_error(u'Error in output template: ' + str(err) + u' (encoding: ' + repr(preferredencoding()) + ')')
return None
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:
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
return self._download_retcode
+ def download_with_info_file(self, info_filename):
+ with io.open(info_filename, 'r', encoding='utf-8') as f:
+ info = json.load(f)
+ try:
+ self.process_ie_result(info, download=True)
+ except DownloadError:
+ webpage_url = info.get('webpage_url')
+ if webpage_url is not None:
+ self.report_warning(u'The info failed to download, trying with "%s"' % webpage_url)
+ return self.download([webpage_url])
+ else:
+ raise
+ return self._download_retcode
+
def post_process(self, filename, ie_info):
"""Run all the postprocessors on the given file."""
info = dict(ie_info)
projects / youtube-dl / blobdiff