X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube-dl;h=becf1d25de31ccbdbaaef76b517bb23490a9c001;hb=2a04438c7c6de2dc9ef2a0bbaaa8ebc1dc654f44;hp=36b6331cb09c90e2f0736e6e76536675eb248707;hpb=7eb0e897429e1a85b185143b72a656ca8175501c;p=youtube-dl
diff --git a/youtube-dl b/youtube-dl
index 36b6331cb..becf1d25d 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -19,7 +19,7 @@ import urllib
import urllib2
std_headers = {
- 'User-Agent': 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.0.8) Gecko/2009032609 Firefox/3.0.8',
+ 'User-Agent': 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2',
'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
'Accept': 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
'Accept-Language': 'en-us,en;q=0.5',
@@ -143,10 +143,12 @@ class FileDownloader(object):
def format_bytes(bytes):
if bytes is None:
return 'N/A'
- if bytes == 0:
+ if type(bytes) is str:
+ bytes = float(bytes)
+ if bytes == 0.0:
exponent = 0
else:
- exponent = long(math.log(float(bytes), 1024.0))
+ exponent = long(math.log(bytes, 1024.0))
suffix = 'bkMGTPEZY'[exponent]
converted = float(bytes) / float(1024**exponent)
return '%.2f%s' % (converted, suffix)
@@ -510,7 +512,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 = ['22', '35', '18', '17', '13'] # listed in order of priority for -b flag
+ _available_formats = ['22', '35', '18', '5', '17', '13', None] # listed in order of priority for -b flag
_video_extensions = {
'13': '3gp',
'17': 'mp4',
@@ -557,9 +559,9 @@ class YoutubeIE(InfoExtractor):
"""Report attempt to confirm age."""
self._downloader.to_stdout(u'[youtube] Confirming age')
- def report_webpage_download(self, video_id):
- """Report attempt to download 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)
def report_information_extraction(self, video_id):
"""Report attempt to extract video information."""
@@ -665,42 +667,51 @@ class YoutubeIE(InfoExtractor):
# Extension
video_extension = self._video_extensions.get(format_param, 'flv')
- # Normalize URL, including format
- normalized_url = 'http://www.youtube.com/watch?v=%s&gl=US&hl=en' % video_id
- if format_param is not None:
- normalized_url = '%s&fmt=%s' % (normalized_url, format_param)
- request = urllib2.Request(normalized_url, None, std_headers)
+ # 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_webpage_download(video_id)
- video_webpage = urllib2.urlopen(request).read()
+ self.report_video_info_webpage_download(video_id)
+ video_info_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))
+ self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % str(err))
return
self.report_information_extraction(video_id)
-
+
# "t" param
- mobj = re.search(r', "t": "([^"]+)"', video_webpage)
+ mobj = re.search(r'(?m)&token=([^&]+)(?:&|$)', video_info_webpage)
if mobj is None:
- self._downloader.trouble(u'ERROR: unable to extract "t" parameter')
+ # Attempt to see if YouTube has issued an error message
+ mobj = re.search(r'(?m)&reason=([^&]+)(?:&|$)', video_info_webpage)
+ if mobj is None:
+ self._downloader.trouble(u'ERROR: unable to extract "t" parameter for unknown reason')
+ stream = open('reportme-ydl-%s.dat' % time.time(), 'wb')
+ stream.write(video_info_webpage)
+ stream.close()
+ else:
+ reason = urllib.unquote_plus(mobj.group(1))
+ self._downloader.trouble(u'ERROR: YouTube said: %s' % reason.decode('utf-8'))
return
- video_real_url = 'http://www.youtube.com/get_video?video_id=%s&t=%s&el=detailpage&ps=' % (video_id, mobj.group(1))
+ token = urllib.unquote(mobj.group(1))
+ video_real_url = 'http://www.youtube.com/get_video?video_id=%s&t=%s&eurl=&el=detailpage&ps=default&gl=US&hl=en' % (video_id, token)
if format_param is not None:
video_real_url = '%s&fmt=%s' % (video_real_url, format_param)
self.report_video_url(video_id, video_real_url)
# uploader
- mobj = re.search(r"var watchUsername = '([^']+)';", video_webpage)
+ mobj = re.search(r'(?m)&author=([^&]+)(?:&|$)', video_info_webpage)
if mobj is None:
self._downloader.trouble(u'ERROR: unable to extract uploader nickname')
return
- video_uploader = mobj.group(1)
+ video_uploader = urllib.unquote(mobj.group(1))
# title
- mobj = re.search(r'(?im)YouTube - ([^<]*)', video_webpage)
+ mobj = re.search(r'(?m)&title=([^&]+)(?:&|$)', video_info_webpage)
if mobj is None:
self._downloader.trouble(u'ERROR: unable to extract video title')
return
- video_title = mobj.group(1).decode('utf-8')
+ video_title = urllib.unquote(mobj.group(1))
+ video_title = video_title.decode('utf-8')
video_title = re.sub(ur'(?u)&(.+?);', self.htmlentity_transform, video_title)
video_title = video_title.replace(os.sep, u'%')
@@ -821,19 +832,21 @@ class MetacafeIE(InfoExtractor):
# Extract URL, uploader and title from webpage
self.report_extraction(video_id)
- mobj = re.search(r'(?m)&mediaURL=(http.*?\.flv)', webpage)
+ mobj = re.search(r'(?m)&mediaURL=([^&]+)', webpage)
if mobj is None:
self._downloader.trouble(u'ERROR: unable to extract media URL')
return
mediaURL = urllib.unquote(mobj.group(1))
- mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage)
- if mobj is None:
- self._downloader.trouble(u'ERROR: unable to extract gdaKey')
- return
- gdaKey = mobj.group(1)
+ #mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage)
+ #if mobj is None:
+ # self._downloader.trouble(u'ERROR: unable to extract gdaKey')
+ # return
+ #gdaKey = mobj.group(1)
+ #
+ #video_url = '%s?__gda__=%s' % (mediaURL, gdaKey)
- video_url = '%s?__gda__=%s' % (mediaURL, gdaKey)
+ video_url = mediaURL
mobj = re.search(r'(?im)(.*) - Video', webpage)
if mobj is None:
@@ -866,7 +879,7 @@ class YoutubeSearchIE(InfoExtractor):
_VALID_QUERY = r'ytsearch(\d+|all)?:[\s\S]+'
_TEMPLATE_URL = 'http://www.youtube.com/results?search_query=%s&page=%s&gl=US&hl=en'
_VIDEO_INDICATOR = r'href="/watch\?v=.+?"'
- _MORE_PAGES_INDICATOR = r'>Next'
+ _MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*'
_youtube_ie = None
_max_youtube_results = 1000
@@ -943,7 +956,7 @@ class YoutubeSearchIE(InfoExtractor):
self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
return
- if self._MORE_PAGES_INDICATOR not in page:
+ if re.search(self._MORE_PAGES_INDICATOR, page) is None:
for id in video_ids:
self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
return
@@ -953,7 +966,7 @@ class YoutubeSearchIE(InfoExtractor):
class YoutubePlaylistIE(InfoExtractor):
"""Information Extractor for YouTube playlists."""
- _VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/view_play_list\?p=(.+)'
+ _VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/(?:view_play_list|my_playlists)\?.*?p=([^&]+).*'
_TEMPLATE_URL = 'http://www.youtube.com/view_play_list?p=%s&page=%s&gl=US&hl=en'
_VIDEO_INDICATOR = r'/watch\?v=(.+?)&'
_MORE_PAGES_INDICATOR = r'/view_play_list?p=%s&page=%s'
@@ -1071,7 +1084,7 @@ if __name__ == '__main__':
# Parse command line
parser = optparse.OptionParser(
usage='Usage: %prog [options] url...',
- version='2009.06.29',
+ version='INTERNAL',
conflict_handler='resolve',
)