[youtube] Show info message for multifeed videos according to noplaylist option
parent
d8f0a9ecea
commit
5e1eddb939
|
@ -1089,22 +1089,27 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
||||||
else:
|
else:
|
||||||
video_description = ''
|
video_description = ''
|
||||||
|
|
||||||
if (not self._downloader.params.get('noplaylist') and
|
if 'multifeed_metadata_list' in video_info and not smuggled_data.get('force_singlefeed', False):
|
||||||
not smuggled_data.get('force_singlefeed', False) and
|
if not self._downloader.params.get('noplaylist'):
|
||||||
'multifeed_metadata_list' in video_info):
|
entries = []
|
||||||
entries = []
|
feed_ids = []
|
||||||
multifeed_metadata_list = compat_urllib_parse_unquote_plus(video_info['multifeed_metadata_list'][0])
|
multifeed_metadata_list = compat_urllib_parse_unquote_plus(video_info['multifeed_metadata_list'][0])
|
||||||
for feed in multifeed_metadata_list.split(','):
|
for feed in multifeed_metadata_list.split(','):
|
||||||
feed_data = compat_parse_qs(feed)
|
feed_data = compat_parse_qs(feed)
|
||||||
entries.append({
|
entries.append({
|
||||||
'_type': 'url_transparent',
|
'_type': 'url_transparent',
|
||||||
'ie_key': 'Youtube',
|
'ie_key': 'Youtube',
|
||||||
'url': smuggle_url(
|
'url': smuggle_url(
|
||||||
'%s://www.youtube.com/watch?v=%s' % (proto, feed_data['id'][0]),
|
'%s://www.youtube.com/watch?v=%s' % (proto, feed_data['id'][0]),
|
||||||
{'force_singlefeed': True}),
|
{'force_singlefeed': True}),
|
||||||
'title': '%s (%s)' % (video_title, feed_data['title'][0]),
|
'title': '%s (%s)' % (video_title, feed_data['title'][0]),
|
||||||
})
|
})
|
||||||
return self.playlist_result(entries, video_id, video_title, video_description)
|
feed_ids.append(feed_data['id'][0])
|
||||||
|
self.to_screen(
|
||||||
|
'Downloading multifeed video (%s) - add --no-playlist to just download video %s'
|
||||||
|
% (', '.join(feed_ids), video_id))
|
||||||
|
return self.playlist_result(entries, video_id, video_title, video_description)
|
||||||
|
self.to_screen('Downloading just video %s because of --no-playlist' % video_id)
|
||||||
|
|
||||||
if 'view_count' in video_info:
|
if 'view_count' in video_info:
|
||||||
view_count = int(video_info['view_count'][0])
|
view_count = int(video_info['view_count'][0])
|
||||||
|
|
Loading…
Reference in New Issue