mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-23 19:35:19 +01:00
Only catch UnavailableFormatError in call to process_info
This commit is contained in:
parent
cbfff4db63
commit
968aa88438
|
@ -288,7 +288,6 @@ class FileDownloader(object):
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
template_dict = dict(info_dict)
|
template_dict = dict(info_dict)
|
||||||
template_dict['epoch'] = unicode(long(time.time()))
|
template_dict['epoch'] = unicode(long(time.time()))
|
||||||
|
@ -621,7 +620,6 @@ class YoutubeIE(InfoExtractor):
|
||||||
best_quality = True
|
best_quality = True
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
try:
|
|
||||||
# Extension
|
# Extension
|
||||||
video_extension = self._video_extensions.get(format_param, 'flv')
|
video_extension = self._video_extensions.get(format_param, 'flv')
|
||||||
|
|
||||||
|
@ -668,6 +666,7 @@ class YoutubeIE(InfoExtractor):
|
||||||
simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
|
simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
|
||||||
simple_title = simple_title.strip(ur'_')
|
simple_title = simple_title.strip(ur'_')
|
||||||
|
|
||||||
|
try:
|
||||||
# Process video information
|
# Process video information
|
||||||
self._downloader.process_info({
|
self._downloader.process_info({
|
||||||
'id': video_id.decode('utf-8'),
|
'id': video_id.decode('utf-8'),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user