|
|
|
@ -1808,7 +1808,7 @@ class YoutubeDL:
|
|
|
|
|
info_copy['id'] = ie.get_temp_id(ie_result['url'])
|
|
|
|
|
self.add_default_extra_info(info_copy, ie, ie_result['url'])
|
|
|
|
|
self.add_extra_info(info_copy, extra_info)
|
|
|
|
|
info_copy, _ = self.pre_process(info_copy)
|
|
|
|
|
info_copy = self.pre_process(info_copy)
|
|
|
|
|
self._fill_common_fields(info_copy, False)
|
|
|
|
|
self.__forced_printings(info_copy)
|
|
|
|
|
self._raise_pending_errors(info_copy)
|
|
|
|
@ -1982,8 +1982,9 @@ class YoutubeDL:
|
|
|
|
|
'playlist', ie_result, self.prepare_filename(ie_copy, 'pl_infojson'))
|
|
|
|
|
if _infojson_written is None:
|
|
|
|
|
return
|
|
|
|
|
if self._write_description('playlist', ie_result,
|
|
|
|
|
self.prepare_filename(ie_copy, 'pl_description')) is None:
|
|
|
|
|
|
|
|
|
|
description_file = self._write_description('playlist', ie_result, self.prepare_filename(ie_copy, 'pl_description'))
|
|
|
|
|
if description_file is None:
|
|
|
|
|
return
|
|
|
|
|
# TODO: This should be passed to ThumbnailsConvertor if necessary
|
|
|
|
|
self._write_thumbnails('playlist', ie_result, self.prepare_filename(ie_copy, 'pl_thumbnail'))
|
|
|
|
@ -2884,13 +2885,13 @@ class YoutubeDL:
|
|
|
|
|
# which can't be exported to json
|
|
|
|
|
info_dict['formats'] = formats
|
|
|
|
|
|
|
|
|
|
info_dict, _ = self.pre_process(info_dict)
|
|
|
|
|
info_dict = self.pre_process(info_dict)
|
|
|
|
|
|
|
|
|
|
if self._match_entry(info_dict, incomplete=self._format_fields) is not None:
|
|
|
|
|
return info_dict
|
|
|
|
|
|
|
|
|
|
self.post_extract(info_dict)
|
|
|
|
|
info_dict, _ = self.pre_process(info_dict, 'after_filter')
|
|
|
|
|
info_dict = self.pre_process(info_dict, 'after_filter')
|
|
|
|
|
|
|
|
|
|
# The pre-processors may have modified the formats
|
|
|
|
|
formats = self._get_formats(info_dict)
|
|
|
|
@ -3201,14 +3202,13 @@ class YoutubeDL:
|
|
|
|
|
info_dict.clear()
|
|
|
|
|
info_dict.update(new_info)
|
|
|
|
|
|
|
|
|
|
new_info, _ = self.pre_process(info_dict, 'video')
|
|
|
|
|
new_info = self.pre_process(info_dict, 'video')
|
|
|
|
|
replace_info_dict(new_info)
|
|
|
|
|
self._num_downloads += 1
|
|
|
|
|
|
|
|
|
|
# info_dict['_filename'] needs to be set for backward compatibility
|
|
|
|
|
info_dict['_filename'] = full_filename = self.prepare_filename(info_dict, warn=True)
|
|
|
|
|
temp_filename = self.prepare_filename(info_dict, 'temp')
|
|
|
|
|
files_to_move = {}
|
|
|
|
|
|
|
|
|
|
# Forced printings
|
|
|
|
|
self.__forced_printings(info_dict, full_filename, incomplete=('format' not in info_dict))
|
|
|
|
@ -3229,23 +3229,19 @@ class YoutubeDL:
|
|
|
|
|
if not self._ensure_dir_exists(encodeFilename(temp_filename)):
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
if self._write_description('video', info_dict,
|
|
|
|
|
self.prepare_filename(info_dict, 'description')) is None:
|
|
|
|
|
description_file = self._write_description('video', info_dict, self.prepare_filename(info_dict, 'description'))
|
|
|
|
|
if description_file is None:
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
sub_files = self._write_subtitles(info_dict, temp_filename)
|
|
|
|
|
if sub_files is None:
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
files_to_move['requested_subtitles'] = sub_files
|
|
|
|
|
|
|
|
|
|
thumb_files = self._write_thumbnails(
|
|
|
|
|
'video', info_dict, temp_filename, self.prepare_filename(info_dict, 'thumbnail'))
|
|
|
|
|
if thumb_files is None:
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
files_to_move['thumbnails'] = thumb_files
|
|
|
|
|
|
|
|
|
|
infofn = self.prepare_filename(info_dict, 'infojson')
|
|
|
|
|
_infojson_written = self._write_info_json('video', info_dict, infofn)
|
|
|
|
|
if _infojson_written:
|
|
|
|
@ -3318,13 +3314,12 @@ class YoutubeDL:
|
|
|
|
|
for link_type, should_write in write_links.items()):
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
new_info, files_to_move = self.pre_process(info_dict, 'before_dl', files_to_move)
|
|
|
|
|
new_info = self.pre_process(info_dict, 'before_dl')
|
|
|
|
|
replace_info_dict(new_info)
|
|
|
|
|
|
|
|
|
|
if self.params.get('skip_download'):
|
|
|
|
|
info_dict['filepath'] = temp_filename
|
|
|
|
|
info_dict['__finaldir'] = os.path.dirname(os.path.abspath(encodeFilename(full_filename)))
|
|
|
|
|
info_dict['__files_to_move'] = files_to_move
|
|
|
|
|
replace_info_dict(self.run_pp(MoveFilesAfterDownloadPP(self, False), info_dict))
|
|
|
|
|
info_dict['__write_download_archive'] = self.params.get('force_write_download_archive')
|
|
|
|
|
else:
|
|
|
|
@ -3438,9 +3433,6 @@ class YoutubeDL:
|
|
|
|
|
info_dict['__files_to_merge'] = downloaded
|
|
|
|
|
# Even if there were no downloads, it is being merged only now
|
|
|
|
|
info_dict['__real_download'] = True
|
|
|
|
|
else:
|
|
|
|
|
for file in downloaded:
|
|
|
|
|
files_to_move[file] = None
|
|
|
|
|
else:
|
|
|
|
|
# Just a single file
|
|
|
|
|
dl_filename = existing_video_file(full_filename, temp_filename)
|
|
|
|
@ -3524,7 +3516,7 @@ class YoutubeDL:
|
|
|
|
|
|
|
|
|
|
fixup()
|
|
|
|
|
try:
|
|
|
|
|
replace_info_dict(self.post_process(dl_filename, info_dict, files_to_move))
|
|
|
|
|
replace_info_dict(self.post_process(dl_filename, info_dict))
|
|
|
|
|
except PostProcessingError as err:
|
|
|
|
|
self.report_error('Postprocessing: %s' % str(err))
|
|
|
|
|
return
|
|
|
|
@ -3661,8 +3653,7 @@ class YoutubeDL:
|
|
|
|
|
|
|
|
|
|
def run_pp(self, pp, infodict):
|
|
|
|
|
files_to_delete = []
|
|
|
|
|
if '__files_to_move' not in infodict:
|
|
|
|
|
infodict['__files_to_move'] = {}
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
files_to_delete, infodict = pp.run(infodict)
|
|
|
|
|
except PostProcessingError as e:
|
|
|
|
@ -3686,24 +3677,21 @@ class YoutubeDL:
|
|
|
|
|
info = self.run_pp(pp, info)
|
|
|
|
|
return info
|
|
|
|
|
|
|
|
|
|
def pre_process(self, ie_info, key='pre_process', files_to_move=None):
|
|
|
|
|
def pre_process(self, ie_info, key='pre_process'):
|
|
|
|
|
info = dict(ie_info)
|
|
|
|
|
info['__files_to_move'] = files_to_move or {}
|
|
|
|
|
try:
|
|
|
|
|
info = self.run_all_pps(key, info)
|
|
|
|
|
except PostProcessingError as err:
|
|
|
|
|
msg = f'Preprocessing: {err}'
|
|
|
|
|
info.setdefault('__pending_error', msg)
|
|
|
|
|
self.report_error(msg, is_error=False)
|
|
|
|
|
return info, info.pop('__files_to_move', None)
|
|
|
|
|
return info
|
|
|
|
|
|
|
|
|
|
def post_process(self, filename, info, files_to_move=None):
|
|
|
|
|
def post_process(self, filename, info):
|
|
|
|
|
"""Run all the postprocessors on the given file."""
|
|
|
|
|
info['filepath'] = filename
|
|
|
|
|
info['__files_to_move'] = files_to_move or {}
|
|
|
|
|
info = self.run_all_pps('post_process', info, additional_pps=info.get('__postprocessors'))
|
|
|
|
|
info = self.run_pp(MoveFilesAfterDownloadPP(self), info)
|
|
|
|
|
del info['__files_to_move']
|
|
|
|
|
return self.run_all_pps('after_move', info)
|
|
|
|
|
|
|
|
|
|
def _make_archive_id(self, info_dict):
|
|
|
|
@ -4245,27 +4233,27 @@ class YoutubeDL:
|
|
|
|
|
self.report_error(f'Cannot write {label} metadata to JSON file {infofn}')
|
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
def _write_description(self, label, ie_result, descfn):
|
|
|
|
|
def _write_description(self, label, info_dict, filename):
|
|
|
|
|
''' Write description and returns True = written, False = skip, None = error '''
|
|
|
|
|
if not self.params.get('writedescription'):
|
|
|
|
|
return False
|
|
|
|
|
elif not descfn:
|
|
|
|
|
elif not filename:
|
|
|
|
|
self.write_debug(f'Skipping writing {label} description')
|
|
|
|
|
return False
|
|
|
|
|
elif not self._ensure_dir_exists(descfn):
|
|
|
|
|
elif not self._ensure_dir_exists(filename):
|
|
|
|
|
return None
|
|
|
|
|
elif not self.params.get('overwrites', True) and os.path.exists(descfn):
|
|
|
|
|
elif not self.params.get('overwrites', True) and os.path.exists(filename):
|
|
|
|
|
self.to_screen(f'[info] {label.title()} description is already present')
|
|
|
|
|
elif ie_result.get('description') is None:
|
|
|
|
|
elif info_dict.get('description') is None:
|
|
|
|
|
self.to_screen(f'[info] There\'s no {label} description to write')
|
|
|
|
|
return False
|
|
|
|
|
else:
|
|
|
|
|
try:
|
|
|
|
|
self.to_screen(f'[info] Writing {label} description to: {descfn}')
|
|
|
|
|
with open(encodeFilename(descfn), 'w', encoding='utf-8') as descfile:
|
|
|
|
|
descfile.write(ie_result['description'])
|
|
|
|
|
self.to_screen(f'[info] Writing {label} description to: {filename}')
|
|
|
|
|
with open(filename, 'w', encoding='utf-8') as descfile:
|
|
|
|
|
descfile.write(info_dict['description'])
|
|
|
|
|
except OSError:
|
|
|
|
|
self.report_error(f'Cannot write {label} description file {descfn}')
|
|
|
|
|
self.report_error(f'Cannot write {label} description file {filename}')
|
|
|
|
|
return None
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
@ -4294,12 +4282,6 @@ class YoutubeDL:
|
|
|
|
|
if existing_sub:
|
|
|
|
|
self.to_screen(f'[info] Video subtitle {sub_lang}.{sub_format} is already present')
|
|
|
|
|
sub_info['filepath'] = existing_sub
|
|
|
|
|
ret.append({
|
|
|
|
|
'current_filepath': existing_sub,
|
|
|
|
|
'final_filepath': sub_filename_final,
|
|
|
|
|
'lang': sub_lang,
|
|
|
|
|
'ext': sub_info['ext']
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
@ -4311,12 +4293,6 @@ class YoutubeDL:
|
|
|
|
|
with open(sub_filename, 'w', encoding='utf-8', newline='') as subfile:
|
|
|
|
|
subfile.write(sub_info['data'])
|
|
|
|
|
sub_info['filepath'] = sub_filename
|
|
|
|
|
ret.append({
|
|
|
|
|
'current_filepath': sub_filename,
|
|
|
|
|
'final_filepath': sub_filename_final,
|
|
|
|
|
'lang': sub_lang,
|
|
|
|
|
'ext': sub_info['ext']
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
continue
|
|
|
|
|
except OSError:
|
|
|
|
@ -4328,12 +4304,6 @@ class YoutubeDL:
|
|
|
|
|
sub_copy.setdefault('http_headers', info_dict.get('http_headers'))
|
|
|
|
|
self.dl(sub_filename, sub_copy, subtitle=True)
|
|
|
|
|
sub_info['filepath'] = sub_filename
|
|
|
|
|
ret.append({
|
|
|
|
|
'current_filepath': sub_filename,
|
|
|
|
|
'final_filepath': sub_filename_final,
|
|
|
|
|
'lang': sub_lang,
|
|
|
|
|
'ext': sub_info['ext']
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
except (DownloadError, ExtractorError, IOError, OSError, ValueError) + network_exceptions as err:
|
|
|
|
|
msg = f'Unable to download video subtitles for {sub_lang!r}: {err}'
|
|
|
|
@ -4375,11 +4345,6 @@ class YoutubeDL:
|
|
|
|
|
self.to_screen('[info] %s is already present' % (
|
|
|
|
|
thumb_display_id if multiple else f'{label} thumbnail').capitalize())
|
|
|
|
|
t['filepath'] = existing_thumb
|
|
|
|
|
ret.append({
|
|
|
|
|
'current_filepath': existing_thumb,
|
|
|
|
|
'final_filepath': thumb_filename_final,
|
|
|
|
|
'id': t['id']
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
self.to_screen(f'[info] Downloading {thumb_display_id} ...')
|
|
|
|
@ -4389,12 +4354,6 @@ class YoutubeDL:
|
|
|
|
|
with open(encodeFilename(thumb_filename), 'wb') as thumbf:
|
|
|
|
|
shutil.copyfileobj(uf, thumbf)
|
|
|
|
|
|
|
|
|
|
ret.append({
|
|
|
|
|
'current_filepath': thumb_filename,
|
|
|
|
|
'final_filepath': thumb_filename_final,
|
|
|
|
|
'id': t['id']
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
t['filepath'] = thumb_filename
|
|
|
|
|
except network_exceptions as err:
|
|
|
|
|
if isinstance(err, HTTPError) and err.status == 404:
|
|
|
|
|