Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[postprocessor/ffmpeg] Simplify metadata preparation and add track related metafields (Closes #9357)

pull/9358/head
Sergey M․ 2016-05-01 10:56:54 +06:00
parent 6f27bf1c74
commit 4bd143a3a0
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
youtube_dl/postprocessor/ffmpeg.py
View File

@ -389,23 +389,30 @@ class FFmpegEmbedSubtitlePP(FFmpegPostProcessor):
class FFmpegMetadataPP(FFmpegPostProcessor): class FFmpegMetadataPP(FFmpegPostProcessor):
def run(self, info): def run(self, info):
metadata = {} metadata = {}
if info.get('title') is not None:
metadata['title'] = info['title'] def add(meta_list, info_list=None):
if info.get('upload_date') is not None: if not info_list:
metadata['date'] = info['upload_date'] info_list = meta_list
if info.get('artist') is not None: if not isinstance(meta_list, (list, tuple)):
metadata['artist'] = info['artist'] meta_list = (meta_list,)
elif info.get('uploader') is not None: if not isinstance(info_list, (list, tuple)):
metadata['artist'] = info['uploader'] info_list = (info_list,)
elif info.get('uploader_id') is not None: for info_f in info_list:
metadata['artist'] = info['uploader_id'] if info.get(info_f) is not None:
if info.get('description') is not None: for meta_f in meta_list:
metadata['description'] = info['description'] metadata[meta_f] = info[info_f]
metadata['comment'] = info['description'] break
if info.get('webpage_url') is not None:
metadata['purl'] = info['webpage_url'] add('title', ('track', 'title'))
if info.get('album') is not None: add('date', 'upload_date')
metadata['album'] = info['album'] add(('description', 'comment'), 'description')
add('purl', 'webpage_url')
add('track', 'track_number')
add('artist', ('artist', 'creator', 'uploader', 'uploader_id'))
add('genre')
add('album')
add('album_artist')
add('disc', 'disc_number')
if not metadata: if not metadata:
self._downloader.to_screen('[ffmpeg] There isn\'t any metadata to add') self._downloader.to_screen('[ffmpeg] There isn\'t any metadata to add')