X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/a5f3018bec4ce17c57059f2384d9110f850ba28d..248af00fe87853fba9d11c6d3e5a8aa6ff982d8a:/youtube-dl
diff --git a/youtube-dl b/youtube-dl
index 47c6465..43566b6 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -93,6 +93,8 @@ def sanitize_open(filename, open_mode):
It returns the tuple (stream, definitive_file_name).
"""
try:
+ if filename == u'-':
+ return (sys.stdout, filename)
stream = open(filename, open_mode)
return (stream, filename)
except (IOError, OSError), err:
@@ -192,18 +194,21 @@ class FileDownloader(object):
ratelimit: Download speed limit, in bytes/sec.
nooverwrites: Prevent overwriting files.
continuedl: Try to continue downloads if possible.
+ noprogress: Do not print the progress bar.
"""
params = None
_ies = []
_pps = []
_download_retcode = None
+ _num_downloads = None
def __init__(self, params):
"""Create a FileDownloader object with the given options."""
self._ies = []
self._pps = []
self._download_retcode = 0
+ self._num_downloads = 0
self.params = params
@staticmethod
@@ -300,11 +305,15 @@ class FileDownloader(object):
self._pps.append(pp)
pp.set_downloader(self)
- def to_stdout(self, message, skip_eol=False):
+ def to_stdout(self, message, skip_eol=False, ignore_encoding_errors=False):
"""Print message to stdout if not in quiet mode."""
- if not self.params.get('quiet', False):
- print (u'%s%s' % (message, [u'\n', u''][skip_eol])).encode(preferredencoding()),
+ try:
+ if not self.params.get('quiet', False):
+ print (u'%s%s' % (message, [u'\n', u''][skip_eol])).encode(preferredencoding()),
sys.stdout.flush()
+ except (UnicodeEncodeError), err:
+ if not ignore_encoding_errors:
+ raise
def to_stderr(self, message):
"""Print message to stderr."""
@@ -342,10 +351,12 @@ class FileDownloader(object):
def report_destination(self, filename):
"""Report destination filename."""
- self.to_stdout(u'[download] Destination: %s' % filename)
+ self.to_stdout(u'[download] Destination: %s' % filename, ignore_encoding_errors=True)
def report_progress(self, percent_str, data_len_str, speed_str, eta_str):
"""Report download progress."""
+ if self.params.get('noprogress', False):
+ return
self.to_stdout(u'\r[download] %s of %s at %s ETA %s' %
(percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
@@ -355,7 +366,10 @@ class FileDownloader(object):
def report_file_already_downloaded(self, file_name):
"""Report file has already been fully downloaded."""
- self.to_stdout(u'[download] %s has already been downloaded' % file_name)
+ try:
+ self.to_stdout(u'[download] %s has already been downloaded' % file_name)
+ except (UnicodeEncodeError), err:
+ self.to_stdout(u'[download] The file has already been downloaded')
def report_unable_to_resume(self):
"""Report it was impossible to resume download."""
@@ -363,7 +377,10 @@ class FileDownloader(object):
def report_finish(self):
"""Report download finished."""
- self.to_stdout(u'')
+ if self.params.get('noprogress', False):
+ self.to_stdout(u'[download] Download completed')
+ else:
+ self.to_stdout(u'')
def process_info(self, info_dict):
"""Process a single dictionary returned by an InfoExtractor."""
@@ -372,7 +389,7 @@ class FileDownloader(object):
# Verify URL if it's an HTTP one
if info_dict['url'].startswith('http'):
try:
- info_dict['url'] = self.verify_url(info_dict['url'].encode('utf-8')).decode('utf-8')
+ self.verify_url(info_dict['url'].encode('utf-8')).decode('utf-8')
except (OSError, IOError, urllib2.URLError, httplib.HTTPException, socket.error), err:
raise UnavailableFormatError
@@ -387,6 +404,7 @@ class FileDownloader(object):
try:
template_dict = dict(info_dict)
template_dict['epoch'] = unicode(long(time.time()))
+ template_dict['ord'] = unicode('%05d' % self._num_downloads)
filename = self.params['outtmpl'] % template_dict
except (ValueError, KeyError), err:
self.trouble('ERROR: invalid output template or system charset: %s' % str(err))
@@ -476,7 +494,7 @@ class FileDownloader(object):
self.to_stdout(u'\r[rtmpdump] %s bytes' % os.path.getsize(filename))
return True
else:
- self.trouble('ERROR: rtmpdump exited with code %d' % retval)
+ self.trouble('\nERROR: rtmpdump exited with code %d' % retval)
return False
def _do_download(self, filename, url):
@@ -540,6 +558,7 @@ class FileDownloader(object):
try:
(stream, filename) = sanitize_open(filename, open_mode)
self.report_destination(filename)
+ self._num_downloads += 1
except (OSError, IOError), err:
self.trouble('ERROR: unable to open for writing: %s' % str(err))
return False
@@ -578,6 +597,7 @@ class InfoExtractor(object):
title: Literal title.
stitle: Simplified title.
ext: Video filename extension.
+ format: Video format.
Subclasses of this one should re-define the _real_initialize() and
_real_extract() methods, as well as the suitable() static method.
@@ -629,7 +649,7 @@ class YoutubeIE(InfoExtractor):
_LOGIN_URL = 'http://www.youtube.com/signup?next=/&gl=US&hl=en'
_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
_NETRC_MACHINE = 'youtube'
- _available_formats = ['37', '22', '35', '18', '5', '17', '13', None] # listed in order of priority for -b flag
+ _available_formats = ['37', '22', '35', '18', '34', '5', '17', '13', None] # listed in order of priority for -b flag
_video_extensions = {
'13': '3gp',
'17': 'mp4',
@@ -749,6 +769,7 @@ class YoutubeIE(InfoExtractor):
# Downloader parameters
best_quality = False
+ all_formats = False
format_param = None
quality_index = 0
if self._downloader is not None:
@@ -757,21 +778,28 @@ class YoutubeIE(InfoExtractor):
if format_param == '0':
format_param = self._available_formats[quality_index]
best_quality = True
+ elif format_param == '-1':
+ format_param = self._available_formats[quality_index]
+ all_formats = True
while True:
# Extension
video_extension = self._video_extensions.get(format_param, 'flv')
# Get video info
- video_info_url = 'http://www.youtube.com/get_video_info?&video_id=%s&el=detailpage&ps=default&eurl=&gl=US&hl=en' % video_id
- request = urllib2.Request(video_info_url, None, std_headers)
- try:
- self.report_video_info_webpage_download(video_id)
- video_info_webpage = urllib2.urlopen(request).read()
- video_info = parse_qs(video_info_webpage)
- except (urllib2.URLError, httplib.HTTPException, socket.error), err:
- self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % str(err))
- return
+ 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'
+ % (video_id, el_type))
+ request = urllib2.Request(video_info_url, None, std_headers)
+ try:
+ video_info_webpage = urllib2.urlopen(request).read()
+ video_info = parse_qs(video_info_webpage)
+ if 'token' in video_info:
+ break
+ except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+ self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % str(err))
+ return
self.report_information_extraction(video_id)
# "t" param
@@ -823,20 +851,35 @@ class YoutubeIE(InfoExtractor):
'title': video_title,
'stitle': simple_title,
'ext': video_extension.decode('utf-8'),
+ 'format': (format_param is None and u'NA' or format_param.decode('utf-8')),
})
+ if all_formats:
+ if quality_index == len(self._available_formats) - 1:
+ # None left to get
+ return
+ else:
+ quality_index += 1
+ format_param = self._available_formats[quality_index]
+ if format_param == None:
+ return
+ continue
+
return
except UnavailableFormatError, err:
- if best_quality:
+ if best_quality or all_formats:
if quality_index == len(self._available_formats) - 1:
# I don't ever expect this to happen
- self._downloader.trouble(u'ERROR: no known formats available for video')
+ if not all_formats:
+ 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]
+ if format_param == None:
+ return
continue
else:
self._downloader.trouble('ERROR: format not available for video')
@@ -965,6 +1008,7 @@ class MetacafeIE(InfoExtractor):
'title': video_title,
'stitle': simple_title,
'ext': video_extension.decode('utf-8'),
+ 'format': u'NA',
})
except UnavailableFormatError:
self._downloader.trouble(u'ERROR: format not available for video')
@@ -1034,19 +1078,18 @@ class GoogleIE(InfoExtractor):
return
video_title = mobj.group(1).decode('utf-8')
video_title = sanitize_title(video_title)
-
- # Google Video doesn't show uploader nicknames?
- video_uploader = 'NA'
+ simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
try:
# Process video information
self._downloader.process_info({
'id': video_id.decode('utf-8'),
'url': video_url.decode('utf-8'),
- 'uploader': video_uploader.decode('utf-8'),
+ 'uploader': u'NA',
'title': video_title,
- 'stitle': video_title,
+ 'stitle': simple_title,
'ext': video_extension.decode('utf-8'),
+ 'format': u'NA',
})
except UnavailableFormatError:
self._downloader.trouble(u'ERROR: format not available for video')
@@ -1111,6 +1154,7 @@ class PhotobucketIE(InfoExtractor):
return
video_title = mobj.group(1).decode('utf-8')
video_title = sanitize_title(video_title)
+ simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
video_uploader = mobj.group(2).decode('utf-8')
@@ -1121,7 +1165,143 @@ class PhotobucketIE(InfoExtractor):
'url': video_url.decode('utf-8'),
'uploader': video_uploader,
'title': video_title,
- 'stitle': video_title,
+ 'stitle': simple_title,
+ 'ext': video_extension.decode('utf-8'),
+ 'format': u'NA',
+ })
+ except UnavailableFormatError:
+ self._downloader.trouble(u'ERROR: format not available for video')
+
+
+class YahooIE(InfoExtractor):
+ """Information extractor for video.yahoo.com."""
+
+ # _VALID_URL matches all Yahoo! Video URLs
+ # _VPAGE_URL matches only the extractable '/watch/' URLs
+ _VALID_URL = r'(?:http://)?(?:[a-z]+\.)?video\.yahoo\.com/(?:watch|network)/([0-9]+)(?:/|\?v=)([0-9]+)(?:[#\?].*)?'
+ _VPAGE_URL = r'(?:http://)?video\.yahoo\.com/watch/([0-9]+)/([0-9]+)(?:[#\?].*)?'
+
+ def __init__(self, downloader=None):
+ InfoExtractor.__init__(self, downloader)
+
+ @staticmethod
+ def suitable(url):
+ return (re.match(YahooIE._VALID_URL, url) is not None)
+
+ def report_download_webpage(self, video_id):
+ """Report webpage download."""
+ self._downloader.to_stdout(u'[video.yahoo] %s: Downloading webpage' % video_id)
+
+ def report_extraction(self, video_id):
+ """Report information extraction."""
+ self._downloader.to_stdout(u'[video.yahoo] %s: Extracting information' % video_id)
+
+ def _real_initialize(self):
+ return
+
+ def _real_extract(self, url):
+ # Extract ID from URL
+ mobj = re.match(self._VALID_URL, url)
+ if mobj is None:
+ self._downloader.trouble(u'ERROR: Invalid URL: %s' % url)
+ return
+
+ video_id = mobj.group(2)
+ video_extension = 'flv'
+
+ # Rewrite valid but non-extractable URLs as
+ # extractable English language /watch/ URLs
+ if re.match(self._VPAGE_URL, url) is None:
+ request = urllib2.Request(url)
+ try:
+ webpage = urllib2.urlopen(request).read()
+ except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+ self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % str(err))
+ return
+
+ mobj = re.search(r'\("id", "([0-9]+)"\);', webpage)
+ if mobj is None:
+ self._downloader.trouble(u'ERROR: Unable to extract id field')
+ return
+ yahoo_id = mobj.group(1)
+
+ mobj = re.search(r'\("vid", "([0-9]+)"\);', webpage)
+ if mobj is None:
+ self._downloader.trouble(u'ERROR: Unable to extract vid field')
+ return
+ yahoo_vid = mobj.group(1)
+
+ url = 'http://video.yahoo.com/watch/%s/%s' % (yahoo_vid, yahoo_id)
+ return self._real_extract(url)
+
+ # Retrieve video webpage to extract further information
+ request = urllib2.Request(url)
+ try:
+ self.report_download_webpage(video_id)
+ webpage = urllib2.urlopen(request).read()
+ except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+ self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % str(err))
+ return
+
+ # Extract uploader and title from webpage
+ self.report_extraction(video_id)
+ mobj = re.search(r'', webpage)
+ if mobj is None:
+ self._downloader.trouble(u'ERROR: unable to extract video title')
+ return
+ video_title = mobj.group(1).decode('utf-8')
+ simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
+
+ mobj = re.search(r'', webpage)
+ if mobj is None:
+ self._downloader.trouble(u'ERROR: unable to extract video uploader')
+ return
+ video_uploader = mobj.group(1).decode('utf-8')
+
+ # Extract video height and width
+ mobj = re.search(r'', webpage)
+ if mobj is None:
+ self._downloader.trouble(u'ERROR: unable to extract video height')
+ return
+ yv_video_height = mobj.group(1)
+
+ mobj = re.search(r'', webpage)
+ if mobj is None:
+ self._downloader.trouble(u'ERROR: unable to extract video width')
+ return
+ yv_video_width = mobj.group(1)
+
+ # Retrieve video playlist to extract media URL
+ # I'm not completely sure what all these options are, but we
+ # seem to need most of them, otherwise the server sends a 401.
+ yv_lg = 'R0xx6idZnW2zlrKP8xxAIR' # not sure what this represents
+ yv_bitrate = '700' # according to Wikipedia this is hard-coded
+ request = urllib2.Request('http://cosmos.bcst.yahoo.com/up/yep/process/getPlaylistFOP.php?node_id=' + video_id +
+ '&tech=flash&mode=playlist&lg=' + yv_lg + '&bitrate=' + yv_bitrate + '&vidH=' + yv_video_height +
+ '&vidW=' + yv_video_width + '&swf=as3&rd=video.yahoo.com&tk=null&adsupported=v1,v2,&eventid=1301797')
+ try:
+ self.report_download_webpage(video_id)
+ webpage = urllib2.urlopen(request).read()
+ except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+ self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % str(err))
+ return
+
+ # Extract media URL from playlist XML
+ mobj = re.search(r'\s*Next\s*'
_youtube_ie = None
def __init__(self, youtube_ie, downloader=None):
@@ -1364,7 +1546,7 @@ class YoutubePlaylistIE(InfoExtractor):
ids_in_page.append(mobj.group(1))
video_ids.extend(ids_in_page)
- if (self._MORE_PAGES_INDICATOR % (playlist_id.upper(), pagenum + 1)) not in page:
+ if re.search(self._MORE_PAGES_INDICATOR, page) is None:
break
pagenum = pagenum + 1
@@ -1504,7 +1686,7 @@ if __name__ == '__main__':
# Parse command line
parser = optparse.OptionParser(
usage='Usage: %prog [options] url...',
- version='2010.02.13',
+ version='2010.04.04',
conflict_handler='resolve',
)
@@ -1537,6 +1719,8 @@ if __name__ == '__main__':
action='store_const', dest='format', help='alias for -f 17', const='17')
video_format.add_option('-d', '--high-def',
action='store_const', dest='format', help='alias for -f 22', const='22')
+ video_format.add_option('--all-formats',
+ action='store_const', dest='format', help='download all available video formats', const='-1')
parser.add_option_group(video_format)
verbosity = optparse.OptionGroup(parser, 'Verbosity / Simulation Options')
@@ -1548,6 +1732,8 @@ if __name__ == '__main__':
action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
verbosity.add_option('-e', '--get-title',
action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False)
+ verbosity.add_option('--no-progress',
+ action='store_true', dest='noprogress', help='do not print progress bar', default=False)
parser.add_option_group(verbosity)
filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
@@ -1578,10 +1764,6 @@ if __name__ == '__main__':
sys.exit(u'ERROR: batch file could not be read')
all_urls = batchurls + args
- # Make sure all URLs are in our preferred encoding
- for i in range(0, len(all_urls)):
- all_urls[i] = unicode(all_urls[i], preferredencoding())
-
# Conflicting, missing and erroneous options
if opts.usenetrc and (opts.username is not None or opts.password is not None):
parser.error(u'using .netrc conflicts with giving username/password')
@@ -1607,6 +1789,7 @@ if __name__ == '__main__':
youtube_search_ie = YoutubeSearchIE(youtube_ie)
google_ie = GoogleIE()
photobucket_ie = PhotobucketIE()
+ yahoo_ie = YahooIE()
generic_ie = GenericIE()
# File downloader
@@ -1620,6 +1803,9 @@ if __name__ == '__main__':
'simulate': (opts.simulate or opts.geturl or opts.gettitle),
'format': opts.format,
'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding()))
+ or (opts.format == '-1' and opts.usetitle and u'%(stitle)s-%(id)s-%(format)s.%(ext)s')
+ or (opts.format == '-1' and opts.useliteral and u'%(title)s-%(id)s-%(format)s.%(ext)s')
+ or (opts.format == '-1' and u'%(id)s-%(format)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 u'%(id)s.%(ext)s'),
@@ -1627,6 +1813,7 @@ if __name__ == '__main__':
'ratelimit': opts.ratelimit,
'nooverwrites': opts.nooverwrites,
'continuedl': opts.continue_dl,
+ 'noprogress': opts.noprogress,
})
fd.add_info_extractor(youtube_search_ie)
fd.add_info_extractor(youtube_pl_ie)
@@ -1635,6 +1822,7 @@ if __name__ == '__main__':
fd.add_info_extractor(youtube_ie)
fd.add_info_extractor(google_ie)
fd.add_info_extractor(photobucket_ie)
+ fd.add_info_extractor(yahoo_ie)
# This must come last since it's the
# fallback if none of the others work