Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-13 20:27:27 +08:00
Code Issues Releases Wiki Activity

playlist_index respects playlist_items (closes #10591)

Browse Source
This commit is contained in:
Lesmana Zimmer 2016-09-11 23:31:07 +02:00
parent be45730226
commit 7bbb700c71
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/YoutubeDL.py
View File

@ -795,7 +795,7 @@ class YoutubeDL(object):
yield int(item) yield int(item)
else: else:
yield int(string_segment) yield int(string_segment)
playlistitems = iter_playlistitems(playlistitems_str) playlistitems = list(iter_playlistitems(playlistitems_str))
ie_entries = ie_result['entries'] ie_entries = ie_result['entries']
if isinstance(ie_entries, list): if isinstance(ie_entries, list):
@ -836,6 +836,14 @@ class YoutubeDL(object):
'[%s] playlist %s: Downloading %d videos' % '[%s] playlist %s: Downloading %d videos' %
(ie_result['extractor'], playlist, n_entries)) (ie_result['extractor'], playlist, n_entries))
if playlistitems:
playlistindexes = playlistitems
else:
playlistindexes = range(playliststart + 1, playlistend + 1)
for entry, index in zip(entries, playlistindexes):
entry['index'] = index
if self.params.get('playlistreverse', False): if self.params.get('playlistreverse', False):
entries = entries[::-1] entries = entries[::-1]
@ -846,7 +854,7 @@ class YoutubeDL(object):
'playlist': playlist, 'playlist': playlist,
'playlist_id': ie_result.get('id'), 'playlist_id': ie_result.get('id'),
'playlist_title': ie_result.get('title'), 'playlist_title': ie_result.get('title'),
'playlist_index': i + playliststart, 'playlist_index': entry['index'],
'extractor': ie_result['extractor'], 'extractor': ie_result['extractor'],
'webpage_url': ie_result['webpage_url'], 'webpage_url': ie_result['webpage_url'],
'webpage_url_basename': url_basename(ie_result['webpage_url']), 'webpage_url_basename': url_basename(ie_result['webpage_url']),