Mirrors
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix writing playlist infojson with `--no-clean-infojson`

This commit is contained in:
pukkandan 2021-11-11 08:00:43 +05:30
parent 093a17107e
commit e08a85d865
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
yt_dlp/YoutubeDL.py
View File

@ -1583,10 +1583,11 @@ class YoutubeDL(object):
if entry is not None] if entry is not None]
n_entries = len(entries) n_entries = len(entries)
if not playlistitems and (playliststart or playlistend): if not playlistitems and (playliststart != 1 or playlistend):
playlistitems = list(range(playliststart, playliststart + n_entries)) playlistitems = list(range(playliststart, playliststart + n_entries))
ie_result['requested_entries'] = playlistitems ie_result['requested_entries'] = playlistitems
_infojson_written = False
if not self.params.get('simulate') and self.params.get('allow_playlist_files', True): if not self.params.get('simulate') and self.params.get('allow_playlist_files', True):
ie_copy = { ie_copy = {
'playlist': playlist, 'playlist': playlist,
@ -1599,8 +1600,9 @@ class YoutubeDL(object):
} }
ie_copy.update(dict(ie_result)) ie_copy.update(dict(ie_result))
if self._write_info_json('playlist', ie_result, _infojson_written = self._write_info_json(
self.prepare_filename(ie_copy, 'pl_infojson')) is None: 'playlist', ie_result, self.prepare_filename(ie_copy, 'pl_infojson'))
if _infojson_written is None:
return return
if self._write_description('playlist', ie_result, if self._write_description('playlist', ie_result,
self.prepare_filename(ie_copy, 'pl_description')) is None: self.prepare_filename(ie_copy, 'pl_description')) is None:
@ -1656,6 +1658,12 @@ class YoutubeDL(object):
# TODO: skip failed (empty) entries? # TODO: skip failed (empty) entries?
playlist_results.append(entry_result) playlist_results.append(entry_result)
ie_result['entries'] = playlist_results ie_result['entries'] = playlist_results
# Write the updated info to json
if _infojson_written and self._write_info_json(
'updated playlist', ie_result,
self.prepare_filename(ie_copy, 'pl_infojson'), overwrite=True) is None:
return
self.to_screen('[download] Finished downloading playlist: %s' % playlist) self.to_screen('[download] Finished downloading playlist: %s' % playlist)
return ie_result return ie_result
@ -3472,8 +3480,10 @@ class YoutubeDL(object):
encoding = preferredencoding() encoding = preferredencoding()
return encoding return encoding
def _write_info_json(self, label, ie_result, infofn): def _write_info_json(self, label, ie_result, infofn, overwrite=None):
''' Write infojson and returns True = written, False = skip, None = error ''' ''' Write infojson and returns True = written, False = skip, None = error '''
if overwrite is None:
overwrite = self.params.get('overwrites', True)
if not self.params.get('writeinfojson'): if not self.params.get('writeinfojson'):
return False return False
elif not infofn: elif not infofn:
@ -3481,7 +3491,7 @@ class YoutubeDL(object):
return False return False
elif not self._ensure_dir_exists(infofn): elif not self._ensure_dir_exists(infofn):
return None return None
elif not self.params.get('overwrites', True) and os.path.exists(infofn): elif not overwrite and os.path.exists(infofn):
self.to_screen(f'[info] {label.title()} metadata is already present') self.to_screen(f'[info] {label.title()} metadata is already present')
else: else:
self.to_screen(f'[info] Writing {label} metadata as JSON to: {infofn}') self.to_screen(f'[info] Writing {label} metadata as JSON to: {infofn}')