depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-22 18:22:21 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4395 from cryptonaut/issue2883

Browse source 
Handle --get-url with merged formats (fixes #2883)
This commit is contained in:
Philipp Hagemeister 2014-12-08 17:21:56 +01:00
commit 15644a40df
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
youtube_dl/YoutubeDL.py
View file

@ -942,8 +942,12 @@ class YoutubeDL(object):
if self.params.get('forceid', False): if self.params.get('forceid', False):
self.to_stdout(info_dict['id']) self.to_stdout(info_dict['id'])
if self.params.get('forceurl', False): if self.params.get('forceurl', False):
# For RTMP URLs, also include the playpath if info_dict.get('requested_formats') is not None:
self.to_stdout(info_dict['url'] + info_dict.get('play_path', '')) for f in info_dict['requested_formats']:
self.to_stdout(f['url'] + f.get('play_path', ''))
else:
# For RTMP URLs, also include the playpath
self.to_stdout(info_dict['url'] + info_dict.get('play_path', ''))
if self.params.get('forcethumbnail', False) and info_dict.get('thumbnail') is not None: if self.params.get('forcethumbnail', False) and info_dict.get('thumbnail') is not None:
self.to_stdout(info_dict['thumbnail']) self.to_stdout(info_dict['thumbnail'])
if self.params.get('forcedescription', False) and info_dict.get('description') is not None: if self.params.get('forcedescription', False) and info_dict.get('description') is not None: