X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube-dl;h=d3e8cf4f642b212ebcd01817596aff5a9f905f5a;hb=4bec29ef4bac6d007fa0f722eb7c55285e66e03a;hp=0fd160c2a9762759940a9c3aee06830510372332;hpb=8b07dec5f6492af73e8621fd9aa23b03290662aa;p=youtube-dl.git

diff --git a/youtube-dl b/youtube-dl
index 0fd160c2a..d3e8cf4f6 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',
@@ -27,6 +27,22 @@ std_headers = {
 
 simple_title_chars = string.ascii_letters.decode('ascii') + string.digits.decode('ascii')
 
+def preferredencoding():
+	"""Get preferred encoding.
+
+	Returns the best encoding scheme for the system, based on
+	locale.getpreferredencoding() and some further tweaks.
+	"""
+	def yield_preferredencoding():
+		try:
+			pref = locale.getpreferredencoding()
+			u'TEST'.encode(pref)
+		except:
+			pref = 'UTF-8'
+		while True:
+			yield pref
+	return yield_preferredencoding().next()
+
 class DownloadError(Exception):
 	"""Download Error exception.
 	
@@ -143,10 +159,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)
@@ -203,11 +221,13 @@ class FileDownloader(object):
 
 	@staticmethod
 	def verify_url(url):
-		"""Verify a URL is valid and data could be downloaded."""
+		"""Verify a URL is valid and data could be downloaded. Return real data URL."""
 		request = urllib2.Request(url, None, std_headers)
 		data = urllib2.urlopen(request)
 		data.read(1)
+		url = data.geturl()
 		data.close()
+		return url
 
 	def add_info_extractor(self, ie):
 		"""Add an InfoExtractor object to the end of the list."""
@@ -222,12 +242,12 @@ class FileDownloader(object):
 	def to_stdout(self, message, skip_eol=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(locale.getpreferredencoding()),
+			print (u'%s%s' % (message, [u'\n', u''][skip_eol])).encode(preferredencoding()),
 			sys.stdout.flush()
 	
 	def to_stderr(self, message):
 		"""Print message to stderr."""
-		print >>sys.stderr, message
+		print >>sys.stderr, message.encode(preferredencoding())
 	
 	def fixed_template(self):
 		"""Checks if the output template is fixed."""
@@ -289,15 +309,15 @@ class FileDownloader(object):
 		# Do nothing else if in simulate mode
 		if self.params.get('simulate', False):
 			try:
-				self.verify_url(info_dict['url'])
+				info_dict['url'] = self.verify_url(info_dict['url'].encode('utf-8')).decode('utf-8')
 			except (OSError, IOError, urllib2.URLError, httplib.HTTPException, socket.error), err:
 				raise UnavailableFormatError
 
 			# Forced printings
 			if self.params.get('forcetitle', False):
-				print info_dict['title'].encode(locale.getpreferredencoding())
+				print info_dict['title'].encode(preferredencoding())
 			if self.params.get('forceurl', False):
-				print info_dict['url'].encode(locale.getpreferredencoding())
+				print info_dict['url'].encode(preferredencoding())
 
 			return
 			
@@ -307,8 +327,8 @@ class FileDownloader(object):
 			filename = self.params['outtmpl'] % template_dict
 		except (ValueError, KeyError), err:
 			self.trouble('ERROR: invalid output template or system charset: %s' % str(err))
-		if self.params['nooverwrites'] and os.path.exists(filename):
-			self.to_stderr('WARNING: file exists: %s; skipping' % filename)
+		if self.params.get('nooverwrites', False) and os.path.exists(filename):
+			self.to_stderr(u'WARNING: file exists: %s; skipping' % filename)
 			return
 
 		try:
@@ -318,7 +338,7 @@ class FileDownloader(object):
 			return
 
 		try:
-			success = self._do_download(filename, info_dict['url'])
+			success = self._do_download(filename, info_dict['url'].encode('utf-8'))
 		except (OSError, IOError), err:
 			raise UnavailableFormatError
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
@@ -382,7 +402,7 @@ class FileDownloader(object):
 			resume_len = os.path.getsize(filename)
 		else:
 			resume_len = 0
-		if self.params['continuedl'] and resume_len != 0:
+		if self.params.get('continuedl', False) and resume_len != 0:
 			self.report_resuming_byte(resume_len)
 			request.add_header('Range','bytes=%d-' % resume_len)
 
@@ -510,7 +530,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,18 +577,14 @@ 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."""
 		self._downloader.to_stdout(u'[youtube] %s: Extracting video information' % video_id)
 	
-	def report_video_url(self, video_id, video_real_url):
-		"""Report extracted video URL."""
-		self._downloader.to_stdout(u'[youtube] %s: URL: %s' % (video_id, video_real_url))
-	
 	def report_unavailable_format(self, video_id, format):
 		"""Report extracted video URL."""
 		self._downloader.to_stdout(u'[youtube] %s: Format %s not available' % (video_id, format))
@@ -665,42 +681,50 @@ 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)<title>YouTube - ([^<]*)</title>', 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_plus(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 +845,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)<title>(.*) - Video</title>', webpage)
 		if mobj is None:
@@ -866,7 +892,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</a>'
+	_MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*</a>'
 	_youtube_ie = None
 	_max_youtube_results = 1000
 
@@ -943,7 +969,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 +979,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'
@@ -1063,6 +1089,22 @@ if __name__ == '__main__':
 		import getpass
 		import optparse
 
+		# Function to update the program file with the latest version from bitbucket.org
+		def update_self(downloader, filename):
+			# Note: downloader only used for options
+			if not os.access (filename, os.W_OK):
+				sys.exit('ERROR: no write permissions on %s' % filename)
+
+			downloader.to_stdout('Updating to latest stable version...')
+			latest_url = 'http://bitbucket.org/rg3/youtube-dl/raw/tip/LATEST_VERSION'
+			latest_version = urllib.urlopen(latest_url).read().strip()
+			prog_url = 'http://bitbucket.org/rg3/youtube-dl/raw/%s/youtube-dl' % latest_version
+			newcontent = urllib.urlopen(prog_url).read()
+			stream = open(filename, 'w')
+			stream.write(newcontent)
+			stream.close()
+			downloader.to_stdout('Updated to version %s' % latest_version)
+
 		# General configuration
 		urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))
 		urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
@@ -1071,7 +1113,7 @@ if __name__ == '__main__':
 		# Parse command line
 		parser = optparse.OptionParser(
 			usage='Usage: %prog [options] url...',
-			version='2009.06.29',
+			version='INTERNAL',
 			conflict_handler='resolve',
 		)
 
@@ -1079,6 +1121,8 @@ if __name__ == '__main__':
 				action='help', help='print this help text and exit')
 		parser.add_option('-v', '--version',
 				action='version', help='print program version and exit')
+		parser.add_option('-U', '--update',
+				action='store_true', dest='update_self', help='update this program to latest stable version')
 		parser.add_option('-i', '--ignore-errors',
 				action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
 		parser.add_option('-r', '--rate-limit',
@@ -1131,7 +1175,7 @@ if __name__ == '__main__':
 		parser.add_option_group(filesystem)
 
 		(opts, args) = parser.parse_args()
-
+        
 		# Batch file verification
 		batchurls = []
 		if opts.batchfile is not None:
@@ -1144,8 +1188,6 @@ if __name__ == '__main__':
 		all_urls = batchurls + args
 
 		# Conflicting, missing and erroneous options
-		if len(all_urls) < 1:
-			parser.error(u'you must provide at least one URL')
 		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')
 		if opts.password is not None and opts.username is None:
@@ -1178,7 +1220,7 @@ if __name__ == '__main__':
 			'forcetitle': opts.gettitle,
 			'simulate': (opts.simulate or opts.geturl or opts.gettitle),
 			'format': opts.format,
-			'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(locale.getpreferredencoding()))
+			'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding()))
 				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'),
@@ -1191,6 +1233,17 @@ if __name__ == '__main__':
 		fd.add_info_extractor(youtube_pl_ie)
 		fd.add_info_extractor(metacafe_ie)
 		fd.add_info_extractor(youtube_ie)
+
+		# Update version
+		if opts.update_self:
+			update_self(fd, sys.argv[0])
+
+		# Maybe do nothing
+		if len(all_urls) < 1:
+			if not opts.update_self:
+				parser.error(u'you must provide at least one URL')
+			else:
+				sys.exit()
 		retcode = fd.download(all_urls)
 		sys.exit(retcode)