v/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2020-11-18 19:53:54 -08:00
Code Issues Releases Wiki Activity

(alternative behavior): don't add default metadata when --custom-metadata is used without --add-metadata

Browse Source
This commit is contained in:
fnord 2015-07-24 04:02:11 -05:00
parent 489e08cdf4
commit 699a91a8f2
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
youtube_dl/__init__.py
View File

@ -367,6 +367,7 @@ def _real_main(argv=None):
'hls_prefer_native': opts.hls_prefer_native, 'hls_prefer_native': opts.hls_prefer_native,
'external_downloader_args': external_downloader_args, 'external_downloader_args': external_downloader_args,
'cn_verification_proxy': opts.cn_verification_proxy, 'cn_verification_proxy': opts.cn_verification_proxy,
'addmetadata': opts.addmetadata,
'custommeta': opts.custommeta, 'custommeta': opts.custommeta,
} }

35
youtube_dl/postprocessor/ffmpeg.py
View File

@ -349,23 +349,24 @@ 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: if self._downloader.params.get('addmetadata'):
metadata['title'] = info['title'] if info.get('title') is not None:
if info.get('upload_date') is not None: metadata['title'] = info['title']
metadata['date'] = info['upload_date'] if info.get('upload_date') is not None:
if info.get('artist') is not None: metadata['date'] = info['upload_date']
metadata['artist'] = info['artist'] if info.get('artist') is not None:
elif info.get('uploader') is not None: metadata['artist'] = info['artist']
metadata['artist'] = info['uploader'] elif info.get('uploader') is not None:
elif info.get('uploader_id') is not None: metadata['artist'] = info['uploader']
metadata['artist'] = info['uploader_id'] elif info.get('uploader_id') is not None:
if info.get('description') is not None: metadata['artist'] = info['uploader_id']
metadata['description'] = info['description'] if info.get('description') is not None:
metadata['comment'] = info['description'] metadata['description'] = info['description']
if info.get('webpage_url') is not None: metadata['comment'] = info['description']
metadata['purl'] = info['webpage_url'] if info.get('webpage_url') is not None:
if info.get('album') is not None: metadata['purl'] = info['webpage_url']
metadata['album'] = info['album'] if info.get('album') is not None:
metadata['album'] = info['album']
for m in self._downloader.params.get('custommeta'): for m in self._downloader.params.get('custommeta'):
key, val = m.split('=', 1) key, val = m.split('=', 1)