R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Mark Lee 2015-02-20 22:17:40 -08:00
parent e664c6a8e6
commit fe07a74fcb
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
youtube_dl/YoutubeDL.py
View File

@ -1300,10 +1300,22 @@ class YoutubeDL(object):
' The formats won\'t be merged') ' The formats won\'t be merged')
else: else:
postprocessors = [merger] postprocessors = [merger]
for f in info_dict['requested_formats']:
new_info = dict(info_dict)
new_info.update(f)
fname = self.prepare_filename(new_info)
fname = prepend_extension(fname, 'f%s' % f['format_id'])
downloaded.append(fname)
partial_success = dl(fname, new_info)
success = success and partial_success
info_dict['__postprocessors'] = postprocessors
info_dict['__files_to_merge'] = downloaded
else:
parts = info_dict.get('parts', []) parts = info_dict.get('parts', [])
if not parts: if not parts:
success = dl(filename, info_dict) success = dl(filename, info_dict)
elif len(parts) == 1: elif len(parts) == 1:
# Just a single file
info_dict.update(parts[0]) info_dict.update(parts[0])
success = dl(filename, info_dict) success = dl(filename, info_dict)
else: else:
@ -1320,19 +1332,6 @@ class YoutubeDL(object):
part_filename = build_part_filename(filename, i) part_filename = build_part_filename(filename, i)
parts_success.append(dl(part_filename, part_info)) parts_success.append(dl(part_filename, part_info))
success = all(parts_success) success = all(parts_success)
for f in info_dict['requested_formats']:
new_info = dict(info_dict)
new_info.update(f)
fname = self.prepare_filename(new_info)
fname = prepend_extension(fname, 'f%s' % f['format_id'])
downloaded.append(fname)
partial_success = dl(fname, new_info)
success = success and partial_success
info_dict['__postprocessors'] = postprocessors
info_dict['__files_to_merge'] = downloaded
else:
# Just a single file
success = dl(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('unable to download video data: %s' % str(err)) self.report_error('unable to download video data: %s' % str(err))
return return