dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix --list-formats (Closes #799)

This commit is contained in:
Philipp Hagemeister 2013-04-22 19:51:42 +02:00
parent 74e3452b9e
commit c681a03918
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/FileDownloader.py
View File

@ -458,6 +458,8 @@ class FileDownloader(object):
# Extract information from URL and process it # Extract information from URL and process it
try: try:
ie_results = ie.extract(url) ie_results = ie.extract(url)
if ie_results is None: # Finished already (backwards compatibility; listformats and friends should be moved here)
break
results = [] results = []
for ie_result in ie_results: for ie_result in ie_results:
if not 'extractor' in ie_result: if not 'extractor' in ie_result:

9
youtube_dl/InfoExtractors.py
View File

@ -622,8 +622,7 @@ class YoutubeIE(InfoExtractor):
format_list = available_formats format_list = available_formats
existing_formats = [x for x in format_list if x in url_map] existing_formats = [x for x in format_list if x in url_map]
if len(existing_formats) == 0: if len(existing_formats) == 0:
self._downloader.report_error(u'no known formats available for video') raise ExtractorError(u'no known formats available for video')
return
if self._downloader.params.get('listformats', None): if self._downloader.params.get('listformats', None):
self._print_formats(existing_formats) self._print_formats(existing_formats)
return return
@ -643,11 +642,9 @@ class YoutubeIE(InfoExtractor):
video_url_list = [(rf, url_map[rf])] video_url_list = [(rf, url_map[rf])]
break break
if video_url_list is None: if video_url_list is None:
self._downloader.report_error(u'requested format not available') raise ExtractorError(u'requested format not available')
return
else: else:
self._downloader.report_error(u'no conn or url_encoded_fmt_stream_map information found in video info') raise ExtractorError(u'no conn or url_encoded_fmt_stream_map information found in video info')
return
results = [] results = []
for format_param, video_real_url in video_url_list: for format_param, video_real_url in video_url_list: