|
|
|
@ -1816,7 +1816,7 @@ class YoutubeDL:
|
|
|
|
|
elif self.params.get('playlistrandom'):
|
|
|
|
|
random.shuffle(entries)
|
|
|
|
|
|
|
|
|
|
self.to_screen(f'[{ie_result["extractor"]}] Playlist {title}: Downloading {n_entries} videos'
|
|
|
|
|
self.to_screen(f'[{ie_result["extractor"]}] Playlist {title}: Downloading {n_entries} items'
|
|
|
|
|
f'{format_field(ie_result, "playlist_count", " of %s")}')
|
|
|
|
|
|
|
|
|
|
keep_resolved_entries = self.params.get('extract_flat') != 'discard'
|
|
|
|
@ -1849,7 +1849,7 @@ class YoutubeDL:
|
|
|
|
|
resolved_entries[i] = (playlist_index, NO_DEFAULT)
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
self.to_screen('[download] Downloading video %s of %s' % (
|
|
|
|
|
self.to_screen('[download] Downloading item %s of %s' % (
|
|
|
|
|
self._format_screen(i + 1, self.Styles.ID), self._format_screen(n_entries, self.Styles.EMPHASIS)))
|
|
|
|
|
|
|
|
|
|
extra.update({
|
|
|
|
@ -1867,8 +1867,11 @@ class YoutubeDL:
|
|
|
|
|
resolved_entries[i] = (playlist_index, entry_result)
|
|
|
|
|
|
|
|
|
|
# Update with processed data
|
|
|
|
|
ie_result['requested_entries'] = [i for i, e in resolved_entries if e is not NO_DEFAULT]
|
|
|
|
|
ie_result['entries'] = [e for _, e in resolved_entries if e is not NO_DEFAULT]
|
|
|
|
|
ie_result['requested_entries'] = [i for i, e in resolved_entries if e is not NO_DEFAULT]
|
|
|
|
|
if ie_result['requested_entries'] == try_call(lambda: list(range(1, ie_result['playlist_count'] + 1))):
|
|
|
|
|
# Do not set for full playlist
|
|
|
|
|
ie_result.pop('requested_entries')
|
|
|
|
|
|
|
|
|
|
# Write the updated info to json
|
|
|
|
|
if _infojson_written is True and self._write_info_json(
|
|
|
|
|