projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f148ea4
)
Fix problem when requesting an existing format explicitly with -f
author
Ricardo Garcia
<sarbalap+freshmeat@gmail.com>
Thu, 9 Dec 2010 18:57:39 +0000
(19:57 +0100)
committer
Ricardo Garcia
<sarbalap+freshmeat@gmail.com>
Thu, 9 Dec 2010 18:57:39 +0000
(19:57 +0100)
youtube-dl
patch
|
blob
|
history
diff --git
a/youtube-dl
b/youtube-dl
index e6177e36356051673ce4fffd811840e98c30969f..a8e3bd36cd32d6c50bbc4cc686c32496590d2fa9 100755
(executable)
--- a/
youtube-dl
+++ b/
youtube-dl
@@
-944,7
+944,7
@@
class YoutubeIE(InfoExtractor):
video_token = urllib.unquote_plus(video_info['token'][0])
# Decide which formats to download
video_token = urllib.unquote_plus(video_info['token'][0])
# Decide which formats to download
- req
uested
_format = self._downloader.params.get('format', None)
+ req_format = self._downloader.params.get('format', None)
get_video_template = 'http://www.youtube.com/get_video?video_id=%s&t=%s&eurl=&el=&ps=&asv=&fmt=%%s' % (video_id, video_token)
if 'fmt_url_map' in video_info:
get_video_template = 'http://www.youtube.com/get_video?video_id=%s&t=%s&eurl=&el=&ps=&asv=&fmt=%%s' % (video_id, video_token)
if 'fmt_url_map' in video_info:
@@
-958,12
+958,15
@@
class YoutubeIE(InfoExtractor):
if len(existing_formats) == 0:
self._downloader.trouble(u'ERROR: no known formats available for video')
return
if len(existing_formats) == 0:
self._downloader.trouble(u'ERROR: no known formats available for video')
return
- if req
uested
_format is None:
+ if req_format is None:
video_url_list = [(existing_formats[0], url_map[existing_formats[0]])] # Best quality
video_url_list = [(existing_formats[0], url_map[existing_formats[0]])] # Best quality
- elif req
uested
_format == '-1':
+ elif req_format == '-1':
video_url_list = [(f, url_map[f]) for f in existing_formats] # All formats
else:
video_url_list = [(f, url_map[f]) for f in existing_formats] # All formats
else:
- video_url_list = [(requested_format, get_video_template % requested_format)] # Specific format
+ if req_format in url_map:
+ video_url_list = [(req_format, url_map[req_format])] # Specific format
+ else:
+ video_url_list = [(req_format, get_video_template % req_format)] # Specific format
elif 'conn' in video_info and video_info['conn'][0].startswith('rtmp'):
self.report_rtmp_download()
elif 'conn' in video_info and video_info['conn'][0].startswith('rtmp'):
self.report_rtmp_download()