mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-05 14:06:15 +02:00
Some consistency changes and ghost-file bugfix after discussion with rg3
This commit is contained in:
parent
2740c509b3
commit
42bcd27d3b
62
youtube-dl
62
youtube-dl
@ -284,11 +284,8 @@ class FileDownloader(object):
|
|||||||
self._do_download(outstream, info_dict['url'])
|
self._do_download(outstream, info_dict['url'])
|
||||||
outstream.close()
|
outstream.close()
|
||||||
except (OSError, IOError), err:
|
except (OSError, IOError), err:
|
||||||
if info_dict['best_quality']:
|
os.remove(filename)
|
||||||
raise UnavailableFormatError
|
raise UnavailableFormatError
|
||||||
else:
|
|
||||||
self.trouble('ERROR: unable to write video data: %s' % str(err))
|
|
||||||
return
|
|
||||||
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
|
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
|
||||||
self.trouble('ERROR: unable to download video data: %s' % str(err))
|
self.trouble('ERROR: unable to download video data: %s' % str(err))
|
||||||
return
|
return
|
||||||
@ -643,21 +640,25 @@ class YoutubeIE(InfoExtractor):
|
|||||||
'title': video_title,
|
'title': video_title,
|
||||||
'stitle': simple_title,
|
'stitle': simple_title,
|
||||||
'ext': video_extension.decode('utf-8'),
|
'ext': video_extension.decode('utf-8'),
|
||||||
'best_quality': best_quality,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
except UnavailableFormatError:
|
except UnavailableFormatError, err:
|
||||||
if quality_index == len(self._available_formats) - 1:
|
if best_quality:
|
||||||
# I don't ever expect this to happen
|
if quality_index == len(self._available_formats) - 1:
|
||||||
self._downloader.trouble(u'ERROR: no known formats available for video')
|
# I don't ever expect this to happen
|
||||||
return
|
self._downloader.trouble(u'ERROR: no known formats available for video')
|
||||||
|
return
|
||||||
|
else:
|
||||||
|
self.report_unavailable_format(video_id, format_param)
|
||||||
|
quality_index += 1
|
||||||
|
format_param = self._available_formats[quality_index]
|
||||||
|
continue
|
||||||
else:
|
else:
|
||||||
self.report_unavailable_format(video_id, format_param)
|
self._downloader.trouble('ERROR: format not available for video')
|
||||||
quality_index += 1
|
return
|
||||||
format_param = self._available_formats[quality_index]
|
|
||||||
continue
|
|
||||||
|
|
||||||
class MetacafeIE(InfoExtractor):
|
class MetacafeIE(InfoExtractor):
|
||||||
"""Information Extractor for metacafe.com."""
|
"""Information Extractor for metacafe.com."""
|
||||||
@ -769,16 +770,18 @@ class MetacafeIE(InfoExtractor):
|
|||||||
return
|
return
|
||||||
video_uploader = mobj.group(1)
|
video_uploader = mobj.group(1)
|
||||||
|
|
||||||
# Process video information
|
try:
|
||||||
self._downloader.process_info({
|
# Process video information
|
||||||
'id': video_id.decode('utf-8'),
|
self._downloader.process_info({
|
||||||
'url': video_url.decode('utf-8'),
|
'id': video_id.decode('utf-8'),
|
||||||
'uploader': video_uploader.decode('utf-8'),
|
'url': video_url.decode('utf-8'),
|
||||||
'title': video_title,
|
'uploader': video_uploader.decode('utf-8'),
|
||||||
'stitle': simple_title,
|
'title': video_title,
|
||||||
'ext': video_extension.decode('utf-8'),
|
'stitle': simple_title,
|
||||||
'best_quality': False, # TODO
|
'ext': video_extension.decode('utf-8'),
|
||||||
})
|
})
|
||||||
|
except UnavailableFormatError:
|
||||||
|
self._downloader.trouble(u'ERROR: format not available for video')
|
||||||
|
|
||||||
|
|
||||||
class YoutubeSearchIE(InfoExtractor):
|
class YoutubeSearchIE(InfoExtractor):
|
||||||
@ -1079,8 +1082,13 @@ if __name__ == '__main__':
|
|||||||
if numeric_limit is None:
|
if numeric_limit is None:
|
||||||
parser.error(u'invalid rate limit specified')
|
parser.error(u'invalid rate limit specified')
|
||||||
opts.ratelimit = numeric_limit
|
opts.ratelimit = numeric_limit
|
||||||
if len(opts.format) > 1:
|
if opts.format is not None and len(opts.format) > 1:
|
||||||
parser.error(u'pass at most one of the video format option flags (-f, -b, -m, -d)')
|
parser.error(u'pass at most one of the video format option flags (-f, -b, -m, -d)')
|
||||||
|
if opts.format is None:
|
||||||
|
real_format = None
|
||||||
|
else:
|
||||||
|
real_format = opts.format[0]
|
||||||
|
|
||||||
|
|
||||||
# Information extractors
|
# Information extractors
|
||||||
youtube_ie = YoutubeIE()
|
youtube_ie = YoutubeIE()
|
||||||
@ -1097,7 +1105,7 @@ if __name__ == '__main__':
|
|||||||
'forceurl': opts.geturl,
|
'forceurl': opts.geturl,
|
||||||
'forcetitle': opts.gettitle,
|
'forcetitle': opts.gettitle,
|
||||||
'simulate': (opts.simulate or opts.geturl or opts.gettitle),
|
'simulate': (opts.simulate or opts.geturl or opts.gettitle),
|
||||||
'format': opts.format[0],
|
'format': real_format,
|
||||||
'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(locale.getpreferredencoding()))
|
'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(locale.getpreferredencoding()))
|
||||||
or (opts.usetitle and u'%(stitle)s-%(id)s.%(ext)s')
|
or (opts.usetitle and u'%(stitle)s-%(id)s.%(ext)s')
|
||||||
or (opts.useliteral and u'%(title)s-%(id)s.%(ext)s')
|
or (opts.useliteral and u'%(title)s-%(id)s.%(ext)s')
|
||||||
|
Loading…
Reference in New Issue
Block a user