X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube-dl;h=7bd4b2aaca5f002524ed3dec1a085b8fe76e1f4f;hb=2b06c33d19a961061f822377adb057f411ccb067;hp=86e247994d86cc00b3be47bea957eb1edbd99053;hpb=131efd1ae0899f261fe9faccb91f5c9c3aa974c5;p=youtube-dl
diff --git a/youtube-dl b/youtube-dl
index 86e247994..7bd4b2aac 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -99,7 +99,7 @@ def sanitize_open(filename, open_mode):
return (stream, filename)
except (IOError, OSError), err:
# In case of error, try to remove win32 forbidden chars
- filename = re.sub(ur'[<>:"\|\?\*]', u'#', filename)
+ filename = re.sub(ur'[/<>:"\|\?\*]', u'#', filename)
# An exception here should be caught in the caller
stream = open(filename, open_mode)
@@ -193,6 +193,7 @@ class FileDownloader(object):
ignoreerrors: Do not stop on download errors.
ratelimit: Download speed limit, in bytes/sec.
nooverwrites: Prevent overwriting files.
+ retries: Number of times to retry for HTTP error 503
continuedl: Try to continue downloads if possible.
noprogress: Do not print the progress bar.
"""
@@ -364,6 +365,10 @@ class FileDownloader(object):
"""Report attemtp to resume at given byte."""
self.to_stdout(u'[download] Resuming download at byte %s' % resume_len)
+ def report_retry(self, count, retries):
+ """Report retry in case of HTTP error 503"""
+ self.to_stdout(u'[download] Got HTTP error 503. Retrying (attempt %d of %d)...' % (count, retries))
+
def report_file_already_downloaded(self, file_name):
"""Report file has already been fully downloaded."""
try:
@@ -423,7 +428,7 @@ class FileDownloader(object):
return
try:
- success = self._do_download(filename, info_dict['url'].encode('utf-8'))
+ success = self._do_download(filename, info_dict['url'].encode('utf-8'), info_dict.get('player_url', None))
except (OSError, IOError), err:
raise UnavailableFormatError
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
@@ -475,7 +480,7 @@ class FileDownloader(object):
if info is None:
break
- def _download_with_rtmpdump(self, filename, url):
+ def _download_with_rtmpdump(self, filename, url, player_url):
self.report_destination(filename)
# Check for rtmpdump first
@@ -488,12 +493,16 @@ class FileDownloader(object):
# Download using rtmpdump. rtmpdump returns exit code 2 when
# the connection was interrumpted and resuming appears to be
# possible. This is part of rtmpdump's normal usage, AFAIK.
- basic_args = ['rtmpdump', '-q', '-r', url, '-o', filename]
+ basic_args = ['rtmpdump', '-q'] + [[], ['-W', player_url]][player_url is not None] + ['-r', url, '-o', filename]
retval = subprocess.call(basic_args + [[], ['-e', '-k', '1']][self.params.get('continuedl', False)])
while retval == 2 or retval == 1:
- self.to_stdout(u'\r[rtmpdump] %s bytes' % os.path.getsize(filename), skip_eol=True)
- time.sleep(2.0) # This seems to be needed
+ prevsize = os.path.getsize(filename)
+ self.to_stdout(u'\r[rtmpdump] %s bytes' % prevsize, skip_eol=True)
+ time.sleep(5.0) # This seems to be needed
retval = subprocess.call(basic_args + ['-e'] + [[], ['-k', '1']][retval == 1])
+ cursize = os.path.getsize(filename)
+ if prevsize == cursize and retval == 1:
+ break
if retval == 0:
self.to_stdout(u'\r[rtmpdump] %s bytes' % os.path.getsize(filename))
return True
@@ -501,10 +510,10 @@ class FileDownloader(object):
self.trouble('\nERROR: rtmpdump exited with code %d' % retval)
return False
- def _do_download(self, filename, url):
+ def _do_download(self, filename, url, player_url):
# Attempt to download using rtmpdump
if url.startswith('rtmp'):
- return self._download_with_rtmpdump(filename, url)
+ return self._download_with_rtmpdump(filename, url, player_url)
stream = None
open_mode = 'wb'
@@ -523,24 +532,34 @@ class FileDownloader(object):
request.add_header('Range','bytes=%d-' % resume_len)
open_mode = 'ab'
- # Establish connection
- try:
- data = urllib2.urlopen(request)
- except (urllib2.HTTPError, ), err:
- if err.code != 416: # 416 is 'Requested range not satisfiable'
- raise
- # Unable to resume
- data = urllib2.urlopen(basic_request)
- content_length = data.info()['Content-Length']
-
- if content_length is not None and long(content_length) == resume_len:
- # Because the file had already been fully downloaded
- self.report_file_already_downloaded(filename)
- return True
- else:
- # Because the server didn't let us
- self.report_unable_to_resume()
- open_mode = 'wb'
+ count = 0
+ retries = self.params.get('retries', 0)
+ while True:
+ # Establish connection
+ try:
+ data = urllib2.urlopen(request)
+ break
+ except (urllib2.HTTPError, ), err:
+ if err.code == 503:
+ # Retry in case of HTTP error 503
+ count += 1
+ if count <= retries:
+ self.report_retry(count, retries)
+ continue
+ if err.code != 416: # 416 is 'Requested range not satisfiable'
+ raise
+ # Unable to resume
+ data = urllib2.urlopen(basic_request)
+ content_length = data.info()['Content-Length']
+
+ if content_length is not None and long(content_length) == resume_len:
+ # Because the file had already been fully downloaded
+ self.report_file_already_downloaded(filename)
+ return True
+ else:
+ # Because the server didn't let us
+ self.report_unable_to_resume()
+ open_mode = 'wb'
data_len = data.info().get('Content-length', None)
data_len_str = self.format_bytes(data_len)
@@ -569,7 +588,7 @@ class FileDownloader(object):
try:
stream.write(data_block)
except (IOError, OSError), err:
- self.trouble('ERROR: unable to write data: %s' % str(err))
+ self.trouble('\nERROR: unable to write data: %s' % str(err))
block_size = self.best_block_size(after - before, data_block_len)
# Progress message
@@ -605,6 +624,7 @@ class InfoExtractor(object):
stitle: Simplified title.
ext: Video filename extension.
format: Video format.
+ player_url: SWF Player URL (may be None).
The following fields are optional. Their primary purpose is to allow
youtube-dl to serve as the backend for a video search function, such
@@ -671,6 +691,8 @@ class YoutubeIE(InfoExtractor):
'18': 'mp4',
'22': 'mp4',
'37': 'mp4',
+ '43': 'webm',
+ '45': 'webm',
}
@staticmethod
@@ -689,6 +711,10 @@ class YoutubeIE(InfoExtractor):
"""Report attempt to confirm age."""
self._downloader.to_stdout(u'[youtube] Confirming age')
+ def report_video_webpage_download(self, video_id):
+ """Report attempt to download video webpage."""
+ self._downloader.to_stdout(u'[youtube] %s: Downloading video webpage' % video_id)
+
def report_video_info_webpage_download(self, video_id):
"""Report attempt to download video info webpage."""
self._downloader.to_stdout(u'[youtube] %s: Downloading video info webpage' % video_id)
@@ -801,10 +827,26 @@ class YoutubeIE(InfoExtractor):
# Extension
video_extension = self._video_extensions.get(format_param, 'flv')
+ # Get video webpage
+ self.report_video_webpage_download(video_id)
+ request = urllib2.Request('http://www.youtube.com/watch?v=%s&gl=US&hl=en' % video_id, None, std_headers)
+ try:
+ video_webpage = urllib2.urlopen(request).read()
+ except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+ self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % str(err))
+ return
+
+ # Attempt to extract SWF player URL
+ mobj = re.search(r'swfConfig.*"(http://.*?watch-.*?\.swf)"', video_webpage)
+ if mobj is not None:
+ player_url = mobj.group(1)
+ else:
+ player_url = None
+
# Get video info
self.report_video_info_webpage_download(video_id)
- for el_type in ['embedded', 'detailpage', 'vevo']:
- video_info_url = ('http://www.youtube.com/get_video_info?&video_id=%s&el=%s&ps=default&eurl=&gl=US&hl=en'
+ for el_type in ['&el=embedded', '&el=detailpage', '&el=vevo', '']:
+ video_info_url = ('http://www.youtube.com/get_video_info?&video_id=%s%s&ps=default&eurl=&gl=US&hl=en'
% (video_id, el_type))
request = urllib2.Request(video_info_url, None, std_headers)
try:
@@ -864,20 +906,12 @@ class YoutubeIE(InfoExtractor):
else: # don't panic if we can't find it
video_thumbnail = urllib.unquote_plus(video_info['thumbnail_url'][0])
- # get video description
- video_description = 'No description available.' # we need something to pass to self._downloader
- # this requires an additional HTTP request and a little
- # more time, so don't do it unless absolutely necessary
+ # description
+ video_description = 'No description available.'
if self._downloader.params.get('forcedescription', False):
- video_page_url = 'http://www.youtube.com/watch?v=' + video_id
- request = urllib2.Request(video_page_url, None, std_headers)
- try:
- video_page_webpage = urllib2.urlopen(request).read()
- mobj = re.search(r'', video_page_webpage)
- if mobj is not None:
- video_description = mobj.group(1)
- except (urllib2.URLError, httplib.HTTPException, socket.error), err:
- pass # don't panic if we can't find it
+ mobj = re.search(r'', video_webpage)
+ if mobj is not None:
+ video_description = mobj.group(1)
try:
# Process video information
@@ -891,20 +925,22 @@ class YoutubeIE(InfoExtractor):
'format': (format_param is None and u'NA' or format_param.decode('utf-8')),
'thumbnail': video_thumbnail.decode('utf-8'),
'description': video_description.decode('utf-8'),
+ 'player_url': player_url,
})
if all_formats:
+ quality_index += 1
if quality_index == len(self._available_formats):
# None left to get
return
else:
- quality_index += 1
format_param = self._available_formats[quality_index]
continue
return
except UnavailableFormatError, err:
if best_quality or all_formats:
+ quality_index += 1
if quality_index == len(self._available_formats):
# I don't ever expect this to happen
if not all_formats:
@@ -912,7 +948,6 @@ class YoutubeIE(InfoExtractor):
return
else:
self.report_unavailable_format(video_id, format_param)
- quality_index += 1
format_param = self._available_formats[quality_index]
continue
else:
@@ -1043,6 +1078,7 @@ class MetacafeIE(InfoExtractor):
'stitle': simple_title,
'ext': video_extension.decode('utf-8'),
'format': u'NA',
+ 'player_url': None,
})
except UnavailableFormatError:
self._downloader.trouble(u'ERROR: format not available for video')
@@ -1150,6 +1186,7 @@ class GoogleIE(InfoExtractor):
'stitle': simple_title,
'ext': video_extension.decode('utf-8'),
'format': u'NA',
+ 'player_url': None,
})
except UnavailableFormatError:
self._downloader.trouble(u'ERROR: format not available for video')
@@ -1228,6 +1265,7 @@ class PhotobucketIE(InfoExtractor):
'stitle': simple_title,
'ext': video_extension.decode('utf-8'),
'format': u'NA',
+ 'player_url': None,
})
except UnavailableFormatError:
self._downloader.trouble(u'ERROR: format not available for video')
@@ -1382,6 +1420,7 @@ class YahooIE(InfoExtractor):
'description': video_description,
'thumbnail': video_thumbnail,
'description': video_description,
+ 'player_url': None,
})
except UnavailableFormatError:
self._downloader.trouble(u'ERROR: format not available for video')
@@ -1477,6 +1516,7 @@ class GenericIE(InfoExtractor):
'stitle': simple_title,
'ext': video_extension.decode('utf-8'),
'format': u'NA',
+ 'player_url': None,
})
except UnavailableFormatError:
self._downloader.trouble(u'ERROR: format not available for video')
@@ -1947,7 +1987,7 @@ if __name__ == '__main__':
# Parse command line
parser = optparse.OptionParser(
usage='Usage: %prog [options] url...',
- version='2010.04.04',
+ version='2010.06.06',
conflict_handler='resolve',
)
@@ -1960,20 +2000,22 @@ if __name__ == '__main__':
parser.add_option('-i', '--ignore-errors',
action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
parser.add_option('-r', '--rate-limit',
- dest='ratelimit', metavar='L', help='download rate limit (e.g. 50k or 44.6m)')
+ dest='ratelimit', metavar='LIMIT', help='download rate limit (e.g. 50k or 44.6m)')
+ parser.add_option('-R', '--retries',
+ dest='retries', metavar='RETRIES', help='number of retries (default is 10)', default=10)
authentication = optparse.OptionGroup(parser, 'Authentication Options')
authentication.add_option('-u', '--username',
- dest='username', metavar='UN', help='account username')
+ dest='username', metavar='USERNAME', help='account username')
authentication.add_option('-p', '--password',
- dest='password', metavar='PW', help='account password')
+ dest='password', metavar='PASSWORD', help='account password')
authentication.add_option('-n', '--netrc',
action='store_true', dest='usenetrc', help='use .netrc authentication data', default=False)
parser.add_option_group(authentication)
video_format = optparse.OptionGroup(parser, 'Video Format Options')
video_format.add_option('-f', '--format',
- action='store', dest='format', metavar='FMT', help='video format code')
+ action='store', dest='format', metavar='FORMAT', help='video format code')
video_format.add_option('-b', '--best-quality',
action='store_const', dest='format', help='download the best quality video possible', const='0')
video_format.add_option('-m', '--mobile-version',
@@ -2007,9 +2049,9 @@ if __name__ == '__main__':
filesystem.add_option('-l', '--literal',
action='store_true', dest='useliteral', help='use literal title in file name', default=False)
filesystem.add_option('-o', '--output',
- dest='outtmpl', metavar='TPL', help='output filename template')
+ dest='outtmpl', metavar='TEMPLATE', help='output filename template')
filesystem.add_option('-a', '--batch-file',
- dest='batchfile', metavar='F', help='file containing URLs to download')
+ dest='batchfile', metavar='FILE', help='file containing URLs to download (\'-\' for stdin)')
filesystem.add_option('-w', '--no-overwrites',
action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
filesystem.add_option('-c', '--continue',
@@ -2017,12 +2059,16 @@ if __name__ == '__main__':
parser.add_option_group(filesystem)
(opts, args) = parser.parse_args()
-
+
# Batch file verification
batchurls = []
if opts.batchfile is not None:
try:
- batchurls = open(opts.batchfile, 'r').readlines()
+ if opts.batchfile == '-':
+ batchfd = sys.stdin
+ else:
+ batchfd = open(opts.batchfile, 'r')
+ batchurls = batchfd.readlines()
batchurls = [x.strip() for x in batchurls]
batchurls = [x for x in batchurls if len(x) > 0]
except IOError:
@@ -2045,6 +2091,11 @@ if __name__ == '__main__':
if numeric_limit is None:
parser.error(u'invalid rate limit specified')
opts.ratelimit = numeric_limit
+ if opts.retries is not None:
+ try:
+ opts.retries = long(opts.retries)
+ except (TypeError, ValueError), err:
+ parser.error(u'invalid retry count specified')
# Information extractors
youtube_ie = YoutubeIE()
@@ -2081,6 +2132,7 @@ if __name__ == '__main__':
'ignoreerrors': opts.ignoreerrors,
'ratelimit': opts.ratelimit,
'nooverwrites': opts.nooverwrites,
+ 'retries': opts.retries,
'continuedl': opts.continue_dl,
'noprogress': opts.noprogress,
})